diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2020-07-24 16:22:33 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2020-07-24 16:22:33 +0000 |
| commit | 08959590f2ced7a44fbc731f2a958d4f4fbbfdf5 (patch) | |
| tree | a832f7c7ae5a430e289c92e9febbf636b193d4cf /www | |
| parent | f66d33bc67518d3b655ba72ef5a5d67c948bd2a0 (diff) | |
| download | ports-08959590f2ced7a44fbc731f2a958d4f4fbbfdf5.tar.gz ports-08959590f2ced7a44fbc731f2a958d4f4fbbfdf5.zip | |
MFH: r542938
www/iridium: update to 2020.04.81
PR: 245959
Submitted by: Matthias Wolf
Security: any Chromium vulnerability between 73 and 81
Approved by: ports-secteam (joneum)
Notes
Notes:
svn path=/branches/2020Q3/; revision=543255
Diffstat (limited to 'www')
760 files changed, 9907 insertions, 5036 deletions
diff --git a/www/iridium/Makefile b/www/iridium/Makefile index 457c47fa7e4b..09106d5f174c 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= iridium -PORTVERSION= 2019.04.73 -PORTREVISION= 8 +PORTVERSION= 2020.04.81 CATEGORIES= www MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser @@ -63,7 +62,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils \ ONLY_FOR_ARCHS= amd64 i386 -USES= bison desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \ +USES= bison cpe desktop-file-utils dos2unix gl gnome jpeg localbase:ldflags \ ninja perl5 pkgconfig python:2.7,build shebangfix tar:xz xorg USE_GL= gl USE_LDCONFIG= ${DATADIR} @@ -72,8 +71,8 @@ USE_XORG= x11 xcb xcomposite xcursor xext xdamage xfixes xi \ xorgproto xrandr xrender xscrnsaver xtst USE_GNOME= atk dconf glib20 gtk30 libxml2 libxslt MAKE_ARGS= -C out/${BUILDTYPE} -DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h BINARY_ALIAS= python=${PYTHON_CMD} +DOS2UNIX_FILES= third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h ALL_TARGET= chrome INSTALLS_ICONS= yes @@ -84,21 +83,19 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. GN_ARGS+= clang_use_chrome_plugins=false \ + enable_hangout_services_extension=false \ enable_nacl=false \ enable_one_click_signin=true \ enable_remoting=false \ fieldtrial_testing_like_official_build=true \ is_clang=true \ - jumbo_file_merge_limit=8 \ toolkit_views=true \ treat_warnings_as_errors=false \ use_allocator="none" \ use_allocator_shim=false \ use_aura=true \ - use_bundled_fontconfig=false \ use_custom_libcxx=false \ use_gnome_keyring=false \ - use_jumbo_build=true \ use_lld=true \ use_sysroot=false \ use_system_freetype=true \ @@ -128,11 +125,9 @@ ALSA_VARS= GN_ARGS+=use_alsa=true ALSA_VARS_OFF= GN_ARGS+=use_alsa=false CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \ - GN_ARGS+=proprietary_codecs=true \ - GN_ARGS+=enable_hevc_demuxing=true + GN_ARGS+=proprietary_codecs=true CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \ - GN_ARGS+=proprietary_codecs=false \ - GN_ARGS+=enable_hevc_demuxing=false + GN_ARGS+=proprietary_codecs=false CUPS_LIB_DEPENDS= libcups.so:print/cups CUPS_VARS= GN_ARGS+=use_cups=true @@ -141,13 +136,14 @@ CUPS_VARS_OFF= GN_ARGS+=use_cups=false DEBUG_VARS= BUILDTYPE=Debug \ GN_ARGS+=is_debug=true \ GN_ARGS+=is_component_build=false \ + GN_ARGS+=symbol_level=1 \ GN_BOOTSTRAP_FLAGS+=--debug \ WANTSPACE="lots of free diskspace (~ 13GB)" DEBUG_VARS_OFF= BUILDTYPE=Release \ + GN_ARGS+=blink_symbol_level=0 \ GN_ARGS+=is_debug=false \ GN_ARGS+=is_official_build=true \ GN_ARGS+=symbol_level=0 \ - GN_ARGS+=remove_webcore_debug_symbols=true \ WANTSPACE="a fair amount of free diskspace (~ 6.5GB)" KERBEROS_VARS= GN_ARGS+=use_kerberos=true @@ -203,7 +199,7 @@ pre-configure: #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ - ffmpeg flac freetype harfbuzz-ng libdrm libusb libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} + ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libpng libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE} do-configure: # GN generator bootstrapping and generating ninja files @@ -225,6 +221,7 @@ do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \ ${STAGEDIR}${MANPREFIX}/man/man1/iridium.1 + ${CP} ${WRKSRC}/chrome/app/theme/chromium/product_logo_22_mono.png ${WRKSRC}/chrome/app/theme/chromium/product_logo_22.png .for s in 22 24 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ @@ -233,7 +230,10 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR} -.for d in protoc icudtl.dat mksnapshot natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin +.for d in protoc mksnapshot + ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} +.endfor +.for d in icudtl.dat snapshot_blob.bin v8_context_snapshot.bin ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ @@ -245,19 +245,22 @@ do-install: ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/iridium ${STAGEDIR}${PREFIX}/bin - # ANGLE -.for f in libEGL.so libGLESv2.so + # ANGLE, EGL, Vk +.for f in libEGL.so libGLESv2.so libVkICD_mock_icd.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR} .endfor # SwiftShader @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader + ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvk_swiftshader.so ${STAGEDIR}${DATADIR} .for g in libEGL.so libGLESv2.so ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \ ${STAGEDIR}${DATADIR}/swiftshader .endfor post-install-DEBUG-on: + ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libVkLayer_khronos_validation.so \ + ${STAGEDIR}${DATADIR} ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \ ${STAGEDIR}${DATADIR} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \ diff --git a/www/iridium/distinfo b/www/iridium/distinfo index e1c80ed0df02..c3950662e4b2 100644 --- a/www/iridium/distinfo +++ b/www/iridium/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1555346051 -SHA256 (iridium-browser-2019.04.73.tar.xz) = f0361626a577f2c6d2a6389ea2a7cdd692fcba96229be38c84117fe0b22364a5 -SIZE (iridium-browser-2019.04.73.tar.xz) = 729035472 +TIMESTAMP = 1586612680 +SHA256 (iridium-browser-2020.04.81.tar.xz) = b9283170001db5f93d9edec61d1abfd2ad66918c266b2cf88cb448470811ab91 +SIZE (iridium-browser-2020.04.81.tar.xz) = 854266540 diff --git a/www/iridium/files/extra-patch-clang b/www/iridium/files/extra-patch-clang index 7ae5fbc5b6c4..887a416b5f2d 100644 --- a/www/iridium/files/extra-patch-clang +++ b/www/iridium/files/extra-patch-clang @@ -38,61 +38,3 @@ EXPECT_CALL(callback_, OnError()).Times(2); ---- third_party/libjingle_xmpp/task_runner/taskrunner.cc.orig 2019-03-11 22:01:15 UTC -+++ third_party/libjingle_xmpp/task_runner/taskrunner.cc -@@ -80,7 +80,7 @@ void TaskRunner::InternalRunTasks(bool in_destructor) - std::vector<Task *>::iterator it; - it = std::remove(tasks_.begin(), - tasks_.end(), -- reinterpret_cast<Task *>(NULL)); -+ static_cast<Task *>(NULL)); - - tasks_.erase(it, tasks_.end()); - tasks_running_ = false; ---- third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc.orig 2019-03-11 22:08:03 UTC -+++ third_party/sfntly/src/cpp/src/sfntly/table/core/cmap_table.cc -@@ -439,7 +439,7 @@ CMapTable::CMapFormat0::Builder::Builder( - } - - CMapTable::CMapFormat0::Builder::Builder(const CMapId& cmap_id) -- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL), -+ : CMap::Builder(static_cast<ReadableFontData*>(NULL), - CMapFormat::kFormat0, - cmap_id) { - } -@@ -563,7 +563,7 @@ CMapTable::CMapFormat2::Builder::Builder(WritableFontD - : CMapTable::CMap::Builder(data ? down_cast<WritableFontData*>( - data->Slice(offset, data->ReadUShort( - offset + Offset::kFormat0Length))) -- : reinterpret_cast<WritableFontData*>(NULL), -+ : static_cast<WritableFontData*>(NULL), - CMapFormat::kFormat2, cmap_id) { - // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. - } -@@ -574,7 +574,7 @@ CMapTable::CMapFormat2::Builder::Builder(ReadableFontD - : CMapTable::CMap::Builder(data ? down_cast<ReadableFontData*>( - data->Slice(offset, data->ReadUShort( - offset + Offset::kFormat0Length))) -- : reinterpret_cast<ReadableFontData*>(NULL), -+ : static_cast<ReadableFontData*>(NULL), - CMapFormat::kFormat2, cmap_id) { - // TODO(arthurhsu): FIXIT: heavy lifting and leak, need fix. - } -@@ -958,7 +958,7 @@ CMapTable::CMapFormat4::Builder::Builder(WritableFontD - CMapTable::CMapFormat4::Builder::Builder(SegmentList* segments, - std::vector<int32_t>* glyph_id_array, - const CMapId& cmap_id) -- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL), -+ : CMap::Builder(static_cast<ReadableFontData*>(NULL), - CMapFormat::kFormat4, cmap_id), - segments_(segments->begin(), segments->end()), - glyph_id_array_(glyph_id_array->begin(), glyph_id_array->end()) { -@@ -966,7 +966,7 @@ CMapTable::CMapFormat4::Builder::Builder(SegmentList* - } - - CMapTable::CMapFormat4::Builder::Builder(const CMapId& cmap_id) -- : CMap::Builder(reinterpret_cast<ReadableFontData*>(NULL), -+ : CMap::Builder(static_cast<ReadableFontData*>(NULL), - CMapFormat::kFormat4, cmap_id) { - } - diff --git a/www/iridium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/iridium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h new file mode 100644 index 000000000000..a3130315b68e --- /dev/null +++ b/www/iridium/files/patch-3p-pdfium_3p_base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -0,0 +1,11 @@ +--- third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2020-04-03 04:13:08 UTC ++++ third_party/pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h +@@ -16,7 +16,7 @@ + #if defined(OS_ANDROID) + #include <sys/prctl.h> + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <sys/resource.h> + + #include <algorithm> diff --git a/www/iridium/files/patch-BUILD.gn b/www/iridium/files/patch-BUILD.gn index a3a254dc8c72..0af06e81260e 100644 --- a/www/iridium/files/patch-BUILD.gn +++ b/www/iridium/files/patch-BUILD.gn @@ -1,6 +1,6 @@ ---- BUILD.gn.orig 2019-03-11 22:00:51 UTC +--- BUILD.gn.orig 2020-03-16 18:40:27 UTC +++ BUILD.gn -@@ -381,7 +381,7 @@ group("gn_all") { +@@ -418,7 +418,7 @@ group("gn_all") { ] } @@ -9,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -422,8 +422,6 @@ group("gn_all") { +@@ -459,8 +459,6 @@ group("gn_all") { "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -18,10 +18,10 @@ "//testing:empty_main", ] -@@ -480,10 +478,6 @@ group("gn_all") { +@@ -515,10 +513,6 @@ group("gn_all") { + "//chrome/test:load_library_perf_tests", + "//chrome/test:sync_performance_tests", "//chrome/test/chromedriver:chromedriver", - "//chrome/test/chromedriver:chromedriver_tests", - "//components/sync:run_sync_testserver", - "//courgette:courgette", - "//courgette:courgette_fuzz", - "//courgette:courgette_minimal_tool", @@ -29,7 +29,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -538,10 +532,6 @@ group("gn_all") { +@@ -575,10 +569,6 @@ group("gn_all") { "//mojo:mojo_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -40,7 +40,7 @@ ] if (!is_android) { -@@ -615,7 +605,7 @@ group("gn_all") { +@@ -652,7 +642,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -49,7 +49,15 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -873,7 +863,6 @@ if (is_chromeos) { +@@ -794,7 +784,6 @@ group("gn_all") { + "//chrome/browser/vr:vr_common_perftests", + "//chrome/browser/vr:vr_common_unittests", + "//chrome/browser/vr:vr_pixeltests", +- "//tools/perf/contrib/vr_benchmarks:vr_perf_tests", + ] + if (is_desktop_linux && use_ozone) { + deps += [ "//chrome/browser/vr/testapp:vr_testapp" ] +@@ -934,7 +923,6 @@ if (is_chromeos) { "//ppapi/examples/video_decode", "//sandbox/linux:chrome_sandbox", "//sandbox/linux:sandbox_linux_unittests", @@ -57,7 +65,7 @@ # Blocked on https://github.com/catapult-project/catapult/issues/2297 #"//third_party/catapult/telemetry:bitmaptools", -@@ -1001,7 +990,7 @@ if (!is_ios) { +@@ -1092,7 +1080,7 @@ if (!is_ios) { ] } @@ -66,7 +74,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1010,7 +999,7 @@ if (!is_ios) { +@@ -1101,7 +1089,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -75,7 +83,7 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1150,9 +1139,6 @@ group("chromium_builder_perf") { +@@ -1231,9 +1219,6 @@ group("chromium_builder_perf") { if (is_win) { data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] diff --git a/www/iridium/files/patch-apps_app__restore__service__browsertest.cc b/www/iridium/files/patch-apps_app__restore__service__browsertest.cc new file mode 100644 index 000000000000..dc9a47b7323a --- /dev/null +++ b/www/iridium/files/patch-apps_app__restore__service__browsertest.cc @@ -0,0 +1,11 @@ +--- apps/app_restore_service_browsertest.cc.orig 2020-03-23 15:18:04 UTC ++++ apps/app_restore_service_browsertest.cc +@@ -147,7 +147,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, FileAcc + } + + // Flaky: crbug.com/269613 +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + #define MAYBE_FileAccessIsRestored DISABLED_FileAccessIsRestored + #else + #define MAYBE_FileAccessIsRestored FileAccessIsRestored diff --git a/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc index c7e90fe87c3f..8f6bd623a3b3 100644 --- a/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc +++ b/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc @@ -1,6 +1,6 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2019-03-11 22:00:51 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2019-06-04 18:55:14 UTC +++ apps/ui/views/app_window_frame_view.cc -@@ -132,7 +132,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView() +@@ -125,7 +125,7 @@ gfx::Rect AppWindowFrameView::GetBoundsForClientView() gfx::Rect AppWindowFrameView::GetWindowBoundsForClientBounds( const gfx::Rect& client_bounds) const { gfx::Rect window_bounds = client_bounds; diff --git a/www/iridium/files/patch-ash_display_mirror__window__controller.cc b/www/iridium/files/patch-ash_display_mirror__window__controller.cc index bab80417a026..d5bf99f6dba3 100644 --- a/www/iridium/files/patch-ash_display_mirror__window__controller.cc +++ b/www/iridium/files/patch-ash_display_mirror__window__controller.cc @@ -1,6 +1,6 @@ ---- ash/display/mirror_window_controller.cc.orig 2019-03-11 22:00:51 UTC +--- ash/display/mirror_window_controller.cc.orig 2020-03-16 18:40:27 UTC +++ ash/display/mirror_window_controller.cc -@@ -274,7 +274,11 @@ void MirrorWindowController::UpdateWindow( +@@ -276,7 +276,11 @@ void MirrorWindowController::UpdateWindow( return info.id() == iter->first; }) == display_info_list.end()) { CloseAndDeleteHost(iter->second, true); diff --git a/www/iridium/files/patch-base_BUILD.gn b/www/iridium/files/patch-base_BUILD.gn index fe66632d5301..30f1110ebaff 100644 --- a/www/iridium/files/patch-base_BUILD.gn +++ b/www/iridium/files/patch-base_BUILD.gn @@ -1,6 +1,28 @@ ---- base/BUILD.gn.orig 2019-03-11 22:00:51 UTC +--- base/BUILD.gn.orig 2020-03-16 18:40:27 UTC +++ base/BUILD.gn -@@ -1185,7 +1185,7 @@ jumbo_component("base") { +@@ -912,7 +912,7 @@ jumbo_component("base") { + "timer/hi_res_timer_manager_posix.cc", + ] + +- if (!is_nacl && !is_mac && !is_ios) { ++ if (!is_nacl && !is_mac && !is_ios && !is_bsd) { + sources += [ + "profiler/stack_copier_signal.cc", + "profiler/stack_copier_signal.h", +@@ -921,6 +921,12 @@ jumbo_component("base") { + "profiler/thread_delegate_posix.h", + ] + } ++ ++ if (is_bsd) { ++ sources += [ ++ "profiler/stack_sampler_posix.cc", ++ ] ++ } + } + + if (is_win) { +@@ -1305,7 +1311,7 @@ jumbo_component("base") { # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. @@ -9,7 +31,7 @@ host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } -@@ -1211,7 +1211,7 @@ jumbo_component("base") { +@@ -1331,7 +1337,7 @@ jumbo_component("base") { "allocator/allocator_shim_override_glibc_weak_symbols.h", ] deps += [ "//base/allocator:tcmalloc" ] @@ -18,7 +40,7 @@ sources += [ "allocator/allocator_shim_default_dispatch_to_glibc.cc" ] } else if (is_android && use_allocator == "none") { sources += [ -@@ -1751,6 +1751,33 @@ jumbo_component("base") { +@@ -1930,6 +1936,33 @@ jumbo_component("base") { } } @@ -51,10 +73,19 @@ + # iOS if (is_ios) { - set_sources_assignment_filter([]) -@@ -2808,6 +2835,12 @@ test("base_unittests") { + sources -= [ +@@ -2880,7 +2913,7 @@ test("base_unittests") { + "posix/unix_domain_socket_unittest.cc", + "task/thread_pool/task_tracker_posix_unittest.cc", ] - set_sources_assignment_filter(sources_assignment_filter) +- if (!is_nacl && !is_mac && !is_ios) { ++ if (!is_nacl && !is_mac && !is_ios && !is_bsd) { + sources += [ "profiler/stack_copier_signal_unittest.cc" ] + } + } +@@ -3068,6 +3101,12 @@ test("base_unittests") { + + manifest = "//build/config/fuchsia/tests.cmx" } + + if (is_bsd) { @@ -63,5 +94,5 @@ + ] + } - if (is_win) { - deps += [ "//base:scoped_handle_test_dll" ] + if (!is_fuchsia && !is_ios) { + sources += [ "files/file_locking_unittest.cc" ] diff --git a/www/iridium/files/patch-base_allocator_allocator__shim.cc b/www/iridium/files/patch-base_allocator_allocator__shim.cc index 29953f7af98a..208a8d93617a 100644 --- a/www/iridium/files/patch-base_allocator_allocator__shim.cc +++ b/www/iridium/files/patch-base_allocator_allocator__shim.cc @@ -1,11 +1,11 @@ ---- base/allocator/allocator_shim.cc.orig 2019-03-11 22:00:51 UTC +--- base/allocator/allocator_shim.cc.orig 2019-10-21 19:06:18 UTC +++ base/allocator/allocator_shim.cc -@@ -70,7 +70,7 @@ inline const allocator::AllocatorDispatch* GetChainHea +@@ -71,7 +71,7 @@ inline const base::allocator::AllocatorDispatch* GetCh // Unfortunately due to that bug NoBarrier_Load() is mistakenly fully // barriered on Linux+Clang, and that causes visible perf regressons. - return reinterpret_cast<const allocator::AllocatorDispatch*>( + return reinterpret_cast<const base::allocator::AllocatorDispatch*>( -#if defined(OS_LINUX) && defined(__clang__) +#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(__clang__) - *static_cast<const volatile subtle::AtomicWord*>(&g_chain_head) + *static_cast<const volatile base::subtle::AtomicWord*>(&g_chain_head) #else - subtle::NoBarrier_Load(&g_chain_head) + base::subtle::NoBarrier_Load(&g_chain_head) diff --git a/www/iridium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc b/www/iridium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc index af63d279da53..c7b4ac21c804 100644 --- a/www/iridium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc +++ b/www/iridium/files/patch-base_allocator_allocator__shim__default__dispatch__to__glibc.cc @@ -1,15 +1,14 @@ ---- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2019-03-11 22:00:51 UTC +--- base/allocator/allocator_shim_default_dispatch_to_glibc.cc.orig 2020-02-03 21:52:37 UTC +++ base/allocator/allocator_shim_default_dispatch_to_glibc.cc -@@ -3,19 +3,28 @@ - // found in the LICENSE file. +@@ -6,18 +6,28 @@ + #include "base/compiler_specific.h" - #include "base/allocator/allocator_shim.h" + #include <dlfcn.h> +-#include <malloc.h> +#include <stdio.h> +#include <stdlib.h> +#include <malloc_np.h> --#include <malloc.h> -- // This translation unit defines a default dispatch for the allocator shim which // routes allocations to libc functions. -// The code here is strongly inspired from tcmalloc's libc_override_glibc.h. @@ -23,13 +22,13 @@ -void __libc_free(void* ptr); +void* __malloc(size_t size); +void* __calloc(size_t n, size_t size); -+void* __realloc(void* address, size_t size); ++void* __realloc(void* address, size_t len); +void* __memalign(size_t alignment, size_t size) { + void *ret; + if (__posix_memalign(&ret, alignment, size) != 0) { -+ return nullptr; ++ return nullptr; + } else { -+ return ret; ++ return ret; + } +} +int __posix_memalign(void **ptr, size_t alignment, size_t size); @@ -37,7 +36,7 @@ } // extern "C" namespace { -@@ -23,32 +32,32 @@ namespace { +@@ -25,32 +35,32 @@ namespace { using base::allocator::AllocatorDispatch; void* GlibcMalloc(const AllocatorDispatch*, size_t size, void* context) { @@ -74,4 +73,4 @@ + __free(address); } - size_t GlibcGetSizeEstimate(const AllocatorDispatch*, + NO_SANITIZE("cfi-icall") diff --git a/www/iridium/files/patch-base_allocator_allocator__shim__unittest.cc b/www/iridium/files/patch-base_allocator_allocator__shim__unittest.cc index ecab203687b6..1f7664842a07 100644 --- a/www/iridium/files/patch-base_allocator_allocator__shim__unittest.cc +++ b/www/iridium/files/patch-base_allocator_allocator__shim__unittest.cc @@ -1,4 +1,4 @@ ---- base/allocator/allocator_shim_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/allocator/allocator_shim_unittest.cc.orig 2020-03-16 18:39:41 UTC +++ base/allocator/allocator_shim_unittest.cc @@ -348,7 +348,7 @@ TEST_F(AllocatorShimTest, InterceptLibcSymbols) { ASSERT_GE(aligned_allocs_intercepted_by_size[61], 1u); @@ -34,3 +34,12 @@ #if !defined(OS_WIN) free(posix_memalign_ptr); +@@ -550,7 +550,7 @@ static size_t GetAllocatedSize(void* ptr) { + static size_t GetAllocatedSize(void* ptr) { + return malloc_size(ptr); + } +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + static size_t GetAllocatedSize(void* ptr) { + return malloc_usable_size(ptr); + } diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator.cc b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator.cc deleted file mode 100644 index cd1d34f21771..000000000000 --- a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/partition_allocator/page_allocator.cc.orig 2019-03-11 22:00:51 UTC -+++ base/allocator/partition_allocator/page_allocator.cc -@@ -115,7 +115,7 @@ void* AllocPages(void* address, - uintptr_t align_base_mask = ~align_offset_mask; - DCHECK(!(reinterpret_cast<uintptr_t>(address) & align_offset_mask)); - --#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS) - // On 64 bit Linux, we may need to adjust the address space limit for - // guarded allocations. - if (length >= kMinimumGuardedMemorySize) { diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index 853a5c49dcb1..fbd28e22abe2 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,38 +1,11 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-03-11 22:00:51 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2019-10-21 19:06:18 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -14,7 +14,7 @@ - #if defined(OS_MACOSX) - #include <mach/mach.h> +@@ -19,7 +19,7 @@ + #if defined(OS_ANDROID) + #include <sys/prctl.h> #endif -#if defined(OS_LINUX) +#if defined(OS_BSD) || defined(OS_LINUX) #include <sys/resource.h> #include <algorithm> -@@ -48,7 +48,7 @@ int GetAccessFlags(PageAccessibilityConfiguration acce - } - } - --#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS) - - // Multiple guarded memory regions may exceed the process address space limit. - // This function will raise or lower the limit by |amount|. -@@ -68,7 +68,7 @@ bool AdjustAddressSpaceLimit(int64_t amount) { - // schemes that reduce that to 4 GiB. - constexpr size_t kMinimumGuardedMemorySize = 1ULL << 32; // 4 GiB - --#endif // defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) -+#endif // (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS) - - void* SystemAllocPagesInternal(void* hint, - size_t length, -@@ -134,7 +134,7 @@ void SetSystemPagesAccessInternal( - void FreePagesInternal(void* address, size_t length) { - CHECK(!munmap(address, length)); - --#if defined(OS_LINUX) && defined(ARCH_CPU_64_BITS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_64_BITS) - // Restore the address space limit. - if (length >= kMinimumGuardedMemorySize) { - CHECK(AdjustAddressSpaceLimit(-base::checked_cast<int64_t>(length))); diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc new file mode 100644 index 000000000000..12143fe54c50 --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__unittest.cc @@ -0,0 +1,17 @@ +--- base/allocator/partition_allocator/partition_alloc_unittest.cc.orig 2020-03-23 15:20:45 UTC ++++ base/allocator/partition_allocator/partition_alloc_unittest.cc +@@ -314,9 +314,13 @@ void FreeFullPage(PartitionPage* page) { + } + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + bool CheckPageInCore(void* ptr, bool in_core) { ++#if defined(OS_BSD) ++ char ret = 0; ++#else + unsigned char ret = 0; ++#endif + EXPECT_EQ(0, mincore(ptr, kSystemPageSize, &ret)); + return in_core == (ret & 1); + } diff --git a/www/iridium/files/patch-base_base__switches.cc b/www/iridium/files/patch-base_base__switches.cc new file mode 100644 index 000000000000..92ed9217882d --- /dev/null +++ b/www/iridium/files/patch-base_base__switches.cc @@ -0,0 +1,20 @@ +--- base/base_switches.cc.orig 2019-10-21 19:06:18 UTC ++++ base/base_switches.cc +@@ -117,7 +117,7 @@ const char kDisableHighResTimer[] = "disable-highres-t + const char kDisableUsbKeyboardDetect[] = "disable-usb-keyboard-detect"; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // The /dev/shm partition is too small in certain VM environments, causing + // Chrome to fail or crash (see http://crbug.com/715363). Use this flag to + // work-around this issue (a temporary directory will always be used to create +@@ -138,7 +138,7 @@ const char kEnableCrashReporterForTesting[] = + const char kEnableReachedCodeProfiler[] = "enable-reached-code-profiler"; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Controls whether or not retired instruction counts are surfaced for threads + // in trace events on Linux. + // diff --git a/www/iridium/files/patch-base_base__switches.h b/www/iridium/files/patch-base_base__switches.h new file mode 100644 index 000000000000..f2be6f05c697 --- /dev/null +++ b/www/iridium/files/patch-base_base__switches.h @@ -0,0 +1,20 @@ +--- base/base_switches.h.orig 2019-10-21 19:06:18 UTC ++++ base/base_switches.h +@@ -38,7 +38,7 @@ extern const char kDisableHighResTimer[]; + extern const char kDisableUsbKeyboardDetect[]; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + extern const char kDisableDevShmUsage[]; + #endif + +@@ -51,7 +51,7 @@ extern const char kEnableReachedCodeProfiler[]; + extern const char kOrderfileMemoryOptimization[]; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + extern const char kEnableThreadInstructionCount[]; + #endif + diff --git a/www/iridium/files/patch-base_cpu.cc b/www/iridium/files/patch-base_cpu.cc new file mode 100644 index 000000000000..231561a3a542 --- /dev/null +++ b/www/iridium/files/patch-base_cpu.cc @@ -0,0 +1,38 @@ +--- base/cpu.cc.orig 2019-10-21 19:06:18 UTC ++++ base/cpu.cc +@@ -14,7 +14,7 @@ + + #include "base/stl_util.h" + +-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + #include "base/files/file_util.h" + #endif + +@@ -135,7 +135,7 @@ uint64_t xgetbv(uint32_t xcr) { + + #endif // ARCH_CPU_X86_FAMILY + +-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + std::string* CpuInfoBrand() { + static std::string* brand = []() { + // This function finds the value from /proc/cpuinfo under the key "model +@@ -165,7 +165,7 @@ std::string* CpuInfoBrand() { + return brand; + } + #endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || +- // defined(OS_LINUX)) ++ // defined(OS_LINUX) || defined(OS_BSD)) + + } // namespace + +@@ -287,7 +287,7 @@ void CPU::Initialize() { + } + } + #elif defined(ARCH_CPU_ARM_FAMILY) +-#if (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + cpu_brand_ = *CpuInfoBrand(); + #elif defined(OS_WIN) + // Windows makes high-resolution thread timing information available in diff --git a/www/iridium/files/patch-base_debug_debugger__posix.cc b/www/iridium/files/patch-base_debug_debugger__posix.cc index 277dc8eb3238..62317b93a5a1 100644 --- a/www/iridium/files/patch-base_debug_debugger__posix.cc +++ b/www/iridium/files/patch-base_debug_debugger__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/debugger_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/debug/debugger_posix.cc.orig 2019-09-09 21:55:05 UTC +++ base/debug/debugger_posix.cc -@@ -86,7 +86,7 @@ bool BeingDebugged() { +@@ -90,7 +90,7 @@ bool BeingDebugged() { KERN_PROC, KERN_PROC_PID, getpid() @@ -9,7 +9,7 @@ , sizeof(struct kinfo_proc), 0 #endif -@@ -94,33 +94,35 @@ bool BeingDebugged() { +@@ -98,33 +98,35 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. diff --git a/www/iridium/files/patch-base_debug_elf__reader.cc b/www/iridium/files/patch-base_debug_elf__reader.cc new file mode 100644 index 000000000000..8eca61e3c66e --- /dev/null +++ b/www/iridium/files/patch-base_debug_elf__reader.cc @@ -0,0 +1,28 @@ +--- base/debug/elf_reader.cc.orig 2020-02-24 18:39:05 UTC ++++ base/debug/elf_reader.cc +@@ -35,7 +35,9 @@ using Nhdr = Elf64_Nhdr; + using Word = Elf64_Word; + #endif + ++#if !defined(OS_BSD) + constexpr char kGnuNoteName[] = "GNU"; ++#endif + + // Returns a pointer to the header of the ELF binary mapped into memory, + // or a null pointer if the header is invalid. +@@ -98,6 +100,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, + bool found = false; + while (current_section < section_end) { + current_note = reinterpret_cast<const Nhdr*>(current_section); ++#if !defined(OS_BSD) + if (current_note->n_type == NT_GNU_BUILD_ID) { + StringPiece note_name(current_section + sizeof(Nhdr), + current_note->n_namesz); +@@ -107,6 +110,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, + break; + } + } ++#endif + + size_t section_size = bits::Align(current_note->n_namesz, 4) + + bits::Align(current_note->n_descsz, 4) + diff --git a/www/iridium/files/patch-base_debug_elf__reader__linux.cc b/www/iridium/files/patch-base_debug_elf__reader__linux.cc deleted file mode 100644 index b0e23be85bc6..000000000000 --- a/www/iridium/files/patch-base_debug_elf__reader__linux.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- base/debug/elf_reader_linux.cc.orig 2019-03-11 22:00:51 UTC -+++ base/debug/elf_reader_linux.cc -@@ -41,8 +41,10 @@ Optional<std::string> ElfSegmentBuildIDNoteAsString(co - const void* section_end = segment.data() + segment.size_bytes(); - const Nhdr* note_header = reinterpret_cast<const Nhdr*>(segment.data()); - while (note_header < section_end) { -+#if !defined(OS_BSD) - if (note_header->n_type == NT_GNU_BUILD_ID) - break; -+#endif - note_header = reinterpret_cast<const Nhdr*>( - reinterpret_cast<const char*>(note_header) + sizeof(Nhdr) + - bits::Align(note_header->n_namesz, 4) + diff --git a/www/iridium/files/patch-base_debug_proc__maps__linux.cc b/www/iridium/files/patch-base_debug_proc__maps__linux.cc index d01a104d5413..21024cb210a8 100644 --- a/www/iridium/files/patch-base_debug_proc__maps__linux.cc +++ b/www/iridium/files/patch-base_debug_proc__maps__linux.cc @@ -1,4 +1,4 @@ ---- base/debug/proc_maps_linux.cc.orig 2019-03-11 22:00:51 UTC +--- base/debug/proc_maps_linux.cc.orig 2020-03-16 18:39:41 UTC +++ base/debug/proc_maps_linux.cc @@ -12,7 +12,7 @@ #include "base/strings/string_split.h" @@ -9,3 +9,133 @@ #include <inttypes.h> #endif +@@ -28,6 +28,11 @@ + namespace base { + namespace debug { + ++#if defined(OS_BSD) ++const char kProcSelfMapsPath[] = "/proc/curproc/map"; ++#else ++const char kProcSelfMapsPath[] = "/proc/self/maps"; ++ + // Scans |proc_maps| starting from |pos| returning true if the gate VMA was + // found, otherwise returns false. + static bool ContainsGateVMA(std::string* proc_maps, size_t pos) { +@@ -43,15 +48,16 @@ static bool ContainsGateVMA(std::string* proc_maps, si + return false; + #endif + } ++#endif + + bool ReadProcMaps(std::string* proc_maps) { + // seq_file only writes out a page-sized amount on each call. Refer to header + // file for details. + const long kReadSize = sysconf(_SC_PAGESIZE); + +- base::ScopedFD fd(HANDLE_EINTR(open("/proc/self/maps", O_RDONLY))); ++ base::ScopedFD fd(HANDLE_EINTR(open(kProcSelfMapsPath, O_RDONLY))); + if (!fd.is_valid()) { +- DPLOG(ERROR) << "Couldn't open /proc/self/maps"; ++ DPLOG(ERROR) << "Couldn't open " << kProcSelfMapsPath; + return false; + } + proc_maps->clear(); +@@ -65,7 +71,7 @@ bool ReadProcMaps(std::string* proc_maps) { + + ssize_t bytes_read = HANDLE_EINTR(read(fd.get(), buffer, kReadSize)); + if (bytes_read < 0) { +- DPLOG(ERROR) << "Couldn't read /proc/self/maps"; ++ DPLOG(ERROR) << "Couldn't read " << kProcSelfMapsPath; + proc_maps->clear(); + return false; + } +@@ -76,6 +82,7 @@ bool ReadProcMaps(std::string* proc_maps) { + if (bytes_read == 0) + break; + ++#if !defined(OS_BSD) + // The gate VMA is handled as a special case after seq_file has finished + // iterating through all entries in the virtual memory table. + // +@@ -86,6 +93,7 @@ bool ReadProcMaps(std::string* proc_maps) { + // Avoid this by searching for the gate VMA and breaking early. + if (ContainsGateVMA(proc_maps, pos)) + break; ++#endif + } + + return true; +@@ -114,10 +122,32 @@ bool ParseProcMaps(const std::string& input, + MappedMemoryRegion region; + const char* line = lines[i].c_str(); + char permissions[5] = {'\0'}; // Ensure NUL-terminated string. ++ int path_index = 0; ++ ++#if defined(OS_BSD) ++ if (lines[i].empty()) ++ continue; ++ ++ ++ char cow; ++ ++ // Format: ++ // ++ // start end resident private_resident obj perms ref_count shadow_count flags cow needs_copy type fullpath cred ruid ++ // 0x200000 0x202000 2 6 0xfffff80005be9000 r-- 3 1 0x1000 COW NC vnode /bin/cat NCH -1 ++ // ++ if (sscanf(line, "%" SCNxPTR " %" SCNxPTR " %*ld %*ld %*llx %3c %*d %*d %*x %c%*s %*s %*s %n", ++ ®ion.start, ®ion.end, permissions, &cow, &path_index) < 4) { ++ DPLOG(WARNING) << "sscanf failed for line: " << line; ++ return false; ++ } ++ ++ const char* fullpath = line + path_index; ++ const char* cred = strchr(fullpath, ' '); ++#else + uint8_t dev_major = 0; + uint8_t dev_minor = 0; + long inode = 0; +- int path_index = 0; + + // Sample format from man 5 proc: + // +@@ -133,6 +163,7 @@ bool ParseProcMaps(const std::string& input, + DPLOG(WARNING) << "sscanf failed for line: " << line; + return false; + } ++#endif + + region.permissions = 0; + +@@ -151,14 +182,31 @@ bool ParseProcMaps(const std::string& input, + else if (permissions[2] != '-') + return false; + ++#if defined(OS_BSD) ++ if (cow == 'C') { ++ region.permissions |= MappedMemoryRegion::PRIVATE; ++ } else if (cow != 'N') { ++ DPLOG(WARNING) << "unknown value for COW in line " << line << ": " << cow; ++ return false; ++ } ++#else + if (permissions[3] == 'p') + region.permissions |= MappedMemoryRegion::PRIVATE; + else if (permissions[3] != 's' && permissions[3] != 'S') // Shared memory. + return false; ++#endif + + // Pushing then assigning saves us a string copy. + regions.push_back(region); ++#if defined(OS_BSD) ++ if (cred != nullptr) { ++ regions.back().path.assign(line + path_index, cred - fullpath); ++ } else { ++ regions.back().path.assign(line + path_index); ++ } ++#else + regions.back().path.assign(line + path_index); ++#endif + } + + regions_out->swap(regions); diff --git a/www/iridium/files/patch-base_debug_stack__trace.h b/www/iridium/files/patch-base_debug_stack__trace.h index 415d73c63d02..6b4e63dd1e32 100644 --- a/www/iridium/files/patch-base_debug_stack__trace.h +++ b/www/iridium/files/patch-base_debug_stack__trace.h @@ -1,9 +1,9 @@ ---- base/debug/stack_trace.h.orig 2019-03-11 22:00:51 UTC +--- base/debug/stack_trace.h.orig 2019-09-09 21:55:05 UTC +++ base/debug/stack_trace.h -@@ -16,6 +16,7 @@ - #include "build/build_config.h" - - #if defined(OS_POSIX) +@@ -19,6 +19,7 @@ + #if !defined(OS_NACL) + #include <signal.h> + #endif +#include <sys/stdint.h> #include <unistd.h> #endif diff --git a/www/iridium/files/patch-base_debug_stack__trace__posix.cc b/www/iridium/files/patch-base_debug_stack__trace__posix.cc index b4db467db920..f3b967c844e2 100644 --- a/www/iridium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/iridium/files/patch-base_debug_stack__trace__posix.cc @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/debug/stack_trace_posix.cc.orig 2020-03-16 18:39:41 UTC +++ base/debug/stack_trace_posix.cc @@ -35,7 +35,7 @@ #include <AvailabilityMacros.h> @@ -9,23 +9,15 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -653,6 +653,11 @@ class SandboxSymbolizeHelper { - // for the modules that are loaded in the current process. - // Returns true on success. - bool CacheMemoryRegions() { +@@ -697,7 +697,11 @@ class SandboxSymbolizeHelper { + // Skip regions with empty file names. + continue; + } +#if defined(OS_BSD) -+ // TODO (rene) avoid link error, implement something? -+ NOTIMPLEMENTED(); -+ return false; -+#else - // Reads /proc/self/maps. - std::string contents; - if (!ReadProcMaps(&contents)) { -@@ -670,6 +675,7 @@ class SandboxSymbolizeHelper { - - is_initialized_ = true; - return true; ++ if (region.path[0] == '-') { ++#else + if (region.path[0] == '[') { +#endif - } - - // Opens all object files and caches their file descriptors. + // Skip pseudo-paths, like [stack], [vdso], [heap], etc ... + continue; + } diff --git a/www/iridium/files/patch-base_debug_stack__trace__unittest.cc b/www/iridium/files/patch-base_debug_stack__trace__unittest.cc new file mode 100644 index 000000000000..933a8e8ce401 --- /dev/null +++ b/www/iridium/files/patch-base_debug_stack__trace__unittest.cc @@ -0,0 +1,31 @@ +--- base/debug/stack_trace_unittest.cc.orig 2020-03-23 14:01:09 UTC ++++ base/debug/stack_trace_unittest.cc +@@ -86,6 +86,7 @@ TEST_F(StackTraceTest, OutputToStream) { + std::string::npos) + << "Unable to resolve symbols."; + ++#if !defined(OS_BSD) + // Expect a demangled symbol. + // Note that Windows Release builds omit the function parameters from the + // demangled stack output, otherwise this could be "testing::Test::Run()". +@@ -103,9 +104,10 @@ TEST_F(StackTraceTest, OutputToStream) { + EXPECT_TRUE(backtrace_message.find(__func__) != std::string::npos) + << "Expected to find " << __func__ << " in backtrace:\n" + << backtrace_message; ++#endif + } + +-#if !defined(OFFICIAL_BUILD) && !defined(NO_UNWIND_TABLES) ++#if !defined(OFFICIAL_BUILD) && !defined(NO_UNWIND_TABLES) && !defined(OS_BSD) + // Disabled in Official builds, where Link-Time Optimization can result in two + // or fewer stack frames being available, causing the test to fail. + TEST_F(StackTraceTest, TruncatedTrace) { +@@ -119,7 +121,7 @@ TEST_F(StackTraceTest, TruncatedTrace) { + truncated.Addresses(&count); + EXPECT_EQ(2u, count); + } +-#endif // !defined(OFFICIAL_BUILD) && !defined(NO_UNWIND_TABLES) ++#endif // !defined(OFFICIAL_BUILD) && !defined(NO_UNWIND_TABLES) && !defined(OS_BSD) + + // The test is used for manual testing, e.g., to see the raw output. + TEST_F(StackTraceTest, DebugOutputToStream) { diff --git a/www/iridium/files/patch-base_files_file__path__unittest.cc b/www/iridium/files/patch-base_files_file__path__unittest.cc index 1b23810f1b9d..26521d022831 100644 --- a/www/iridium/files/patch-base_files_file__path__unittest.cc +++ b/www/iridium/files/patch-base_files_file__path__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/files/file_path_unittest.cc.orig 2020-03-16 18:39:41 UTC +++ base/files/file_path_unittest.cc -@@ -1138,7 +1138,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) +@@ -1149,7 +1149,7 @@ TEST_F(FilePathTest, FromUTF8Unsafe_And_AsUTF8Unsafe) "\xEF\xBC\xA1\xEF\xBC\xA2\xEF\xBC\xA3.txt" }, }; diff --git a/www/iridium/files/patch-base_files_file__path__watcher.cc b/www/iridium/files/patch-base_files_file__path__watcher.cc new file mode 100644 index 000000000000..87abcb7fbda1 --- /dev/null +++ b/www/iridium/files/patch-base_files_file__path__watcher.cc @@ -0,0 +1,15 @@ +--- base/files/file_path_watcher.cc.orig 2020-03-16 18:39:41 UTC ++++ base/files/file_path_watcher.cc +@@ -20,10 +20,10 @@ FilePathWatcher::~FilePathWatcher() { + // static + bool FilePathWatcher::RecursiveWatchAvailable() { + #if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN) || \ +- defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) ++ (defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_ANDROID) || defined(OS_AIX) + return true; + #else +- // FSEvents isn't available on iOS. ++ // FSEvents isn't available on iOS and the kqueue watcher. + return false; + #endif + } diff --git a/www/iridium/files/patch-base_files_file__path__watcher__stub.cc b/www/iridium/files/patch-base_files_file__path__watcher__stub.cc index c5e3e567015b..fc76cd1b16b3 100644 --- a/www/iridium/files/patch-base_files_file__path__watcher__stub.cc +++ b/www/iridium/files/patch-base_files_file__path__watcher__stub.cc @@ -1,4 +1,4 @@ ---- base/files/file_path_watcher_stub.cc.orig 2019-03-11 22:00:51 UTC +--- base/files/file_path_watcher_stub.cc.orig 2020-03-16 18:39:41 UTC +++ base/files/file_path_watcher_stub.cc @@ -1,14 +1,15 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. @@ -20,20 +20,22 @@ namespace base { -@@ -22,12 +23,26 @@ class FilePathWatcherImpl : public FilePathWatcher::Pl +@@ -22,12 +23,29 @@ class FilePathWatcherImpl : public FilePathWatcher::Pl bool Watch(const FilePath& path, bool recursive, const FilePathWatcher::Callback& callback) override { -- return false; ++#if defined(OS_BSD) + DCHECK(!impl_.get()); + if (recursive) { -+ if (!FilePathWatcher::RecursiveWatchAvailable()) -+ return false; ++ return false; + } else { -+ impl_ = std::make_unique<FilePathWatcherKQueue>(); ++ impl_ = std::make_unique<FilePathWatcherKQueue>(); + } + DCHECK(impl_.get()); + return impl_->Watch(path, recursive, callback); ++#else + return false; ++#endif } - void Cancel() override {} diff --git a/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc b/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc index 875d768c6198..5e7e385e5e23 100644 --- a/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2020-03-16 18:39:41 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -436,7 +436,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -435,7 +435,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvents()); @@ -9,3 +9,33 @@ // Mac implementation does not detect files modified in a directory. ASSERT_TRUE(WriteFile(file1, "content v2")); VLOG(1) << "Waiting for file1 modification"; +@@ -808,7 +808,7 @@ enum Permission { + Execute + }; + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_BSD) + bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { + struct stat stat_buf; + +@@ -837,9 +837,9 @@ bool ChangeFilePermissions(const FilePath& path, Permi + } + return chmod(path.value().c_str(), stat_buf.st_mode) == 0; + } +-#endif // defined(OS_MACOSX) ++#endif // defined(OS_MACOSX) || defined(OS_BSD) + +-#if defined(OS_MACOSX) ++#if defined(OS_MACOSX) || defined(OS_BSD) + // Linux implementation of FilePathWatcher doesn't catch attribute changes. + // http://crbug.com/78043 + // Windows implementation of FilePathWatcher catches attribute changes that +@@ -874,7 +874,7 @@ TEST_F(FilePathWatcherTest, DirAttributesChanged) { + ASSERT_TRUE(ChangeFilePermissions(test_dir1, Execute, true)); + } + +-#endif // OS_MACOSX ++#endif // OS_MACOSX || OS_BSD + } // namespace + + } // namespace base diff --git a/www/iridium/files/patch-base_files_file__util.h b/www/iridium/files/patch-base_files_file__util.h index 171e3d8786ec..65171a867e06 100644 --- a/www/iridium/files/patch-base_files_file__util.h +++ b/www/iridium/files/patch-base_files_file__util.h @@ -1,6 +1,6 @@ ---- base/files/file_util.h.orig 2019-03-11 22:00:51 UTC +--- base/files/file_util.h.orig 2020-03-16 18:39:41 UTC +++ base/files/file_util.h -@@ -445,7 +445,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas +@@ -519,7 +519,7 @@ BASE_EXPORT bool VerifyPathControlledByAdmin(const bas // the directory |path|, in the number of FilePath::CharType, or -1 on failure. BASE_EXPORT int GetMaximumPathComponentLength(const base::FilePath& path); diff --git a/www/iridium/files/patch-base_files_file__util__posix.cc b/www/iridium/files/patch-base_files_file__util__posix.cc index 1cfb136f5576..4342a618c454 100644 --- a/www/iridium/files/patch-base_files_file__util__posix.cc +++ b/www/iridium/files/patch-base_files_file__util__posix.cc @@ -1,7 +1,7 @@ ---- base/files/file_util_posix.cc.orig 2019-03-17 21:31:57 UTC +--- base/files/file_util_posix.cc.orig 2020-02-03 21:52:37 UTC +++ base/files/file_util_posix.cc -@@ -407,7 +407,7 @@ bool CopyDirectoryExcl(const FilePath& from_path, - #endif // !defined(OS_NACL_NONSFI) +@@ -411,7 +411,7 @@ bool CreatePipe(ScopedFD* read_fd, ScopedFD* write_fd, + } bool CreateLocalNonBlockingPipe(int fds[2]) { -#if defined(OS_LINUX) diff --git a/www/iridium/files/patch-base_files_file__util__unittest.cc b/www/iridium/files/patch-base_files_file__util__unittest.cc new file mode 100644 index 000000000000..5ddff833acb1 --- /dev/null +++ b/www/iridium/files/patch-base_files_file__util__unittest.cc @@ -0,0 +1,20 @@ +--- base/files/file_util_unittest.cc.orig 2020-03-23 13:34:59 UTC ++++ base/files/file_util_unittest.cc +@@ -3434,7 +3434,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { + } + #endif // defined(OS_WIN) + +-#if defined(OS_POSIX) && !defined(OS_MACOSX) ++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { + FilePath file_path("/proc/cpuinfo"); + std::string data = "temp"; +@@ -3452,7 +3452,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSyste + + EXPECT_FALSE(ReadFileToStringWithMaxSize(file_path, nullptr, 4)); + } +-#endif // defined(OS_POSIX) && !defined(OS_MACOSX) ++#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) + + TEST_F(FileUtilTest, ReadFileToStringWithLargeFile) { + std::string data(kLargeFileSize, 'c'); diff --git a/www/iridium/files/patch-base_files_memory__mapped__file__posix.cc b/www/iridium/files/patch-base_files_memory__mapped__file__posix.cc deleted file mode 100644 index 7ebabeead36b..000000000000 --- a/www/iridium/files/patch-base_files_memory__mapped__file__posix.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/files/memory_mapped_file_posix.cc.orig 2019-03-11 22:00:51 UTC -+++ base/files/memory_mapped_file_posix.cc -@@ -110,6 +110,8 @@ bool MemoryMappedFile::MapFileRegionToMemory( - // Only Android API>=21 supports the fallocate call. Older versions need - // to manually extend the file by writing zeros at block intervals. - do_manual_extension = true; -+#elif defined(OS_BSD) -+ do_manual_extension = true; - #elif defined(OS_MACOSX) - // MacOS doesn't support fallocate even though their new APFS filesystem - // does support sparse files. It does, however, have the functionality diff --git a/www/iridium/files/patch-base_files_scoped__file.cc b/www/iridium/files/patch-base_files_scoped__file.cc new file mode 100644 index 000000000000..84ba47ff6aeb --- /dev/null +++ b/www/iridium/files/patch-base_files_scoped__file.cc @@ -0,0 +1,11 @@ +--- base/files/scoped_file.cc.orig 2019-07-29 18:17:43 UTC ++++ base/files/scoped_file.cc +@@ -30,7 +30,7 @@ void ScopedFDCloseTraits::Free(int fd) { + // a single open directory would bypass the entire security model. + int ret = IGNORE_EINTR(close(fd)); + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || \ ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ + defined(OS_ANDROID) + // NB: Some file descriptors can return errors from close() e.g. network + // filesystems such as NFS and Linux input devices. On Linux, macOS, and diff --git a/www/iridium/files/patch-base_i18n_icu__util.cc b/www/iridium/files/patch-base_i18n_icu__util.cc index 80e0544ed35b..34f2453a25de 100644 --- a/www/iridium/files/patch-base_i18n_icu__util.cc +++ b/www/iridium/files/patch-base_i18n_icu__util.cc @@ -1,20 +1,20 @@ ---- base/i18n/icu_util.cc.orig 2019-03-11 22:00:51 UTC +--- base/i18n/icu_util.cc.orig 2020-03-16 18:40:27 UTC +++ base/i18n/icu_util.cc -@@ -20,7 +20,7 @@ - #include "build/build_config.h" - #include "third_party/icu/source/common/unicode/putil.h" - #include "third_party/icu/source/common/unicode/udata.h" --#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID) -+#if (defined(OS_LINUX) || defined(OS_BSD) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID) - #include "third_party/icu/source/i18n/unicode/timezone.h" +@@ -46,7 +46,7 @@ #endif -@@ -315,7 +315,7 @@ bool InitializeICU() { - // TODO(jungshik): Some callers do not care about tz at all. If necessary, - // add a boolean argument to this function to init'd the default tz only - // when requested. --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - if (result) - std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault()); + #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ +- (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) ++ (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) + #include "third_party/icu/source/i18n/unicode/timezone.h" #endif + +@@ -341,7 +341,7 @@ void InitializeIcuTimeZone() { + fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); + icu::TimeZone::adoptDefault( + icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); +-#elif defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST) ++#elif (defined(OS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) + // To respond to the timezone change properly, the default timezone + // cache in ICU has to be populated on starting up. + // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). diff --git a/www/iridium/files/patch-base_linux__util.cc b/www/iridium/files/patch-base_linux__util.cc index c36197ce5d6a..216208c37181 100644 --- a/www/iridium/files/patch-base_linux__util.cc +++ b/www/iridium/files/patch-base_linux__util.cc @@ -1,6 +1,6 @@ ---- base/linux_util.cc.orig 2019-03-11 22:00:51 UTC +--- base/linux_util.cc.orig 2019-12-16 21:50:40 UTC +++ base/linux_util.cc -@@ -90,12 +90,14 @@ char g_linux_distro[kDistroSize] = +@@ -144,6 +144,8 @@ char g_linux_distro[kDistroSize] = "CrOS"; #elif defined(OS_ANDROID) "Android"; @@ -9,6 +9,8 @@ #else // if defined(OS_LINUX) "Unknown"; #endif +@@ -164,7 +166,7 @@ BASE_EXPORT std::string GetKeyValueFromOSReleaseFileFo + } std::string GetLinuxDistro() { -#if defined(OS_CHROMEOS) || defined(OS_ANDROID) diff --git a/www/iridium/files/patch-base_logging__unittest.cc b/www/iridium/files/patch-base_logging__unittest.cc index 53f299987dca..2e9496b55220 100644 --- a/www/iridium/files/patch-base_logging__unittest.cc +++ b/www/iridium/files/patch-base_logging__unittest.cc @@ -1,6 +1,6 @@ ---- base/logging_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/logging_unittest.cc.orig 2019-12-16 21:51:21 UTC +++ base/logging_unittest.cc -@@ -420,7 +420,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -591,7 +591,7 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; diff --git a/www/iridium/files/patch-base_memory_discardable__memory.cc b/www/iridium/files/patch-base_memory_discardable__memory.cc new file mode 100644 index 000000000000..b50f404a2764 --- /dev/null +++ b/www/iridium/files/patch-base_memory_discardable__memory.cc @@ -0,0 +1,63 @@ +--- base/memory/discardable_memory.cc.orig 2020-02-07 10:23:12 UTC ++++ base/memory/discardable_memory.cc +@@ -23,7 +23,7 @@ const base::Feature kMadvFreeDiscardableMemory{ + "MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT}; + #endif // defined(OS_POSIX) + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + const base::Feature kDiscardableMemoryBackingTrial{ + "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT}; + +@@ -41,13 +41,13 @@ const base::FeatureParam<DiscardableMemoryTrialGroup> + DiscardableMemoryTrialGroup::kEmulatedSharedMemory, + &kDiscardableMemoryBackingParamOptions}; + +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + + } // namespace features + + namespace { + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + + DiscardableMemoryBacking GetBackingForFieldTrial() { + DiscardableMemoryTrialGroup trial_group = +@@ -61,11 +61,11 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { + } + NOTREACHED(); + } +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + + } // namespace + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + + // Probe capabilities of this device to determine whether we should participate + // in the discardable memory backing trial. +@@ -87,18 +87,18 @@ DiscardableMemoryTrialGroup GetDiscardableMemoryBackin + DCHECK(DiscardableMemoryBackingFieldTrialIsEnabled()); + return features::kDiscardableMemoryBackingParam.Get(); + } +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + + DiscardableMemory::DiscardableMemory() = default; + + DiscardableMemory::~DiscardableMemory() = default; + + DiscardableMemoryBacking GetDiscardableMemoryBacking() { +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + if (DiscardableMemoryBackingFieldTrialIsEnabled()) { + return GetBackingForFieldTrial(); + } +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_ANDROID) + if (ashmem_device_is_supported()) diff --git a/www/iridium/files/patch-base_memory_discardable__memory__internal.h b/www/iridium/files/patch-base_memory_discardable__memory__internal.h new file mode 100644 index 000000000000..c8225e74d049 --- /dev/null +++ b/www/iridium/files/patch-base_memory_discardable__memory__internal.h @@ -0,0 +1,19 @@ +--- base/memory/discardable_memory_internal.h.orig 2020-02-07 10:22:39 UTC ++++ base/memory/discardable_memory_internal.h +@@ -10,7 +10,7 @@ + #include "base/metrics/field_trial_params.h" + #include "build/build_config.h" + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + + namespace base { + +@@ -47,6 +47,6 @@ GetDiscardableMemoryBackingFieldTrialGroup(); + + } // namespace base + +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + + #endif // BASE_MEMORY_DISCARDABLE_MEMORY_INTERNAL_H_ diff --git a/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc new file mode 100644 index 000000000000..5368440e775b --- /dev/null +++ b/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc @@ -0,0 +1,11 @@ +--- base/memory/madv_free_discardable_memory_posix.cc.orig 2020-03-16 18:39:41 UTC ++++ base/memory/madv_free_discardable_memory_posix.cc +@@ -282,7 +282,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT + + bool MadvFreeDiscardableMemoryPosix::IsResident() const { + DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_); +-#ifdef OS_MACOSX ++#if defined(OS_MACOSX) || defined(OS_BSD) + std::vector<char> vec(allocated_pages_); + #else + std::vector<unsigned char> vec(allocated_pages_); diff --git a/www/iridium/files/patch-base_memory_platform__shared__memory__region.h b/www/iridium/files/patch-base_memory_platform__shared__memory__region.h new file mode 100644 index 000000000000..477b8029c4a6 --- /dev/null +++ b/www/iridium/files/patch-base_memory_platform__shared__memory__region.h @@ -0,0 +1,29 @@ +--- base/memory/platform_shared_memory_region.h.orig 2020-02-03 21:52:37 UTC ++++ base/memory/platform_shared_memory_region.h +@@ -27,7 +27,7 @@ + #include "base/files/scoped_file.h" + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + namespace content { + class SandboxIPCHandler; + } +@@ -121,7 +121,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { + kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE + }; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Structure to limit access to executable region creation. + struct ExecutableRegion { + private: +@@ -266,7 +266,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { + CheckPlatformHandlePermissionsCorrespondToMode); + static PlatformSharedMemoryRegion Create(Mode mode, + size_t size +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + , + bool executable = false + #endif diff --git a/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc new file mode 100644 index 000000000000..c5f57c29c6bc --- /dev/null +++ b/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -0,0 +1,38 @@ +--- base/memory/platform_shared_memory_region_posix.cc.orig 2020-02-03 21:52:37 UTC ++++ base/memory/platform_shared_memory_region_posix.cc +@@ -75,7 +75,7 @@ FDPair ScopedFDPair::get() const { + return {fd.get(), readonly_fd.get()}; + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // static + ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { + PlatformSharedMemoryRegion region = +@@ -84,7 +84,7 @@ ScopedFD PlatformSharedMemoryRegion::ExecutableRegion: + return region.PassPlatformHandle().fd; + return ScopedFD(); + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // static + PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Take( +@@ -209,7 +209,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o + // static + PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, + size_t size +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + , + bool executable + #endif +@@ -240,7 +240,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: + // flag. + FilePath directory; + if (!GetShmemTempDir( +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + executable, + #else + false /* executable */, diff --git a/www/iridium/files/patch-base_memory_shared__memory__region__unittest.cc b/www/iridium/files/patch-base_memory_shared__memory__region__unittest.cc new file mode 100644 index 000000000000..b2525b4381ee --- /dev/null +++ b/www/iridium/files/patch-base_memory_shared__memory__region__unittest.cc @@ -0,0 +1,16 @@ +--- base/memory/shared_memory_region_unittest.cc.orig 2020-03-23 16:31:23 UTC ++++ base/memory/shared_memory_region_unittest.cc +@@ -188,10 +188,13 @@ TYPED_TEST(SharedMemoryRegionTest, MapAtNotAlignedOffs + std::tie(region, rw_mapping) = CreateMappedRegion<TypeParam>(kDataSize); + ASSERT_TRUE(region.IsValid()); + ASSERT_TRUE(rw_mapping.IsValid()); ++#if !defined(OS_BSD) ++ // On FreeBSD, mmap() does not require an aligned offset + off_t offset = kDataSize / 2; + typename TypeParam::MappingType mapping = + region.MapAt(offset, kDataSize - offset); + EXPECT_FALSE(mapping.IsValid()); ++#endif + } + + TYPED_TEST(SharedMemoryRegionTest, MapZeroBytesFails) { diff --git a/www/iridium/files/patch-base_numerics_safe__math__shared__impl.h b/www/iridium/files/patch-base_numerics_safe__math__shared__impl.h index cd48c1a24031..c088ad9451d0 100644 --- a/www/iridium/files/patch-base_numerics_safe__math__shared__impl.h +++ b/www/iridium/files/patch-base_numerics_safe__math__shared__impl.h @@ -1,13 +1,12 @@ ---- base/numerics/safe_math_shared_impl.h.orig 2019-03-11 22:00:51 UTC +--- base/numerics/safe_math_shared_impl.h.orig 2019-09-09 21:55:05 UTC +++ base/numerics/safe_math_shared_impl.h -@@ -19,9 +19,7 @@ - +@@ -23,8 +23,7 @@ // Where available use builtin math overflow support on Clang and GCC. - #if !defined(__native_client__) && \ -- ((defined(__clang__) && \ -- ((__clang_major__ > 3) || \ -- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ -+ ((defined(__clang__) && (__clang_major__ > 6)) || \ - (defined(__GNUC__) && __GNUC__ >= 5)) + #elif !defined(__native_client__) && \ + ((defined(__clang__) && \ +- ((__clang_major__ > 3) || \ +- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ ++ (__clang_major__ > 6)) || \ + (defined(__GNUC__) && __GNUC__ >= 5)) #include "base/numerics/safe_math_clang_gcc_impl.h" #define BASE_HAS_OPTIMIZED_SAFE_MATH (1) diff --git a/www/iridium/files/patch-base_path__service__unittest.cc b/www/iridium/files/patch-base_path__service__unittest.cc new file mode 100644 index 000000000000..20ffac278abc --- /dev/null +++ b/www/iridium/files/patch-base_path__service__unittest.cc @@ -0,0 +1,11 @@ +--- base/path_service_unittest.cc.orig 2020-03-23 15:23:42 UTC ++++ base/path_service_unittest.cc +@@ -36,7 +36,7 @@ bool ReturnsValidPath(int dir_type) { + if (dir_type == DIR_CACHE) + check_path_exists = false; + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On the linux try-bots: a path is returned (e.g. /home/chrome-bot/Desktop), + // but it doesn't exist. + if (dir_type == DIR_USER_DESKTOP) diff --git a/www/iridium/files/patch-base_process_internal__linux.cc b/www/iridium/files/patch-base_process_internal__linux.cc index ca42b91c4296..abfff7cd44ce 100644 --- a/www/iridium/files/patch-base_process_internal__linux.cc +++ b/www/iridium/files/patch-base_process_internal__linux.cc @@ -1,16 +1,97 @@ ---- base/process/internal_linux.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/internal_linux.cc.orig 2020-03-16 18:39:41 UTC +++ base/process/internal_linux.cc -@@ -60,10 +60,13 @@ bool ReadProcFile(const FilePath& file, std::string* b - // Synchronously reading files in /proc is safe. - ThreadRestrictions::ScopedAllowIO allow_io; +@@ -29,7 +29,11 @@ namespace internal { -+#if !defined(OS_BSD) - if (!ReadFileToString(file, buffer)) { + const char kProcDir[] = "/proc"; + ++#if defined(OS_BSD) ++const char kStatFile[] = "status"; ++#else + const char kStatFile[] = "stat"; ++#endif + + FilePath GetProcPidDir(pid_t pid) { + return FilePath(kProcDir).Append(NumberToString(pid)); +@@ -64,6 +68,7 @@ bool ReadProcFile(const FilePath& file, std::string* b DLOG(WARNING) << "Failed to read " << file.MaybeAsASCII(); return false; } -+#endif + return !buffer->empty(); } +@@ -79,6 +84,22 @@ bool ParseProcStats(const std::string& stats_data, + if (stats_data.empty()) + return false; + ++#if defined(OS_BSD) ++ proc_stats->clear(); ++ ++ std::vector<std::string> other_stats = SplitString( ++ stats_data, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); ++ ++ for (const auto& i : other_stats) { ++ auto pos = i.find(','); ++ ++ if (pos == std::string::npos) { ++ proc_stats->push_back(i); ++ } else { ++ proc_stats->push_back(i.substr(0, pos)); ++ } ++ } ++#else + // The stat file is formatted as: + // pid (process name) data1 data2 .... dataN + // Look for the closing paren by scanning backwards, to avoid being fooled by +@@ -108,6 +129,7 @@ bool ParseProcStats(const std::string& stats_data, + base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); + for (const auto& i : other_stats) + proc_stats->push_back(i); ++#endif + return true; + } + +@@ -155,7 +177,11 @@ int64_t ReadProcStatsAndGetFieldAsInt64(pid_t pid, Pro + } + + int64_t ReadProcSelfStatsAndGetFieldAsInt64(ProcStatsFields field_num) { ++#if defined(OS_BSD) ++ FilePath stat_file = FilePath(kProcDir).Append("curproc").Append(kStatFile); ++#else + FilePath stat_file = FilePath(kProcDir).Append("self").Append(kStatFile); ++#endif + return ReadStatFileAndGetFieldAsInt64(stat_file, field_num); + } + +@@ -171,6 +197,9 @@ size_t ReadProcStatsAndGetFieldAsSizeT(pid_t pid, + } + + Time GetBootTime() { ++#if defined(OS_BSD) ++ return Time(); ++#else + FilePath path("/proc/stat"); + std::string contents; + if (!ReadProcFile(path, &contents)) +@@ -184,9 +213,13 @@ Time GetBootTime() { + if (!StringToInt(btime_it->second, &btime)) + return Time(); + return Time::FromTimeT(btime); ++#endif + } + + TimeDelta GetUserCpuTimeSinceBoot() { ++#if defined(OS_BSD) ++ return TimeDelta(); ++#else + FilePath path("/proc/stat"); + std::string contents; + if (!ReadProcFile(path, &contents)) +@@ -210,6 +243,7 @@ TimeDelta GetUserCpuTimeSinceBoot() { + return TimeDelta(); + + return ClockTicksToTimeDelta(user + nice); ++#endif + } + + TimeDelta ClockTicksToTimeDelta(int clock_ticks) { diff --git a/www/iridium/files/patch-base_process_internal__linux.h b/www/iridium/files/patch-base_process_internal__linux.h index ba0e347dbe91..bfa9c8630afd 100644 --- a/www/iridium/files/patch-base_process_internal__linux.h +++ b/www/iridium/files/patch-base_process_internal__linux.h @@ -1,4 +1,4 @@ ---- base/process/internal_linux.h.orig 2019-03-11 22:00:51 UTC +--- base/process/internal_linux.h.orig 2020-03-16 18:39:41 UTC +++ base/process/internal_linux.h @@ -14,6 +14,8 @@ @@ -9,3 +9,26 @@ namespace base { class Time; +@@ -50,6 +52,14 @@ bool ParseProcStats(const std::string& stats_data, + // If the ordering ever changes, carefully review functions that use these + // values. + enum ProcStatsFields { ++#if defined(OS_BSD) ++ VM_COMM = 0, // Command name. ++ VM_PPID = 2, // Parent process id. ++ VM_PGRP = 3, // Process group id. ++ VM_STARTTIME = 7, // The process start time. ++ VM_UTIME = 8, // The user time. ++ VM_STIME = 9, // The system time ++#else + VM_COMM = 1, // Filename of executable, without parentheses. + VM_STATE = 2, // Letter indicating the state of the process. + VM_PPID = 3, // PID of the parent. +@@ -62,6 +72,7 @@ enum ProcStatsFields { + VM_STARTTIME = 21, // The time the process started in clock ticks. + VM_VSIZE = 22, // Virtual memory size in bytes. + VM_RSS = 23, // Resident Set Size in pages. ++#endif + }; + + // Reads the |field_num|th field from |proc_stats|. Returns 0 on failure. diff --git a/www/iridium/files/patch-base_process_kill.h b/www/iridium/files/patch-base_process_kill.h index 800bfe47cb6c..2e871559c90e 100644 --- a/www/iridium/files/patch-base_process_kill.h +++ b/www/iridium/files/patch-base_process_kill.h @@ -1,6 +1,6 @@ ---- base/process/kill.h.orig 2019-03-11 22:00:51 UTC +--- base/process/kill.h.orig 2019-12-16 21:50:40 UTC +++ base/process/kill.h -@@ -111,7 +111,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro +@@ -118,11 +118,11 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( ProcessHandle handle, int* exit_code); @@ -9,3 +9,8 @@ // Spawns a thread to wait asynchronously for the child |process| to exit // and then reaps it. BASE_EXPORT void EnsureProcessGetsReaped(Process process); +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + #endif // defined(OS_POSIX) + + // Registers |process| to be asynchronously monitored for termination, forcibly diff --git a/www/iridium/files/patch-base_process_kill__posix.cc b/www/iridium/files/patch-base_process_kill__posix.cc index 12caf81e5eab..69e4dbc6c05e 100644 --- a/www/iridium/files/patch-base_process_kill__posix.cc +++ b/www/iridium/files/patch-base_process_kill__posix.cc @@ -1,4 +1,4 @@ ---- base/process/kill_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/kill_posix.cc.orig 2019-06-04 18:55:15 UTC +++ base/process/kill_posix.cc @@ -168,7 +168,7 @@ void EnsureProcessTerminated(Process process) { 0, new BackgroundReaper(std::move(process), TimeDelta::FromSeconds(2))); @@ -9,3 +9,12 @@ void EnsureProcessGetsReaped(Process process) { DCHECK(!process.is_current()); +@@ -179,7 +179,7 @@ void EnsureProcessGetsReaped(Process process) { + PlatformThread::CreateNonJoinable( + 0, new BackgroundReaper(std::move(process), TimeDelta())); + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + #endif // !defined(OS_MACOSX) + #endif // !defined(OS_NACL_NONSFI) diff --git a/www/iridium/files/patch-base_process_launch.h b/www/iridium/files/patch-base_process_launch.h index c1b9c706ab46..75708ea5561e 100644 --- a/www/iridium/files/patch-base_process_launch.h +++ b/www/iridium/files/patch-base_process_launch.h @@ -1,20 +1,20 @@ ---- base/process/launch.h.orig 2019-03-11 22:00:51 UTC +--- base/process/launch.h.orig 2020-02-03 21:52:37 UTC +++ base/process/launch.h -@@ -175,7 +175,7 @@ struct BASE_EXPORT LaunchOptions { - FileHandleMappingVector fds_to_remap; - #endif // defined(OS_WIN) +@@ -180,7 +180,7 @@ struct BASE_EXPORT LaunchOptions { + bool clear_environment = false; + #endif // OS_WIN || OS_POSIX || OS_FUCHSIA -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // If non-zero, start the process using clone(), using flags as provided. // Unlike in clone, clone_flags may not contain a custom termination signal // that is sent to the parent when the child dies. The termination signal will -@@ -188,7 +188,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -193,7 +193,7 @@ struct BASE_EXPORT LaunchOptions { // Sets parent process death signal to SIGKILL. bool kill_on_parent_death = false; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - #if defined(OS_FUCHSIA) - // If valid, launches the application in that job object. + #if defined(OS_MACOSX) && !defined(OS_IOS) + // Mach ports that will be accessible to the child process. These are not diff --git a/www/iridium/files/patch-base_process_launch__posix.cc b/www/iridium/files/patch-base_process_launch__posix.cc index 8c88a282881d..ce6054a8ff79 100644 --- a/www/iridium/files/patch-base_process_launch__posix.cc +++ b/www/iridium/files/patch-base_process_launch__posix.cc @@ -1,6 +1,6 @@ ---- base/process/launch_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/launch_posix.cc.orig 2019-06-04 18:55:15 UTC +++ base/process/launch_posix.cc -@@ -64,6 +64,7 @@ +@@ -65,6 +65,7 @@ #error "macOS should use launch_mac.cc" #endif diff --git a/www/iridium/files/patch-base_process_memory.cc b/www/iridium/files/patch-base_process_memory.cc index f8e1d34c369d..ff61c2e5408b 100644 --- a/www/iridium/files/patch-base_process_memory.cc +++ b/www/iridium/files/patch-base_process_memory.cc @@ -1,7 +1,7 @@ ---- base/process/memory.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/memory.cc.orig 2020-03-16 18:39:41 UTC +++ base/process/memory.cc -@@ -10,7 +10,7 @@ - namespace base { +@@ -42,7 +42,7 @@ void OnNoMemoryInternal(size_t size) { + } // namespace internal // Defined in memory_win.cc for Windows. -#if !defined(OS_WIN) @@ -9,8 +9,8 @@ namespace { -@@ -31,7 +31,7 @@ void TerminateBecauseOutOfMemory(size_t size) { - #endif +@@ -61,7 +61,7 @@ void TerminateBecauseOutOfMemory(size_t size) { + #endif // !defined(OS_WIN) // Defined in memory_mac.mm for Mac. -#if !defined(OS_MACOSX) diff --git a/www/iridium/files/patch-base_process_memory.h b/www/iridium/files/patch-base_process_memory.h index 89dbdbcbba11..007e8593b35d 100644 --- a/www/iridium/files/patch-base_process_memory.h +++ b/www/iridium/files/patch-base_process_memory.h @@ -1,6 +1,6 @@ ---- base/process/memory.h.orig 2019-03-11 22:00:51 UTC +--- base/process/memory.h.orig 2019-10-21 19:06:18 UTC +++ base/process/memory.h -@@ -32,7 +32,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory(); +@@ -24,7 +24,7 @@ BASE_EXPORT void EnableTerminationOnOutOfMemory(); // Crash reporting classifies such crashes as OOM. BASE_EXPORT void TerminateBecauseOutOfMemory(size_t size); diff --git a/www/iridium/files/patch-base_process_memory__unittest.cc b/www/iridium/files/patch-base_process_memory__unittest.cc index b858c9e73024..82dcfd37c1c7 100644 --- a/www/iridium/files/patch-base_process_memory__unittest.cc +++ b/www/iridium/files/patch-base_process_memory__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/memory_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/memory_unittest.cc.orig 2020-03-16 18:39:41 UTC +++ base/process/memory_unittest.cc -@@ -104,7 +104,7 @@ TEST(MemoryTest, AllocatorShimWorking) { +@@ -106,7 +106,7 @@ TEST(MemoryTest, AllocatorShimWorking) { // OpenBSD does not support these tests. Don't test these on ASan/TSan/MSan // configurations: only test the real allocator. // Windows only supports these tests with the allocator shim in place. @@ -9,7 +9,7 @@ !defined(MEMORY_TOOL_REPLACES_ALLOCATOR) namespace { -@@ -529,5 +529,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { +@@ -589,5 +589,5 @@ TEST_F(OutOfMemoryHandledTest, UncheckedCalloc) { EXPECT_FALSE(base::UncheckedCalloc(1, test_size_, &value_)); EXPECT_TRUE(value_ == nullptr); } diff --git a/www/iridium/files/patch-base_process_process__handle.cc b/www/iridium/files/patch-base_process_process__handle.cc index 52c9f6102254..13812613f73f 100644 --- a/www/iridium/files/patch-base_process_process__handle.cc +++ b/www/iridium/files/patch-base_process_process__handle.cc @@ -1,11 +1,11 @@ ---- base/process/process_handle.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/process_handle.cc.orig 2019-10-21 19:06:18 UTC +++ base/process/process_handle.cc -@@ -39,7 +39,7 @@ uint32_t GetUniqueIdForProcess() { - return g_unique_id; +@@ -28,7 +28,7 @@ UniqueProcId GetUniqueIdForProcess() { + : UniqueProcId(GetCurrentProcId()); } -#if defined(OS_LINUX) || defined(OS_AIX) +#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) void InitUniqueIdForProcessInPidNamespace(ProcessId pid_outside_of_namespace) { - g_unique_id = MangleProcessId(pid_outside_of_namespace); + DCHECK(pid_outside_of_namespace != kNullProcessId); diff --git a/www/iridium/files/patch-base_process_process__handle.h b/www/iridium/files/patch-base_process_process__handle.h index 976217dea9ad..502beff310e6 100644 --- a/www/iridium/files/patch-base_process_process__handle.h +++ b/www/iridium/files/patch-base_process_process__handle.h @@ -1,8 +1,8 @@ ---- base/process/process_handle.h.orig 2019-03-11 22:00:51 UTC +--- base/process/process_handle.h.orig 2019-10-21 19:06:18 UTC +++ base/process/process_handle.h -@@ -64,7 +64,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); - // a process's PID. - BASE_EXPORT uint32_t GetUniqueIdForProcess(); +@@ -103,7 +103,7 @@ BASE_EXPORT ProcessId GetCurrentProcId(); + // processes may be reused. + BASE_EXPORT UniqueProcId GetUniqueIdForProcess(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/iridium/files/patch-base_process_process__linux.cc b/www/iridium/files/patch-base_process_process__linux.cc index b385b7c7908a..2ec55582fbfa 100644 --- a/www/iridium/files/patch-base_process_process__linux.cc +++ b/www/iridium/files/patch-base_process_process__linux.cc @@ -1,14 +1,27 @@ ---- base/process/process_linux.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/process_linux.cc.orig 2020-03-16 18:39:41 UTC +++ base/process/process_linux.cc -@@ -88,6 +88,7 @@ Time Process::CreationTime() const { +@@ -79,6 +79,9 @@ Time Process::CreationTime() const { + internal::VM_STARTTIME) + : internal::ReadProcStatsAndGetFieldAsInt64( + Pid(), internal::VM_STARTTIME); ++#if defined(OS_BSD) ++ return Time::FromTimeT(start_ticks); ++#else + if (!start_ticks) + return Time(); + TimeDelta start_offset = internal::ClockTicksToTimeDelta(start_ticks); +@@ -86,8 +89,10 @@ Time Process::CreationTime() const { + if (boot_time.is_null()) + return Time(); return Time(boot_time + start_offset); ++#endif } +#if !defined(OS_BSD) // static bool Process::CanBackgroundProcesses() { #if defined(OS_CHROMEOS) -@@ -139,6 +140,7 @@ bool Process::SetProcessBackgrounded(bool background) +@@ -139,6 +144,7 @@ bool Process::SetProcessBackgrounded(bool background) DPCHECK(result == 0); return result == 0; } diff --git a/www/iridium/files/patch-base_process_process__metrics.cc b/www/iridium/files/patch-base_process_process__metrics.cc index 3b71427c4c01..8e47c5106248 100644 --- a/www/iridium/files/patch-base_process_process__metrics.cc +++ b/www/iridium/files/patch-base_process_process__metrics.cc @@ -1,5 +1,23 @@ ---- base/process/process_metrics.cc.orig 2019-04-05 00:48:55 UTC +--- base/process/process_metrics.cc.orig 2019-07-24 18:58:02 UTC +++ base/process/process_metrics.cc +@@ -57,7 +57,7 @@ SystemMetrics SystemMetrics::Sample() { + SystemMetrics system_metrics; + + system_metrics.committed_memory_ = GetSystemCommitCharge(); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + GetSystemMemoryInfo(&system_metrics.memory_info_); + GetVmStatInfo(&system_metrics.vmstat_info_); + GetSystemDiskInfo(&system_metrics.disk_info_); +@@ -75,7 +75,7 @@ std::unique_ptr<Value> SystemMetrics::ToValue() const + std::unique_ptr<DictionaryValue> res(new DictionaryValue()); + + res->SetIntKey("committed_memory", static_cast<int>(committed_memory_)); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + std::unique_ptr<DictionaryValue> meminfo = memory_info_.ToValue(); + std::unique_ptr<DictionaryValue> vmstat = vmstat_info_.ToValue(); + meminfo->MergeDictionary(vmstat.get()); @@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( } #endif diff --git a/www/iridium/files/patch-base_process_process__metrics.h b/www/iridium/files/patch-base_process_process__metrics.h index 79a663a44383..420d563e5b29 100644 --- a/www/iridium/files/patch-base_process_process__metrics.h +++ b/www/iridium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2019-04-05 00:48:55 UTC +--- base/process/process_metrics.h.orig 2019-10-21 19:06:18 UTC +++ base/process/process_metrics.h @@ -41,7 +41,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. @@ -27,7 +27,7 @@ // Resident Set Size is a Linux/Android specific memory concept. Do not // attempt to extend this to other platforms. BASE_EXPORT size_t GetResidentSetSize() const; -@@ -199,14 +199,14 @@ class BASE_EXPORT ProcessMetrics { +@@ -172,14 +172,14 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // defined(OS_POSIX) @@ -44,7 +44,7 @@ // Returns total memory usage of malloc. size_t GetMallocUsage(); -@@ -218,7 +218,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -191,7 +191,7 @@ class BASE_EXPORT ProcessMetrics { ProcessMetrics(ProcessHandle process, PortProvider* port_provider); #endif // !defined(OS_MACOSX) || defined(OS_IOS) @@ -53,7 +53,7 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if defined(OS_MACOSX) -@@ -247,7 +247,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -220,7 +220,7 @@ class BASE_EXPORT ProcessMetrics { // Number of bytes transferred to/from disk in bytes. uint64_t last_cumulative_disk_usage_ = 0; @@ -62,16 +62,16 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -293,7 +293,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -271,7 +271,7 @@ BASE_EXPORT size_t GetHandleLimit(); + BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors); #endif // defined(OS_POSIX) - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) -+ defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. - // -@@ -326,7 +326,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -305,7 +305,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int avail_phys = 0; #endif @@ -80,33 +80,52 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -341,7 +341,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -319,7 +319,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { + int swap_free = 0; #endif - #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || \ ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) int buffers = 0; int cached = 0; - int active_anon = 0; -@@ -351,7 +351,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -329,7 +329,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { + int inactive_file = 0; int dirty = 0; int reclaimable = 0; - #endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || -- // defined(OS_FUCHSIA) -+ // defined(OS_FUCHSIA) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) || + // defined(OS_FUCHSIA) #if defined(OS_CHROMEOS) - int shmem = 0; -@@ -377,9 +377,9 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -355,10 +355,10 @@ struct BASE_EXPORT SystemMemoryInfoKB { + // Exposed for memory debugging widget. BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); - #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || -- // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) -+ // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) -#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. +@@ -431,7 +431,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis + // Returns the amount of time spent in user space since boot across all CPUs. + BASE_EXPORT TimeDelta GetUserCpuTimeSinceBoot(); + +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + + #if defined(OS_CHROMEOS) + // Data from files in directory /sys/block/zram0 about ZRAM usage. +@@ -526,7 +526,7 @@ class BASE_EXPORT SystemMetrics { + FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); + + size_t committed_memory_; +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + SystemMemoryInfoKB memory_info_; + VmStatInfo vmstat_info_; + SystemDiskInfo disk_info_; diff --git a/www/iridium/files/patch-base_process_process__metrics__freebsd.cc b/www/iridium/files/patch-base_process_process__metrics__freebsd.cc index af227b7fe9fc..1dc5323f3252 100644 --- a/www/iridium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/iridium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_freebsd.cc.orig 2019-04-05 00:48:55 UTC +--- base/process/process_metrics_freebsd.cc.orig 2019-07-24 18:58:02 UTC +++ base/process/process_metrics_freebsd.cc @@ -5,6 +5,7 @@ #include "base/process/process_metrics.h" @@ -8,7 +8,7 @@ #include <sys/sysctl.h> #include <sys/user.h> #include <unistd.h> -@@ -14,11 +15,15 @@ +@@ -14,11 +15,29 @@ #include "base/process/process_metrics_iocounters.h" #include "base/stl_util.h" @@ -18,7 +18,21 @@ +#include <libutil.h> + namespace base { ++namespace { ++int GetPageShift() { ++ int pagesize = getpagesize(); ++ int pageshift = 0; ++ ++ while (pagesize > 1) { ++ pageshift++; ++ pagesize >>= 1; ++ } ++ ++ return pageshift; ++} ++} ++ ProcessMetrics::ProcessMetrics(ProcessHandle process) - : process_(process), - last_cpu_(0) {} @@ -26,7 +40,7 @@ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( -@@ -69,4 +74,93 @@ size_t GetSystemCommitCharge() { +@@ -69,4 +88,216 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } @@ -110,13 +124,136 @@ + return total_count; +} + ++size_t ProcessMetrics::GetResidentSetSize() const { ++ kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open"); ++ ++ if (kd == nullptr) ++ return 0; ++ ++ struct kinfo_proc *pp; ++ int nproc; ++ ++ if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) { ++ kvm_close(kd); ++ return 0; ++ } ++ ++ size_t rss; ++ ++ if (nproc > 0) { ++ rss = pp->ki_rssize << GetPageShift(); ++ } else { ++ rss = 0; ++ } ++ ++ kvm_close(kd); ++ return rss; ++} ++ +uint64_t ProcessMetrics::GetVmSwapBytes() const { -+ NOTIMPLEMENTED(); -+ return 0; ++ kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open"); ++ ++ if (kd == nullptr) ++ return 0; ++ ++ struct kinfo_proc *pp; ++ int nproc; ++ ++ if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) { ++ kvm_close(kd); ++ return 0; ++ } ++ ++ size_t swrss; ++ ++ if (nproc > 0) { ++ swrss = pp->ki_swrss > pp->ki_rssize ++ ? (pp->ki_swrss - pp->ki_rssize) << GetPageShift() ++ : 0; ++ } else { ++ swrss = 0; ++ } ++ ++ kvm_close(kd); ++ return swrss; +} + +int ProcessMetrics::GetIdleWakeupsPerSecond() { + NOTIMPLEMENTED(); + return 0; +} ++ ++bool GetSystemDiskInfo(SystemDiskInfo* diskinfo) { ++ NOTIMPLEMENTED(); ++ return false; ++} ++ ++bool GetVmStatInfo(VmStatInfo* vmstat) { ++ NOTIMPLEMENTED(); ++ return false; ++} ++ ++SystemDiskInfo::SystemDiskInfo() { ++ reads = 0; ++ reads_merged = 0; ++ sectors_read = 0; ++ read_time = 0; ++ writes = 0; ++ writes_merged = 0; ++ sectors_written = 0; ++ write_time = 0; ++ io = 0; ++ io_time = 0; ++ weighted_io_time = 0; ++} ++ ++SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo& other) = default; ++ ++std::unique_ptr<Value> SystemDiskInfo::ToValue() const { ++ auto res = std::make_unique<DictionaryValue>(); ++ ++ // Write out uint64_t variables as doubles. ++ // Note: this may discard some precision, but for JS there's no other option. ++ res->SetDouble("reads", static_cast<double>(reads)); ++ res->SetDouble("reads_merged", static_cast<double>(reads_merged)); ++ res->SetDouble("sectors_read", static_cast<double>(sectors_read)); ++ res->SetDouble("read_time", static_cast<double>(read_time)); ++ res->SetDouble("writes", static_cast<double>(writes)); ++ res->SetDouble("writes_merged", static_cast<double>(writes_merged)); ++ res->SetDouble("sectors_written", static_cast<double>(sectors_written)); ++ res->SetDouble("write_time", static_cast<double>(write_time)); ++ res->SetDouble("io", static_cast<double>(io)); ++ res->SetDouble("io_time", static_cast<double>(io_time)); ++ res->SetDouble("weighted_io_time", static_cast<double>(weighted_io_time)); ++ ++ return std::move(res); ++} ++ ++std::unique_ptr<DictionaryValue> SystemMemoryInfoKB::ToValue() const { ++ auto res = std::make_unique<DictionaryValue>(); ++ res->SetIntKey("total", total); ++ res->SetIntKey("free", free); ++ res->SetIntKey("available", available); ++ res->SetIntKey("buffers", buffers); ++ res->SetIntKey("cached", cached); ++ res->SetIntKey("active_anon", active_anon); ++ res->SetIntKey("inactive_anon", inactive_anon); ++ res->SetIntKey("active_file", active_file); ++ res->SetIntKey("inactive_file", inactive_file); ++ res->SetIntKey("swap_total", swap_total); ++ res->SetIntKey("swap_free", swap_free); ++ res->SetIntKey("swap_used", swap_total - swap_free); ++ res->SetIntKey("dirty", dirty); ++ res->SetIntKey("reclaimable", reclaimable); ++ ++ return res; ++} ++ ++std::unique_ptr<DictionaryValue> VmStatInfo::ToValue() const { ++ auto res = std::make_unique<DictionaryValue>(); ++ res->SetIntKey("pswpin", pswpin); ++ res->SetIntKey("pswpout", pswpout); ++ res->SetIntKey("pgmajfault", pgmajfault); ++ return res; ++} } // namespace base diff --git a/www/iridium/files/patch-base_process_process__metrics__posix.cc b/www/iridium/files/patch-base_process_process__metrics__posix.cc index acde968b71f8..e909eeec959b 100644 --- a/www/iridium/files/patch-base_process_process__metrics__posix.cc +++ b/www/iridium/files/patch-base_process_process__metrics__posix.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/process/process_metrics_posix.cc.orig 2019-10-21 19:06:18 UTC +++ base/process/process_metrics_posix.cc -@@ -19,6 +19,8 @@ +@@ -20,6 +20,8 @@ #if defined(OS_MACOSX) #include <malloc/malloc.h> @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -107,7 +109,7 @@ size_t ProcessMetrics::GetMallocUsage() { +@@ -117,7 +119,7 @@ size_t ProcessMetrics::GetMallocUsage() { #else return minfo.hblkhd + minfo.arena; #endif diff --git a/www/iridium/files/patch-base_process_process__util__unittest.cc b/www/iridium/files/patch-base_process_process__util__unittest.cc new file mode 100644 index 000000000000..e6378dd51b22 --- /dev/null +++ b/www/iridium/files/patch-base_process_process__util__unittest.cc @@ -0,0 +1,16 @@ +--- base/process/process_util_unittest.cc.orig 2020-03-23 15:26:12 UTC ++++ base/process/process_util_unittest.cc +@@ -1307,11 +1307,11 @@ std::string TestLaunchProcess(const CommandLine& cmdli + options.fds_to_remap.emplace_back(fds[1], STDOUT_FILENO); + #endif // defined(OS_WIN) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + options.clone_flags = clone_flags; + #else + CHECK_EQ(0, clone_flags); +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + EXPECT_TRUE(LaunchProcess(cmdline, options).IsValid()); + write_pipe.Close(); diff --git a/www/iridium/files/patch-base_profiler_register__context.h b/www/iridium/files/patch-base_profiler_register__context.h new file mode 100644 index 000000000000..ea2c126353b4 --- /dev/null +++ b/www/iridium/files/patch-base_profiler_register__context.h @@ -0,0 +1,60 @@ +--- base/profiler/register_context.h.orig 2020-03-16 18:39:41 UTC ++++ base/profiler/register_context.h +@@ -17,7 +17,7 @@ + #include <windows.h> + #elif defined(OS_MACOSX) + #include <mach/machine/thread_status.h> +-#elif defined(OS_ANDROID) || defined(OS_LINUX) ++#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + #include <sys/ucontext.h> + #endif + +@@ -165,6 +165,48 @@ inline uintptr_t& RegisterContextInstructionPointer(mc + } + + #endif // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS) ++ ++#elif defined(OS_FREEBSD) ++ ++using RegisterContext = mcontext_t; ++ ++#if defined(ARCH_CPU_X86_64) ++inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_rsp); ++} ++ ++inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_rbp); ++} ++ ++inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_rip); ++} ++#elif defined(ARCH_CPU_X86) ++inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_esp); ++} ++ ++inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_ebp); ++} ++ ++inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_eip); ++} ++#elif defined(ARCH_CPU_ARM64) ++inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_gpregs.gp_sp); ++} ++ ++inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_gpregs.gp_x[29]); ++} ++ ++inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) { ++ return AsUintPtr(&context->mc_gpregs.gp_elr); ++} ++#endif + + #else // #if defined(OS_WIN) + diff --git a/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.cc b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.cc new file mode 100644 index 000000000000..96db1204abdd --- /dev/null +++ b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.cc @@ -0,0 +1,11 @@ +--- base/profiler/sampling_profiler_thread_token.cc.orig 2020-02-07 10:24:19 UTC ++++ base/profiler/sampling_profiler_thread_token.cc +@@ -7,7 +7,7 @@ + namespace base { + + SamplingProfilerThreadToken GetSamplingProfilerCurrentThreadToken() { +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + return {PlatformThread::CurrentId(), pthread_self()}; + #else + return {PlatformThread::CurrentId()}; diff --git a/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h new file mode 100644 index 000000000000..589e083be74d --- /dev/null +++ b/www/iridium/files/patch-base_profiler_sampling__profiler__thread__token.h @@ -0,0 +1,20 @@ +--- base/profiler/sampling_profiler_thread_token.h.orig 2020-02-07 10:24:33 UTC ++++ base/profiler/sampling_profiler_thread_token.h +@@ -9,7 +9,7 @@ + #include "base/threading/platform_thread.h" + #include "build/build_config.h" + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + #include <pthread.h> + #endif + +@@ -21,7 +21,7 @@ namespace base { + // functions used to obtain the stack base address. + struct SamplingProfilerThreadToken { + PlatformThreadId id; +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + pthread_t pthread_id; + #endif + }; diff --git a/www/iridium/files/patch-base_profiler_stack__copier__signal.cc b/www/iridium/files/patch-base_profiler_stack__copier__signal.cc new file mode 100644 index 000000000000..b9e757471f17 --- /dev/null +++ b/www/iridium/files/patch-base_profiler_stack__copier__signal.cc @@ -0,0 +1,63 @@ +--- base/profiler/stack_copier_signal.cc.orig 2020-04-10 00:33:01 UTC ++++ base/profiler/stack_copier_signal.cc +@@ -4,7 +4,14 @@ + + #include "base/profiler/stack_copier_signal.h" + ++#if defined(OS_LINUX) + #include <linux/futex.h> ++#include <syscall.h> ++#elif defined(OS_FREEBSD) ++#include <sys/types.h> ++#include <sys/thr.h> ++#include <sys/umtx.h> ++#endif + #include <signal.h> + #include <sys/ucontext.h> + #include <syscall.h> +@@ -35,8 +42,13 @@ class AsyncSafeWaitableEvent { + // for a pthread mutex. So, also check the condition. + while (true) { + int res = ++#if defined(OS_LINUX) + syscall(SYS_futex, futex_int_ptr(), FUTEX_WAIT | FUTEX_PRIVATE_FLAG, + 0, nullptr, nullptr, 0); ++#elif defined(OS_FREEBSD) ++ _umtx_op(futex_int_ptr(), UMTX_OP_WAIT_UINT_PRIVATE, 0, nullptr, ++ nullptr); ++#endif + if (futex_.load(std::memory_order_acquire) != 0) + return true; + if (res != 0) +@@ -46,8 +58,12 @@ class AsyncSafeWaitableEvent { + + void Signal() { + futex_.store(1, std::memory_order_release); ++#if defined(OS_LINUX) + syscall(SYS_futex, futex_int_ptr(), FUTEX_WAKE | FUTEX_PRIVATE_FLAG, 1, + nullptr, nullptr, 0); ++#elif defined(OS_FREEBSD) ++ _umtx_op(futex_int_ptr(), UMTX_OP_WAKE_PRIVATE, 1, nullptr, nullptr); ++#endif + } + + private: +@@ -214,11 +230,18 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b + if (!scoped_sigaction.succeeded()) + return false; + ++#if defined(OS_LINUX) + if (syscall(SYS_tgkill, getpid(), thread_delegate_->GetThreadId(), + SIGURG) != 0) { + NOTREACHED(); + return false; + } ++#elif defined(OS_FREEBSD) ++ if (thr_kill2(getpid(), thread_delegate_->GetThreadId(), SIGURG) != 0) { ++ NOTREACHED(); ++ return false; ++ } ++#endif + bool finished_waiting = wait_event.Wait(); + TRACE_EVENT_END0(TRACE_DISABLED_BY_DEFAULT("cpu_profiler.debug"), + "StackCopierSignal copy stack"); diff --git a/www/iridium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc b/www/iridium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc index 3c21942cb31d..686f7e90afb3 100644 --- a/www/iridium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc +++ b/www/iridium/files/patch-base_profiler_stack__sampling__profiler__unittest.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2019-07-24 18:58:02 UTC +++ base/profiler/stack_sampling_profiler_unittest.cc -@@ -39,7 +39,7 @@ +@@ -41,7 +41,7 @@ #include <intrin.h> #include <malloc.h> #include <windows.h> diff --git a/www/iridium/files/patch-base_profiler_thread__delegate__posix.cc b/www/iridium/files/patch-base_profiler_thread__delegate__posix.cc new file mode 100644 index 000000000000..a2f162e586fe --- /dev/null +++ b/www/iridium/files/patch-base_profiler_thread__delegate__posix.cc @@ -0,0 +1,50 @@ +--- base/profiler/thread_delegate_posix.cc.orig 2020-04-10 00:37:03 UTC ++++ base/profiler/thread_delegate_posix.cc +@@ -4,6 +4,10 @@ + + #include <pthread.h> + ++#if defined(OS_FREEBSD) ++#include <pthread_np.h> ++#endif ++ + #include "base/process/process_handle.h" + #include "base/profiler/thread_delegate_posix.h" + #include "base/stl_util.h" +@@ -17,7 +21,12 @@ namespace { + uintptr_t GetThreadStackBaseAddressImpl( + SamplingProfilerThreadToken thread_token) { + pthread_attr_t attr; ++#if defined(OS_FREEBSDD) ++ pthread_attr_init(&attr); ++ pthread_attr_get_np(thread_token.pthread_id, &attr); ++#elif defined(OS_LINUX) + pthread_getattr_np(thread_token.pthread_id, &attr); ++#endif + // See crbug.com/617730 for limitations of this approach on Linux. + void* address; + size_t size; +@@ -103,6 +112,15 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist + return { + // Return the set of callee-save registers per the x86-64 System V ABI + // section 3.2.1, plus the stack pointer. ++#if defined(OS_FREEBSD) ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_rbp), ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_rbx), ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_r12), ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_r13), ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_r14), ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_r15), ++ reinterpret_cast<uintptr_t*>(&thread_context->mc_rsp), ++#else + reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBP]), + reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBX]), + reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R12]), +@@ -110,6 +128,7 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist + reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R14]), + reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R15]), + reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RSP]), ++#endif + }; + #else // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS) + // Unimplemented for other architectures. diff --git a/www/iridium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc b/www/iridium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc new file mode 100644 index 000000000000..44e3b0aae8ef --- /dev/null +++ b/www/iridium/files/patch-base_sampling__heap__profiler_sampling__heap__profiler.cc @@ -0,0 +1,24 @@ +--- base/sampling_heap_profiler/sampling_heap_profiler.cc.orig 2019-09-09 21:55:05 UTC ++++ base/sampling_heap_profiler/sampling_heap_profiler.cc +@@ -29,6 +29,10 @@ + #include <sys/prctl.h> + #endif + ++#if defined(OS_BSD) ++#include <pthread_np.h> ++#endif ++ + #if defined(OS_ANDROID) && BUILDFLAG(CAN_UNWIND_WITH_CFI_TABLE) && \ + defined(OFFICIAL_BUILD) + #include "base/trace_event/cfi_backtrace_android.h" +@@ -64,6 +68,10 @@ const char* GetAndLeakThreadName() { + #elif defined(OS_MACOSX) + int err = pthread_getname_np(pthread_self(), name, kBufferLen); + if (err == 0 && *name != '\0') ++ return strdup(name); ++#elif defined(OS_BSD) && __FreeBSD__ >= 12 ++ pthread_get_name_np(pthread_self(), name, kBufferLen); ++ if (*name != '\0') + return strdup(name); + #endif // defined(OS_LINUX) || defined(OS_ANDROID) + diff --git a/www/iridium/files/patch-base_security__unittest.cc b/www/iridium/files/patch-base_security__unittest.cc index 3131d65c8d40..c46d71f83add 100644 --- a/www/iridium/files/patch-base_security__unittest.cc +++ b/www/iridium/files/patch-base_security__unittest.cc @@ -1,6 +1,6 @@ ---- base/security_unittest.cc.orig 2019-03-11 22:00:51 UTC +--- base/security_unittest.cc.orig 2019-04-30 22:22:28 UTC +++ base/security_unittest.cc -@@ -59,7 +59,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu +@@ -60,7 +60,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu // FAILS_ is too clunky. void OverflowTestsSoftExpectTrue(bool overflow_detected) { if (!overflow_detected) { diff --git a/www/iridium/files/patch-base_synchronization_lock__impl.h b/www/iridium/files/patch-base_synchronization_lock__impl.h new file mode 100644 index 000000000000..fb3737a27ea9 --- /dev/null +++ b/www/iridium/files/patch-base_synchronization_lock__impl.h @@ -0,0 +1,16 @@ +--- base/synchronization/lock_impl.h.orig 2020-03-08 08:35:16 UTC ++++ base/synchronization/lock_impl.h +@@ -67,10 +67,13 @@ void LockImpl::Unlock() { + ::ReleaseSRWLockExclusive(reinterpret_cast<PSRWLOCK>(&native_handle_)); + } + #elif defined(OS_POSIX) || defined(OS_FUCHSIA) ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wthread-safety-analysis" + void LockImpl::Unlock() { + int rv = pthread_mutex_unlock(&native_handle_); + DCHECK_EQ(rv, 0) << ". " << strerror(rv); + } ++#pragma GCC diagnostic pop + #endif + + // This is an implementation used for AutoLock templated on the lock type. diff --git a/www/iridium/files/patch-base_syslog__logging.cc b/www/iridium/files/patch-base_syslog__logging.cc new file mode 100644 index 000000000000..d719219ca50b --- /dev/null +++ b/www/iridium/files/patch-base_syslog__logging.cc @@ -0,0 +1,20 @@ +--- base/syslog_logging.cc.orig 2019-10-21 19:06:18 UTC ++++ base/syslog_logging.cc +@@ -14,7 +14,7 @@ + #include "base/debug/stack_trace.h" + #include "base/strings/string_util.h" + #include "base/win/win_util.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + // <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with + // base::LOG_INFO, base::LOG_WARNING. + #include <syslog.h> +@@ -113,7 +113,7 @@ EventLogMessage::~EventLogMessage() { + + if (user_sid != nullptr) + ::LocalFree(user_sid); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + const char kEventSource[] = "chrome"; + openlog(kEventSource, LOG_NOWAIT | LOG_PID, LOG_USER); + // We can't use the defined names for the logging severity from syslog.h diff --git a/www/iridium/files/patch-base_system_sys__info.h b/www/iridium/files/patch-base_system_sys__info.h new file mode 100644 index 000000000000..2159a51c6b6f --- /dev/null +++ b/www/iridium/files/patch-base_system_sys__info.h @@ -0,0 +1,20 @@ +--- base/system/sys_info.h.orig 2020-03-16 18:39:41 UTC ++++ base/system/sys_info.h +@@ -194,6 +194,8 @@ class BASE_EXPORT SysInfo { + // On Desktop this returns true when memory <= 512MB. + static bool IsLowEndDevice(); + ++ static uint64_t MaxSharedMemorySize(); ++ + private: + FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); + FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); +@@ -203,7 +205,7 @@ class BASE_EXPORT SysInfo { + static bool IsLowEndDeviceImpl(); + static HardwareInfo GetHardwareInfoSync(); + +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) + static int64_t AmountOfAvailablePhysicalMemory( + const SystemMemoryInfoKB& meminfo); + #endif diff --git a/www/iridium/files/patch-base_system_sys__info__freebsd.cc b/www/iridium/files/patch-base_system_sys__info__freebsd.cc index 67312e70a631..12994422dc08 100644 --- a/www/iridium/files/patch-base_system_sys__info__freebsd.cc +++ b/www/iridium/files/patch-base_system_sys__info__freebsd.cc @@ -1,6 +1,6 @@ ---- base/system/sys_info_freebsd.cc.orig 2019-03-11 22:00:51 UTC +--- base/system/sys_info_freebsd.cc.orig 2019-12-16 21:50:40 UTC +++ base/system/sys_info_freebsd.cc -@@ -13,26 +13,58 @@ +@@ -13,26 +13,59 @@ namespace base { int64_t SysInfo::AmountOfPhysicalMemoryImpl() { @@ -21,11 +21,6 @@ return static_cast<int64_t>(pages) * page_size; } --// static --uint64_t SysInfo::MaxSharedMemorySize() { -- size_t limit; -- size_t size = sizeof(limit); -- if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) { +int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { + int page_size, r = 0; + unsigned pgfree, pginact, pgcache; @@ -40,14 +35,13 @@ + if(r == 0) + r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0); + if(r == -1) { - NOTREACHED(); - return 0; - } -- return static_cast<uint64_t>(limit); ++ NOTREACHED(); ++ return 0; ++ } + return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size); +} + -+// static + // static +std::string SysInfo::CPUModelName() { + int mib[] = { CTL_HW, HW_MODEL }; + char name[256]; @@ -57,15 +51,17 @@ + return std::string(); +} + -+int SysInfo::NumberOfProcessors() { -+ int mib[] = { CTL_HW, HW_NCPU }; -+ int ncpu; -+ size_t size = sizeof(ncpu); -+ if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) == -1) { -+ NOTREACHED(); -+ return 1; -+ } -+ return ncpu; ++// static + uint64_t SysInfo::MaxSharedMemorySize() { + size_t limit; + size_t size = sizeof(limit); ++ + if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) { + NOTREACHED(); + return 0; + } ++ + return static_cast<uint64_t>(limit); } - +- } // namespace base diff --git a/www/iridium/files/patch-base_system_sys__info__posix.cc b/www/iridium/files/patch-base_system_sys__info__posix.cc index 3147b0da5500..5b79b03dce8a 100644 --- a/www/iridium/files/patch-base_system_sys__info__posix.cc +++ b/www/iridium/files/patch-base_system_sys__info__posix.cc @@ -1,33 +1,6 @@ ---- base/system/sys_info_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/system/sys_info_posix.cc.orig 2019-09-09 21:55:05 UTC +++ base/system/sys_info_posix.cc -@@ -38,7 +38,7 @@ - - namespace { - --#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) -+#if !defined(OS_BSD) && !defined(OS_FUCHSIA) - int NumberOfProcessors() { - // sysconf returns the number of "logical" (not "physical") processors on both - // Mac and Linux. So we get the number of max available "logical" processors. -@@ -64,7 +64,7 @@ int NumberOfProcessors() { - - base::LazyInstance<base::internal::LazySysInfoValue<int, NumberOfProcessors>>:: - Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER; --#endif // !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) -+#endif // !defined(OS_BSD) && !defined(OS_FUCHSIA) - - #if !defined(OS_FUCHSIA) - int64_t AmountOfVirtualMemory() { -@@ -132,7 +132,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path, - - namespace base { - --#if !defined(OS_OPENBSD) && !defined(OS_FUCHSIA) -+#if !defined(OS_BSD) && !defined(OS_FUCHSIA) - int SysInfo::NumberOfProcessors() { - return g_lazy_number_of_processors.Get().value(); - } -@@ -225,6 +225,8 @@ std::string SysInfo::OperatingSystemArchitecture() { +@@ -220,6 +220,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; diff --git a/www/iridium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc b/www/iridium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc deleted file mode 100644 index 022b9c6da63c..000000000000 --- a/www/iridium/files/patch-base_task_task__scheduler_scheduler__single__thread__task__runner__manager__unittest.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc.orig 2019-03-11 22:00:51 UTC -+++ base/task/task_scheduler/scheduler_single_thread_task_runner_manager_unittest.cc -@@ -295,6 +295,9 @@ TEST_P(TaskSchedulerSingleThreadTaskRunnerManagerCommo - EXPECT_EQ(ThreadPriority::NORMAL, thread_priority_normal); - } - -+#if defined(OS_BSD) -+#define ThreadNamesSet DISABLED_ThreadNamesSet -+#endif - TEST_P(TaskSchedulerSingleThreadTaskRunnerManagerCommonTest, ThreadNamesSet) { - constexpr TaskTraits foo_traits = {TaskPriority::BEST_EFFORT, - TaskShutdownBehavior::BLOCK_SHUTDOWN}; diff --git a/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc new file mode 100644 index 000000000000..92b120193ada --- /dev/null +++ b/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc @@ -0,0 +1,11 @@ +--- base/task/thread_pool/environment_config_unittest.cc.orig 2019-07-29 13:26:54 UTC ++++ base/task/thread_pool/environment_config_unittest.cc +@@ -14,7 +14,7 @@ namespace internal { + TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPriorityForWorker) { + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_IOS) + EXPECT_TRUE(CanUseBackgroundPriorityForWorkerThread()); +-#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ ++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) || defined(OS_NACL) + EXPECT_FALSE(CanUseBackgroundPriorityForWorkerThread()); + #else diff --git a/www/iridium/files/patch-base_test_fontconfig__util__linux.cc b/www/iridium/files/patch-base_test_fontconfig__util__linux.cc new file mode 100644 index 000000000000..eb6ff5024c46 --- /dev/null +++ b/www/iridium/files/patch-base_test_fontconfig__util__linux.cc @@ -0,0 +1,406 @@ +--- base/test/fontconfig_util_linux.cc.orig 2020-02-03 21:52:37 UTC ++++ base/test/fontconfig_util_linux.cc +@@ -6,22 +6,397 @@ + + #include <fontconfig/fontconfig.h> + +-#include <memory> +- + #include "base/base_paths.h" + #include "base/environment.h" + #include "base/files/file_path.h" ++#include "base/files/file_util.h" + #include "base/logging.h" ++#include "base/macros.h" + #include "base/path_service.h" ++#include "base/strings/string_util.h" + + namespace base { + ++namespace { ++ ++const char kFontsConfTemplate[] = R"(<?xml version="1.0"?> ++<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> ++<fontconfig> ++ ++ <!-- Cache location. --> ++ <cachedir>$1</cachedir> ++ ++ <!-- GCS-synced fonts. --> ++ <dir>$2</dir> ++ ++ <!-- Default properties. --> ++ <match target="font"> ++ <edit name="embeddedbitmap" mode="append_last"> ++ <bool>false</bool> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="family"> ++ <string>Times</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Tinos</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="family"> ++ <string>sans</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>DejaVu Sans</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="family"> ++ <string>sans serif</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Arimo</string> ++ </edit> ++ </match> ++ ++ <!-- Some layout tests specify Helvetica as a family and we need to make sure ++ that we don't fallback to Tinos for them --> ++ <match target="pattern"> ++ <test qual="any" name="family"> ++ <string>Helvetica</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Arimo</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="family"> ++ <string>sans-serif</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Arimo</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="family"> ++ <string>serif</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Tinos</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="family"> ++ <string>mono</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Cousine</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="family"> ++ <string>monospace</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Cousine</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="family"> ++ <string>Courier</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Cousine</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="family"> ++ <string>cursive</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Comic Sans MS</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="family"> ++ <string>fantasy</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Impact</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="family"> ++ <string>Monaco</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Tinos</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="family"> ++ <string>Arial</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Arimo</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="family"> ++ <string>Courier New</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Cousine</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="family"> ++ <string>Georgia</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Gelasio</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="family"> ++ <string>Times New Roman</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Tinos</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test qual="any" name="family"> ++ <string>Verdana</string> ++ </test> ++ <!-- NOT metrically compatible! --> ++ <edit name="family" mode="assign"> ++ <string>Arimo</string> ++ </edit> ++ </match> ++ ++ <!-- TODO(thomasanderson): Move these configs to be test-specific. --> ++ <match target="pattern"> ++ <test name="family" compare="eq"> ++ <string>NonAntiAliasedSans</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Arimo</string> ++ </edit> ++ <edit name="antialias" mode="assign"> ++ <bool>false</bool> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test name="family" compare="eq"> ++ <string>SlightHintedGeorgia</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Gelasio</string> ++ </edit> ++ <edit name="hintstyle" mode="assign"> ++ <const>hintslight</const> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test name="family" compare="eq"> ++ <string>NonHintedSans</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Arimo</string> ++ </edit> ++ <!-- These deliberately contradict each other. The 'hinting' preference ++ should take priority --> ++ <edit name="hintstyle" mode="assign"> ++ <const>hintfull</const> ++ </edit> ++ <edit name="hinting" mode="assign"> ++ <bool>false</bool> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test name="family" compare="eq"> ++ <string>AutohintedSerif</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Arimo</string> ++ </edit> ++ <edit name="autohint" mode="assign"> ++ <bool>true</bool> ++ </edit> ++ <edit name="hintstyle" mode="assign"> ++ <const>hintmedium</const> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test name="family" compare="eq"> ++ <string>HintedSerif</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Arimo</string> ++ </edit> ++ <edit name="autohint" mode="assign"> ++ <bool>false</bool> ++ </edit> ++ <edit name="hintstyle" mode="assign"> ++ <const>hintmedium</const> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test name="family" compare="eq"> ++ <string>FullAndAutoHintedSerif</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Arimo</string> ++ </edit> ++ <edit name="autohint" mode="assign"> ++ <bool>true</bool> ++ </edit> ++ <edit name="hintstyle" mode="assign"> ++ <const>hintfull</const> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test name="family" compare="eq"> ++ <string>SubpixelEnabledArial</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Arimo</string> ++ </edit> ++ <edit name="rgba" mode="assign"> ++ <const>rgb</const> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test name="family" compare="eq"> ++ <string>SubpixelDisabledArial</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Arimo</string> ++ </edit> ++ <edit name="rgba" mode="assign"> ++ <const>none</const> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <!-- FontConfig doesn't currently provide a well-defined way to turn on ++ subpixel positioning. This is just an arbitrary pattern to use after ++ turning subpixel positioning on globally to ensure that we don't have ++ issues with our style getting cached for other tests. --> ++ <test name="family" compare="eq"> ++ <string>SubpixelPositioning</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Tinos</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <!-- See comments above --> ++ <test name="family" compare="eq"> ++ <string>SubpixelPositioningAhem</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>ahem</string> ++ </edit> ++ </match> ++ ++ <match target="pattern"> ++ <test name="family" compare="eq"> ++ <string>SlightHintedTimesNewRoman</string> ++ </test> ++ <edit name="family" mode="assign"> ++ <string>Tinos</string> ++ </edit> ++ <edit name="hintstyle" mode="assign"> ++ <const>hintslight</const> ++ </edit> ++ </match> ++ ++ <!-- When we encounter a character that the current font doesn't ++ support, gfx::GetFallbackFontForChar() returns the first font ++ that does have a glyph for the character. The list of fonts is ++ sorted by a pattern that includes the current locale, but doesn't ++ include a font family (which means that the fallback font depends ++ on the locale but not on the current font). ++ ++ DejaVu Sans is commonly the only font that supports some ++ characters, such as "⇧", and even when other candidates are ++ available, DejaVu Sans is commonly first among them, because of ++ the way Fontconfig is ordinarily configured. For example, the ++ configuration in the Fonconfig source lists DejaVu Sans under the ++ sans-serif generic family, and appends sans-serif to patterns ++ that don't already include a generic family (such as the pattern ++ in gfx::GetFallbackFontForChar()). ++ ++ To get the same fallback font in the layout tests, we could ++ duplicate this configuration here, or more directly, simply ++ append DejaVu Sans to all patterns. --> ++ <match target="pattern"> ++ <edit name="family" mode="append_last"> ++ <string>DejaVu Sans</string> ++ </edit> ++ </match> ++ ++</fontconfig> ++)"; ++ ++} // namespace ++ + void SetUpFontconfig() { +- FilePath dir_module; +- CHECK(PathService::Get(DIR_MODULE, &dir_module)); ++ std::unique_ptr<Environment> env = Environment::Create(); ++ if (!env->HasVar("FONTCONFIG_FILE")) { ++ // fonts.conf must be generated on-the-fly since it contains absolute paths ++ // which may be different if ++ // 1. The user moves/renames their build directory (or any parent dirs). ++ // 2. The build directory is mapped on a swarming bot at a location ++ // different from the one the buildbot used. ++ FilePath dir_module; ++ PathService::Get(DIR_MODULE, &dir_module); ++ FilePath font_cache = dir_module.Append("fontconfig_caches"); ++ FilePath test_fonts = dir_module.Append("test_fonts"); ++ std::string fonts_conf = ReplaceStringPlaceholders( ++ kFontsConfTemplate, {font_cache.value(), test_fonts.value()}, nullptr); + +- std::unique_ptr<Environment> env(Environment::Create()); +- CHECK(env->SetVar("FONTCONFIG_SYSROOT", dir_module.value().c_str())); ++ // Write the data to a different file and then atomically rename it to ++ // fonts.conf. This avoids the file being in a bad state when different ++ // parallel tests call this function at the same time. ++ FilePath fonts_conf_file_temp; ++ if(!CreateTemporaryFileInDir(dir_module, &fonts_conf_file_temp)) ++ CHECK(CreateTemporaryFile(&fonts_conf_file_temp)); ++ CHECK( ++ WriteFile(fonts_conf_file_temp, fonts_conf.c_str(), fonts_conf.size())); ++ FilePath fonts_conf_file = dir_module.Append("fonts.conf"); ++ if (ReplaceFile(fonts_conf_file_temp, fonts_conf_file, nullptr)) ++ env->SetVar("FONTCONFIG_FILE", fonts_conf_file.value()); ++ else ++ env->SetVar("FONTCONFIG_FILE", fonts_conf_file_temp.value()); ++ } + } + + } // namespace base diff --git a/www/iridium/files/patch-base_test_generate__fontconfig__caches.cc b/www/iridium/files/patch-base_test_generate__fontconfig__caches.cc index 8f0f114e6c7a..60cb0527b5f4 100644 --- a/www/iridium/files/patch-base_test_generate__fontconfig__caches.cc +++ b/www/iridium/files/patch-base_test_generate__fontconfig__caches.cc @@ -1,7 +1,7 @@ ---- base/test/generate_fontconfig_caches.cc.orig 2019-03-11 22:00:51 UTC +--- base/test/generate_fontconfig_caches.cc.orig 2019-12-16 21:51:21 UTC +++ base/test/generate_fontconfig_caches.cc -@@ -57,7 +57,14 @@ int main() { - base::TearDownFontconfig(); +@@ -59,7 +59,14 @@ int main() { + FcFini(); // Check existence of intended fontconfig cache file. +#if defined(OS_BSD) diff --git a/www/iridium/files/patch-base_test_launcher_test__launcher.cc b/www/iridium/files/patch-base_test_launcher_test__launcher.cc index 4f76312eca8f..4ec5e581d6b6 100644 --- a/www/iridium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/iridium/files/patch-base_test_launcher_test__launcher.cc @@ -1,6 +1,6 @@ ---- base/test/launcher/test_launcher.cc.orig 2019-03-11 22:00:51 UTC +--- base/test/launcher/test_launcher.cc.orig 2020-03-16 18:40:27 UTC +++ base/test/launcher/test_launcher.cc -@@ -53,6 +53,7 @@ +@@ -55,6 +55,7 @@ #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_POSIX) @@ -8,3 +8,12 @@ #include <fcntl.h> #include "base/files/file_descriptor_watcher_posix.h" +@@ -551,7 +552,7 @@ ChildProcessResults DoLaunchChildTestProcess( + #if !defined(OS_FUCHSIA) + options.new_process_group = true; + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + options.kill_on_parent_death = true; + #endif + diff --git a/www/iridium/files/patch-base_test_test__file__util__linux.cc b/www/iridium/files/patch-base_test_test__file__util__linux.cc deleted file mode 100644 index 76dce43e7393..000000000000 --- a/www/iridium/files/patch-base_test_test__file__util__linux.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- base/test/test_file_util_linux.cc.orig 2019-03-11 22:00:51 UTC -+++ base/test/test_file_util_linux.cc -@@ -51,8 +51,10 @@ bool EvictFileFromSystemCache(const FilePath& file) { - return false; - if (fdatasync(fd.get()) != 0) - return false; -+#if !defined(OS_BSD) - if (posix_fadvise(fd.get(), 0, 0, POSIX_FADV_DONTNEED) != 0) - return false; -+#endif - return true; - } - diff --git a/www/iridium/files/patch-base_test_test__file__util__posix.cc b/www/iridium/files/patch-base_test_test__file__util__posix.cc index 973f405b9184..a65fcc61d56b 100644 --- a/www/iridium/files/patch-base_test_test__file__util__posix.cc +++ b/www/iridium/files/patch-base_test_test__file__util__posix.cc @@ -1,6 +1,6 @@ ---- base/test/test_file_util_posix.cc.orig 2019-03-11 22:00:51 UTC +--- base/test/test_file_util_posix.cc.orig 2020-02-03 21:52:37 UTC +++ base/test/test_file_util_posix.cc -@@ -85,7 +85,7 @@ void SyncPageCacheToDisk() { +@@ -84,7 +84,7 @@ void SyncPageCacheToDisk() { sync(); } diff --git a/www/iridium/files/patch-base_test_test__suite.cc b/www/iridium/files/patch-base_test_test__suite.cc new file mode 100644 index 000000000000..74f7f01726cc --- /dev/null +++ b/www/iridium/files/patch-base_test_test__suite.cc @@ -0,0 +1,37 @@ +--- base/test/test_suite.cc.orig 2020-03-23 15:30:45 UTC ++++ base/test/test_suite.cc +@@ -68,7 +68,7 @@ + #include "base/test/test_support_ios.h" + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/test/fontconfig_util_linux.h" + #endif + +@@ -384,14 +384,14 @@ void TestSuite::PreInitialize() { + testing::GTEST_FLAG(catch_exceptions) = false; + #endif + EnableTerminationOnHeapCorruption(); +-#if defined(OS_LINUX) && defined(USE_AURA) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_AURA) + // When calling native char conversion functions (e.g wrctomb) we need to + // have the locale set. In the absence of such a call the "C" locale is the + // default. In the gtk code (below) gtk_init() implicitly sets a locale. + setlocale(LC_ALL, ""); + // We still need number to string conversions to be locale insensitive. + setlocale(LC_NUMERIC, "C"); +-#endif // defined(OS_LINUX) && defined(USE_AURA) ++#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_AURA) + + // On Android, AtExitManager is created in + // testing/android/native_test_wrapper.cc before main() is called. +@@ -620,7 +620,7 @@ void TestSuite::Initialize() { + // TODO(jshin): Should we set the locale via an OS X locale API here? + i18n::SetICUDefaultLocale("en_US"); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + SetUpFontconfig(); + #endif + diff --git a/www/iridium/files/patch-base_threading_platform__thread.h b/www/iridium/files/patch-base_threading_platform__thread.h index b234740a6dd7..0ff2fc68f36a 100644 --- a/www/iridium/files/patch-base_threading_platform__thread.h +++ b/www/iridium/files/patch-base_threading_platform__thread.h @@ -1,6 +1,6 @@ ---- base/threading/platform_thread.h.orig 2019-03-11 22:00:51 UTC +--- base/threading/platform_thread.h.orig 2019-10-21 19:06:18 UTC +++ base/threading/platform_thread.h -@@ -220,7 +220,7 @@ class BASE_EXPORT PlatformThread { +@@ -221,7 +221,7 @@ class BASE_EXPORT PlatformThread { static ThreadPriority GetCurrentThreadPriority(); diff --git a/www/iridium/files/patch-base_threading_platform__thread__unittest.cc b/www/iridium/files/patch-base_threading_platform__thread__unittest.cc new file mode 100644 index 000000000000..b998b2d83f2c --- /dev/null +++ b/www/iridium/files/patch-base_threading_platform__thread__unittest.cc @@ -0,0 +1,20 @@ +--- base/threading/platform_thread_unittest.cc.orig 2020-03-23 15:31:47 UTC ++++ base/threading/platform_thread_unittest.cc +@@ -302,7 +302,7 @@ TEST(PlatformThreadTest, + // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this + // proprerty changes for a given platform. + TEST(PlatformThreadTest, CanIncreaseThreadPriority) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be + // able to increase priority to any level. + constexpr bool kCanIncreasePriority = false; +@@ -398,7 +398,7 @@ TEST(PlatformThreadTest, SetHugeThreadName) { + TEST(PlatformThreadTest, GetDefaultThreadStackSize) { + size_t stack_size = PlatformThread::GetDefaultThreadStackSize(); + #if defined(OS_WIN) || defined(OS_IOS) || defined(OS_FUCHSIA) || \ +- (defined(OS_LINUX) && !defined(THREAD_SANITIZER)) || \ ++ ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(THREAD_SANITIZER)) || \ + (defined(OS_ANDROID) && !defined(ADDRESS_SANITIZER)) + EXPECT_EQ(0u, stack_size); + #else diff --git a/www/iridium/files/patch-base_threading_thread__task__runner__handle.cc b/www/iridium/files/patch-base_threading_thread__task__runner__handle.cc index d390e812f5e3..bdafc95fd2e2 100644 --- a/www/iridium/files/patch-base_threading_thread__task__runner__handle.cc +++ b/www/iridium/files/patch-base_threading_thread__task__runner__handle.cc @@ -1,14 +1,14 @@ ---- base/threading/thread_task_runner_handle.cc.orig 2019-03-11 22:00:51 UTC +--- base/threading/thread_task_runner_handle.cc.orig 2019-12-16 21:50:40 UTC +++ base/threading/thread_task_runner_handle.cc -@@ -7,6 +7,7 @@ +@@ -8,6 +8,7 @@ #include <utility> #include "base/bind.h" +#include "base/callback_helpers.h" #include "base/lazy_instance.h" #include "base/logging.h" - #include "base/memory/ptr_util.h" -@@ -37,6 +38,7 @@ bool ThreadTaskRunnerHandle::IsSet() { + #include "base/run_loop.h" +@@ -38,6 +39,7 @@ bool ThreadTaskRunnerHandle::IsSet() { return !!thread_task_runner_tls.Pointer()->Get(); } @@ -16,7 +16,7 @@ // static ScopedClosureRunner ThreadTaskRunnerHandle::OverrideForTesting( scoped_refptr<SingleThreadTaskRunner> overriding_task_runner) { -@@ -86,6 +88,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo +@@ -82,6 +84,7 @@ ScopedClosureRunner ThreadTaskRunnerHandle::OverrideFo base::Unretained(ttrh->task_runner_.get()), std::move(no_running_during_override))); } diff --git a/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc index f8c73c611a35..fef6ba833abf 100644 --- a/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,11 +1,11 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2019-03-11 22:00:51 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2020-03-16 18:39:41 UTC +++ base/trace_event/malloc_dump_provider.cc @@ -17,6 +17,8 @@ #if defined(OS_MACOSX) #include <malloc/malloc.h> +#elif defined(OS_BSD) -+#include "stdlib.h" ++#include <stdlib.h> #else #include <malloc.h> #endif @@ -18,4 +18,4 @@ + allocated_objects_size = 0; #else struct mallinfo info = mallinfo(); - DCHECK_GE(info.arena + info.hblkhd, info.uordblks); + // In case of Android's jemalloc |arena| is 0 and the outer pages size is diff --git a/www/iridium/files/patch-build_config_BUILD.gn b/www/iridium/files/patch-build_config_BUILD.gn index 432594251e67..5eadb70887bf 100644 --- a/www/iridium/files/patch-build_config_BUILD.gn +++ b/www/iridium/files/patch-build_config_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2019-03-11 22:00:52 UTC +--- build/config/BUILD.gn.orig 2020-03-16 18:40:27 UTC +++ build/config/BUILD.gn -@@ -162,7 +162,7 @@ config("debug") { +@@ -133,7 +133,7 @@ config("debug") { # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] } @@ -9,7 +9,7 @@ # Enable libstdc++ debugging facilities to help catch problems early, see # http://crbug.com/65151 . # TODO(phajdan.jr): Should we enable this for all of POSIX? -@@ -263,9 +263,7 @@ config("default_libs") { +@@ -231,9 +231,7 @@ config("default_libs") { ] } else if (is_linux) { libs = [ @@ -19,7 +19,7 @@ ] } } -@@ -342,7 +340,7 @@ config("executable_config") { +@@ -315,7 +313,7 @@ config("executable_config") { "//build/config/ios:ios_dynamic_flags", "//build/config/ios:ios_executable_flags", ] diff --git a/www/iridium/files/patch-build_config_BUILDCONFIG.gn b/www/iridium/files/patch-build_config_BUILDCONFIG.gn index 92b0373dfb03..7c6d307fbd22 100644 --- a/www/iridium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/iridium/files/patch-build_config_BUILDCONFIG.gn @@ -1,4 +1,4 @@ ---- build/config/BUILDCONFIG.gn.orig 2019-03-11 22:00:52 UTC +--- build/config/BUILDCONFIG.gn.orig 2019-06-04 18:55:15 UTC +++ build/config/BUILDCONFIG.gn @@ -131,10 +131,10 @@ declare_args() { is_official_build = false @@ -33,7 +33,7 @@ # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -291,10 +291,11 @@ is_android = current_os == "android" +@@ -288,10 +288,11 @@ is_android = current_os == "android" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" diff --git a/www/iridium/files/patch-build_config_allocator.gni b/www/iridium/files/patch-build_config_allocator.gni deleted file mode 100644 index 49c04a7928c4..000000000000 --- a/www/iridium/files/patch-build_config_allocator.gni +++ /dev/null @@ -1,20 +0,0 @@ ---- build/config/allocator.gni.orig 2019-03-11 22:00:52 UTC -+++ build/config/allocator.gni -@@ -6,7 +6,7 @@ import("//build/config/sanitizers/sanitizers.gni") - - # Temporarily disable tcmalloc on arm64 linux to get rid of compilation errors. - if (is_android || is_mac || is_ios || is_asan || is_lsan || is_tsan || -- is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64")) { -+ is_msan || is_win || is_fuchsia || (is_linux && target_cpu == "arm64") || is_bsd) { - _default_allocator = "none" - } else { - _default_allocator = "tcmalloc" -@@ -17,7 +17,7 @@ if (is_android || is_mac || is_ios || is_asan || is_ls - # against the debug CRT with "is_nacl=false". - if ((is_linux || is_android || is_mac || - (is_win && !is_component_build && !is_debug)) && !is_asan && !is_lsan && -- !is_tsan && !is_msan) { -+ !is_tsan && !is_msan && !is_bsd) { - _default_use_allocator_shim = true - } else { - _default_use_allocator_shim = false diff --git a/www/iridium/files/patch-build_config_compiler_BUILD.gn b/www/iridium/files/patch-build_config_compiler_BUILD.gn index 00964ebeb5f6..76e9706a7967 100644 --- a/www/iridium/files/patch-build_config_compiler_BUILD.gn +++ b/www/iridium/files/patch-build_config_compiler_BUILD.gn @@ -1,24 +1,24 @@ ---- build/config/compiler/BUILD.gn.orig 2019-03-11 22:00:52 UTC +--- build/config/compiler/BUILD.gn.orig 2020-03-16 18:40:27 UTC +++ build/config/compiler/BUILD.gn -@@ -53,7 +53,7 @@ declare_args() { - # only two architectures that are currently checked in). Turn this off when - # you are using a custom toolchain and need to control -B in cflags. - linux_use_bundled_binutils = -- linux_use_bundled_binutils_override && is_linux && -+ linux_use_bundled_binutils_override && (is_linux && !is_bsd) && - (current_cpu == "x64" || current_cpu == "x86") - binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", - root_build_dir) -@@ -275,7 +275,7 @@ config("compiler") { +@@ -137,7 +137,7 @@ declare_args() { + # TODO(vitalybuka): + # 'is_android' breaks content_shell_test_apk on android-kitkat-arm-rel. + # 'use_xcode_clang' may call old clang. +- init_stack_vars = !is_android && !use_xcode_clang && !is_official_build ++ init_stack_vars = !is_android && !use_xcode_clang && !is_official_build && !is_bsd + } + + declare_args() { +@@ -298,7 +298,7 @@ config("compiler") { + # Linker warnings. if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") && - !(is_android && use_order_profiling) && !is_mac && !is_ios && -- current_os != "aix") { -+ current_os != "aix" && !is_bsd) { +- !is_mac && !is_ios && current_os != "aix") { ++ !is_mac && !is_ios && current_os != "aix" && !is_bsd) { # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 - # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 - # crbug.com/485542 -@@ -394,7 +394,7 @@ config("compiler") { + ldflags += [ "-Wl,--fatal-warnings" ] + } +@@ -393,7 +393,7 @@ config("compiler") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. @@ -27,16 +27,16 @@ ldflags += [ "-Wl,-z,defs", "-Wl,--as-needed", -@@ -502,7 +502,7 @@ config("compiler") { +@@ -486,7 +486,7 @@ config("compiler") { } } - if (is_clang && !is_nacl && !use_xcode_clang) { + if (is_clang && !is_nacl && !use_xcode_clang && !is_bsd) { - cflags += [ - # TODO(hans): Remove this once Clang generates better optimized debug info - # by default. https://crbug.com/765793 -@@ -809,7 +809,7 @@ config("compiler_cpu_abi") { + cflags += [ "-fcrash-diagnostics-dir=" + + rebase_path("//tools/clang/crashreports", root_build_dir) ] + +@@ -767,7 +767,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -45,7 +45,16 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1494,7 +1494,7 @@ config("default_warnings") { +@@ -1118,7 +1118,7 @@ config("compiler_deterministic") { + "-Xclang", + ".", + ] +- if (!is_win) { ++ if (!is_win && !is_bsd) { + # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) + asmflags = [ "-Wa,-fdebug-compilation-dir,." ] + } +@@ -1507,7 +1507,7 @@ config("default_warnings") { cflags += [ "-Wno-nonportable-include-path" ] } @@ -54,7 +63,7 @@ # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not # recognize. cflags += [ -@@ -1694,7 +1694,7 @@ config("thin_archive") { +@@ -1741,7 +1741,7 @@ config("thin_archive") { # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't # have a "thin archive" mode (it does accept -T, but it means truncating # archive names to 16 characters, which is not what we want). @@ -63,16 +72,16 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2278,7 +2278,7 @@ config("symbols") { - # flag, so we can use use -g1 for pnacl and nacl-clang compiles. - # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. - if (!is_nacl || is_clang) { -- cflags += [ "-g2" ] -+ cflags += [ "-g0" ] - } +@@ -2334,7 +2334,7 @@ config("symbols") { + # flag, so we can use use -g1 for pnacl and nacl-clang compiles. + # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang. + if (!is_nacl || is_clang) { +- cflags += [ "-g2" ] ++ cflags += [ "-g0" ] } + if (use_debug_fission && !is_nacl && !is_android) { -@@ -2299,7 +2299,7 @@ config("symbols") { +@@ -2355,7 +2355,7 @@ config("symbols") { # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" && diff --git a/www/iridium/files/patch-build_config_compiler_compiler.gni b/www/iridium/files/patch-build_config_compiler_compiler.gni index 9de88b63a2de..5826499ed89a 100644 --- a/www/iridium/files/patch-build_config_compiler_compiler.gni +++ b/www/iridium/files/patch-build_config_compiler_compiler.gni @@ -1,6 +1,15 @@ ---- build/config/compiler/compiler.gni.orig 2019-03-11 22:00:52 UTC +--- build/config/compiler/compiler.gni.orig 2020-03-16 18:40:27 UTC +++ build/config/compiler/compiler.gni -@@ -179,7 +179,7 @@ declare_args() { +@@ -47,7 +47,7 @@ declare_args() { + # only two architectures that are currently checked in). Turn this off when + # you are using a custom toolchain and need to control -B in cflags. + linux_use_bundled_binutils = +- linux_use_bundled_binutils_override && is_linux && ++ linux_use_bundled_binutils_override && (is_linux && !is_bsd) && + (current_cpu == "x64" || current_cpu == "x86") + binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", + root_build_dir) +@@ -200,7 +200,7 @@ declare_args() { declare_args() { # Whether to use the gold linker from binutils instead of lld or bfd. use_gold = diff --git a/www/iridium/files/patch-build_config_features.gni b/www/iridium/files/patch-build_config_features.gni index 2fe94bdc8b84..c98a61186fa9 100644 --- a/www/iridium/files/patch-build_config_features.gni +++ b/www/iridium/files/patch-build_config_features.gni @@ -1,7 +1,7 @@ ---- build/config/features.gni.orig 2019-03-11 22:00:52 UTC +--- build/config/features.gni.orig 2019-10-21 19:06:18 UTC +++ build/config/features.gni -@@ -41,7 +41,7 @@ declare_args() { - } +@@ -26,7 +26,7 @@ declare_args() { + proprietary_codecs = is_chrome_branded || is_chromecast # libudev usage. This currently only affects the content layer. - use_udev = is_linux && !is_chromecast diff --git a/www/iridium/files/patch-build_config_gclient__args.gni b/www/iridium/files/patch-build_config_gclient__args.gni deleted file mode 100644 index 7581e96d233d..000000000000 --- a/www/iridium/files/patch-build_config_gclient__args.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- build/config/gclient_args.gni.orig 2019-05-14 18:53:12 UTC -+++ build/config/gclient_args.gni -@@ -2,5 +2,5 @@ - build_with_chromium = true - checkout_android = false - checkout_android_native_support = false --checkout_nacl = true --checkout_oculus_sdk = false -\ No newline at end of file -+checkout_nacl = false -+checkout_oculus_sdk = false diff --git a/www/iridium/files/patch-build_config_linux_pkg-config.py b/www/iridium/files/patch-build_config_linux_pkg-config.py index bac7de0165ef..8a2865a024c0 100644 --- a/www/iridium/files/patch-build_config_linux_pkg-config.py +++ b/www/iridium/files/patch-build_config_linux_pkg-config.py @@ -1,7 +1,7 @@ ---- build/config/linux/pkg-config.py.orig 2019-03-11 22:00:52 UTC +--- build/config/linux/pkg-config.py.orig 2019-07-24 18:58:02 UTC +++ build/config/linux/pkg-config.py -@@ -57,8 +57,12 @@ def SetConfigPath(options): - print "You must specify an architecture via -a if using a sysroot." +@@ -59,8 +59,12 @@ def SetConfigPath(options): + print("You must specify an architecture via -a if using a sysroot.") sys.exit(1) - libdir = sysroot + '/usr/' + options.system_libdir + '/pkgconfig' @@ -15,12 +15,12 @@ os.environ['PKG_CONFIG_LIBDIR'] = libdir return libdir -@@ -107,7 +111,7 @@ def main(): +@@ -109,7 +113,7 @@ def main(): # If this is run on non-Linux platforms, just return nothing and indicate # success. This allows us to "kind of emulate" a Linux build from other # platforms. - if "linux" not in sys.platform: + if "bsd" not in sys.platform: - print "[[],[],[],[],[]]" + print("[[],[],[],[],[]]") return 0 diff --git a/www/iridium/files/patch-build_detect__host__arch.py b/www/iridium/files/patch-build_detect__host__arch.py new file mode 100644 index 000000000000..588896662607 --- /dev/null +++ b/www/iridium/files/patch-build_detect__host__arch.py @@ -0,0 +1,11 @@ +--- build/detect_host_arch.py.orig 2019-07-24 18:58:02 UTC ++++ build/detect_host_arch.py +@@ -21,6 +21,8 @@ def HostArch(): + host_arch = 'ia32' + elif host_arch in ['x86_64', 'amd64']: + host_arch = 'x64' ++ elif host_arch.startswith('arm64'): ++ host_arch = 'arm64' + elif host_arch.startswith('arm'): + host_arch = 'arm' + elif host_arch.startswith('aarch64'): diff --git a/www/iridium/files/patch-build_gn__run__binary.py b/www/iridium/files/patch-build_gn__run__binary.py index 2b7f4a526104..d9e733834b4a 100644 --- a/www/iridium/files/patch-build_gn__run__binary.py +++ b/www/iridium/files/patch-build_gn__run__binary.py @@ -1,6 +1,6 @@ ---- build/gn_run_binary.py.orig 2019-03-11 22:00:52 UTC +--- build/gn_run_binary.py.orig 2019-07-24 18:58:02 UTC +++ build/gn_run_binary.py -@@ -22,7 +22,7 @@ if not os.path.isabs(path): +@@ -24,7 +24,7 @@ if not os.path.isabs(path): # The rest of the arguments are passed directly to the executable. args = [path] + sys.argv[2:] diff --git a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni index ffd043fda652..4d315485b923 100644 --- a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,8 +1,8 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2019-03-11 22:00:52 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2020-03-16 18:40:27 UTC +++ build/toolchain/gcc_toolchain.gni -@@ -47,6 +47,11 @@ analyzer_wrapper = - rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py", - root_build_dir) + " --mode=clang" +@@ -36,6 +36,11 @@ if (is_linux && target_os == "android") { + enable_resource_whitelist_generation = false + } +declare_args() { + extra_cxxflags = "" @@ -12,7 +12,7 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -610,13 +615,23 @@ template("clang_toolchain") { +@@ -577,13 +582,23 @@ template("clang_toolchain") { } gcc_toolchain(target_name) { diff --git a/www/iridium/files/patch-build_toolchain_get__concurrent__links.py b/www/iridium/files/patch-build_toolchain_get__concurrent__links.py index 6e50c94426cd..45bc3d0a520e 100644 --- a/www/iridium/files/patch-build_toolchain_get__concurrent__links.py +++ b/www/iridium/files/patch-build_toolchain_get__concurrent__links.py @@ -1,6 +1,6 @@ ---- build/toolchain/get_concurrent_links.py.orig 2019-03-11 22:00:52 UTC +--- build/toolchain/get_concurrent_links.py.orig 2019-06-04 18:55:15 UTC +++ build/toolchain/get_concurrent_links.py -@@ -46,6 +46,14 @@ def _GetTotalMemoryInBytes(): +@@ -48,6 +48,14 @@ def _GetTotalMemoryInBytes(): return int(subprocess.check_output(['sysctl', '-n', 'hw.memsize'])) except Exception: return 0 diff --git a/www/iridium/files/patch-build_toolchain_linux_BUILD.gn b/www/iridium/files/patch-build_toolchain_linux_BUILD.gn index ab029144a6c4..29b9160f7b07 100644 --- a/www/iridium/files/patch-build_toolchain_linux_BUILD.gn +++ b/www/iridium/files/patch-build_toolchain_linux_BUILD.gn @@ -1,6 +1,6 @@ ---- build/toolchain/linux/BUILD.gn.orig 2019-03-11 22:00:52 UTC +--- build/toolchain/linux/BUILD.gn.orig 2019-04-30 22:22:28 UTC +++ build/toolchain/linux/BUILD.gn -@@ -14,7 +14,6 @@ clang_toolchain("clang_arm") { +@@ -22,7 +22,6 @@ clang_toolchain("clang_arm") { } clang_toolchain("clang_arm64") { diff --git a/www/iridium/files/patch-cc_BUILD.gn b/www/iridium/files/patch-cc_BUILD.gn index 57edb8265544..f2e64c64d738 100644 --- a/www/iridium/files/patch-cc_BUILD.gn +++ b/www/iridium/files/patch-cc_BUILD.gn @@ -1,21 +1,19 @@ ---- cc/BUILD.gn.orig 2019-03-11 22:00:52 UTC +--- cc/BUILD.gn.orig 2020-03-16 18:40:27 UTC +++ cc/BUILD.gn -@@ -548,7 +548,7 @@ cc_test_static_library("test_support") { - "//ui/gl:test_support", - "//ui/latency", - ] +@@ -582,7 +582,7 @@ cc_test_static_library("test_support") { + if (enable_vulkan) { + deps += [ "//gpu/vulkan/init" ] + } - if (!is_android) { + if (!is_android && !is_bsd) { - data_deps = [ - "//third_party/mesa_headers", - ] -@@ -746,9 +746,6 @@ cc_test("cc_unittests") { - "//ui/gfx/geometry", - "//ui/gl", - "//ui/gl:test_support", -- ] -- data_deps = [ + data_deps = [ "//third_party/mesa_headers" ] + } + } +@@ -788,7 +788,6 @@ cc_test("cc_unittests") { + ] + data_deps = [ + "//testing/buildbot/filters:cc_unittests_filters", - "//third_party/mesa_headers", ] - } + if (enable_vulkan) { diff --git a/www/iridium/files/patch-cc_layers_scrollbar__layer__impl__base.cc b/www/iridium/files/patch-cc_layers_scrollbar__layer__impl__base.cc index 2b91b797f84d..b412aea9e22b 100644 --- a/www/iridium/files/patch-cc_layers_scrollbar__layer__impl__base.cc +++ b/www/iridium/files/patch-cc_layers_scrollbar__layer__impl__base.cc @@ -1,6 +1,6 @@ ---- cc/layers/scrollbar_layer_impl_base.cc.orig 2019-03-11 22:00:52 UTC +--- cc/layers/scrollbar_layer_impl_base.cc.orig 2019-12-16 21:50:40 UTC +++ cc/layers/scrollbar_layer_impl_base.cc -@@ -218,8 +218,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect +@@ -220,8 +220,8 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect int thumb_offset = TrackStart(); if (maximum > 0) { float ratio = clamped_current_pos / maximum; diff --git a/www/iridium/files/patch-cc_trees_property__tree.cc b/www/iridium/files/patch-cc_trees_property__tree.cc index 1b68ad522dde..d8e7bed84ae0 100644 --- a/www/iridium/files/patch-cc_trees_property__tree.cc +++ b/www/iridium/files/patch-cc_trees_property__tree.cc @@ -1,6 +1,6 @@ ---- cc/trees/property_tree.cc.orig 2019-03-11 22:00:52 UTC +--- cc/trees/property_tree.cc.orig 2020-03-16 18:40:27 UTC +++ cc/trees/property_tree.cc -@@ -1325,13 +1325,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro +@@ -1237,13 +1237,13 @@ gfx::ScrollOffset ScrollTree::MaxScrollOffset(int scro gfx::Size clip_layer_bounds = container_bounds(scroll_node->id); diff --git a/www/iridium/files/patch-chrome_app_chrome__command__ids.h b/www/iridium/files/patch-chrome_app_chrome__command__ids.h index 68fb11092810..983a9acf8891 100644 --- a/www/iridium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/iridium/files/patch-chrome_app_chrome__command__ids.h @@ -1,6 +1,6 @@ ---- chrome/app/chrome_command_ids.h.orig 2019-03-11 22:00:52 UTC +--- chrome/app/chrome_command_ids.h.orig 2020-02-03 21:53:28 UTC +++ chrome/app/chrome_command_ids.h -@@ -63,7 +63,7 @@ +@@ -62,7 +62,7 @@ #define IDC_VISIT_DESKTOP_OF_LRU_USER_2 34049 #define IDC_VISIT_DESKTOP_OF_LRU_USER_3 34050 diff --git a/www/iridium/files/patch-chrome_app_chrome__main.cc b/www/iridium/files/patch-chrome_app_chrome__main.cc index adfcbba22044..28a06a8d2f72 100644 --- a/www/iridium/files/patch-chrome_app_chrome__main.cc +++ b/www/iridium/files/patch-chrome_app_chrome__main.cc @@ -1,7 +1,7 @@ ---- chrome/app/chrome_main.cc.orig 2019-04-10 10:50:03 UTC +--- chrome/app/chrome_main.cc.orig 2020-04-10 00:39:09 UTC +++ chrome/app/chrome_main.cc -@@ -110,11 +110,11 @@ int ChromeMain(int argc, const char** argv) { - #endif +@@ -118,11 +118,11 @@ int ChromeMain(int argc, const char** argv) { + MainThreadStackSamplingProfiler scoped_sampling_profiler; // Chrome-specific process modes. -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) @@ -12,5 +12,5 @@ -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - int rv = content::ContentMain(params); - + #if !defined(CHROME_MULTIPLE_DLL_CHILD) + net::trace_urlreq_cb = &trace_url_request; diff --git a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc index eeb5aaedaec0..88a9416974a2 100644 --- a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2019-03-11 22:00:52 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2020-03-16 18:40:27 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -101,7 +101,7 @@ +@@ -100,7 +100,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -135,7 +135,7 @@ +@@ -142,12 +142,12 @@ #include "v8/include/v8.h" #endif @@ -18,7 +18,13 @@ #include "base/environment.h" #endif -@@ -232,7 +232,7 @@ bool UseHooks() { + #if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_ANDROID) || \ +- defined(OS_LINUX) ++ defined(OS_LINUX) || defined(OS_BSD) + #include "chrome/browser/policy/policy_path_parser.h" + #include "components/crash/content/app/crashpad.h" + #endif +@@ -246,7 +246,7 @@ bool UseHooks() { #endif // defined(OS_WIN) @@ -27,7 +33,7 @@ void AdjustLinuxOOMScore(const std::string& process_type) { // Browsers and zygotes should still be killable, but killed last. const int kZygoteScore = 0; -@@ -291,7 +291,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -305,13 +305,13 @@ void AdjustLinuxOOMScore(const std::string& process_ty if (score > -1) base::AdjustOOMScore(base::GetCurrentProcId(), score); } @@ -36,7 +42,14 @@ // Returns true if this subprocess type needs the ResourceBundle initialized // and resources loaded. -@@ -336,7 +336,7 @@ bool HandleVersionSwitches(const base::CommandLine& co + bool SubprocessNeedsResourceBundle(const std::string& process_type) { + return +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // The zygote process opens the resources for the renderers. + process_type == service_manager::switches::kZygoteProcess || + #endif +@@ -350,7 +350,7 @@ bool HandleVersionSwitches(const base::CommandLine& co return false; } @@ -45,7 +58,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -346,7 +346,7 @@ void HandleHelpSwitches(const base::CommandLine& comma +@@ -360,7 +360,7 @@ void HandleHelpSwitches(const base::CommandLine& comma PLOG(FATAL) << "execlp failed"; } } @@ -54,7 +67,7 @@ #if !defined(OS_MACOSX) && !defined(OS_ANDROID) void SIGTERMProfilingShutdown(int signal) { -@@ -400,7 +400,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -414,7 +414,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -63,7 +76,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -412,7 +412,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -426,7 +426,7 @@ void InitializeUserDataDir(base::CommandLine* command_ user_data_dir = base::FilePath::FromUTF8Unsafe(user_data_dir_string); } } @@ -72,7 +85,7 @@ #if defined(OS_MACOSX) policy::path_parser::CheckUserDataDirPolicy(&user_data_dir); #endif // OS_MAC -@@ -469,7 +469,7 @@ void InitLogging(const std::string& process_type) { +@@ -483,7 +483,7 @@ void InitLogging(const std::string& process_type) { void RecordMainStartupMetrics(base::TimeTicks exe_entry_point_ticks) { if (!exe_entry_point_ticks.is_null()) startup_metric_utils::RecordExeMainEntryPointTicks(exe_entry_point_ticks); @@ -81,7 +94,7 @@ // Record the startup process creation time on supported platforms. startup_metric_utils::RecordStartupProcessCreationTime( base::Process::Current().CreationTime()); -@@ -596,7 +596,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -688,7 +688,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi *exit_code = 0; return true; // Got a --version switch; exit with a success error code. } @@ -90,7 +103,7 @@ // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -620,7 +620,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi +@@ -712,7 +712,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif @@ -99,7 +112,16 @@ nacl::RegisterPathProvider(); #endif -@@ -936,7 +936,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -904,7 +904,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + #if defined(OS_WIN) + child_process_logging::Init(); + #endif +-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + // Create an instance of the CPU class to parse /proc/cpuinfo and cache + // cpu_brand info. + base::CPU cpu_info; +@@ -1028,7 +1028,7 @@ void ChromeMainDelegate::PreSandboxStartup() { InitializePDF(); #endif @@ -108,8 +130,8 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != service_manager::switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -951,7 +951,7 @@ void ChromeMainDelegate::PreSandboxStartup() { - breakpad::InitCrashReporter(process_type); +@@ -1049,7 +1049,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + } #endif // defined(OS_ANDROID) } -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) @@ -117,7 +139,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -961,7 +961,7 @@ void ChromeMainDelegate::PreSandboxStartup() { +@@ -1059,7 +1059,7 @@ void ChromeMainDelegate::PreSandboxStartup() { void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) { // Note: If you are adding a new process type below, be sure to adjust the // AdjustLinuxOOMScore function too. @@ -126,3 +148,12 @@ AdjustLinuxOOMScore(process_type); #endif #if defined(OS_WIN) +@@ -1105,7 +1105,7 @@ int ChromeMainDelegate::RunProcess( + // This entry is not needed on Linux, where the NaCl loader + // process is launched via nacl_helper instead. + #if BUILDFLAG(ENABLE_NACL) && !defined(CHROME_MULTIPLE_DLL_BROWSER) && \ +- !defined(OS_LINUX) ++ !defined(OS_LINUX) && !defined(OS_BSD) + {switches::kNaClLoaderProcess, NaClMain}, + #else + {"<invalid>", NULL}, // To avoid constant array of size 0 diff --git a/www/iridium/files/patch-chrome_app_chromium__strings.grd b/www/iridium/files/patch-chrome_app_chromium__strings.grd index 5f2be8ee5375..f2fafb3fc1d4 100644 --- a/www/iridium/files/patch-chrome_app_chromium__strings.grd +++ b/www/iridium/files/patch-chrome_app_chromium__strings.grd @@ -1,15 +1,24 @@ ---- chrome/app/chromium_strings.grd.orig 2019-04-10 10:50:02 UTC +--- chrome/app/chromium_strings.grd.orig 2020-04-10 00:39:12 UTC +++ chrome/app/chromium_strings.grd -@@ -809,7 +809,7 @@ Signing in anyway will merge browser information like +@@ -649,7 +649,7 @@ The browser is unable to recover your settings. + </if> + + <!-- about:browser-switch strings --> +- <if expr="is_win or is_macosx or (is_linux and not chromeos)"> ++ <if expr="is_win or is_macosx or (is_posix and not chromeos)"> + <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> + Your system administrator has configured the browser to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. + </message> +@@ -750,7 +750,7 @@ The browser is unable to recover your settings. </message> <!-- ProcessSingleton --> - <if expr="is_linux or is_macosx"> + <if expr="is_linux or is_macosx or is_posix"> <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> - The profile appears to be in use by another browser process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). The browser has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch the browser. + The profile appears to be in use by another browsr process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). The browser has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch the browser. </message> -@@ -1057,7 +1057,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2 +@@ -964,7 +964,7 @@ The browser is unable to recover your settings. </message> <!-- Plugin Placeholders --> diff --git a/www/iridium/files/patch-chrome_app_generated__resources.grd b/www/iridium/files/patch-chrome_app_generated__resources.grd index ba62605775c3..fcae380a37c1 100644 --- a/www/iridium/files/patch-chrome_app_generated__resources.grd +++ b/www/iridium/files/patch-chrome_app_generated__resources.grd @@ -1,15 +1,15 @@ ---- chrome/app/generated_resources.grd.orig 2019-03-11 22:00:52 UTC +--- chrome/app/generated_resources.grd.orig 2020-03-16 18:40:27 UTC +++ chrome/app/generated_resources.grd -@@ -5339,7 +5339,7 @@ the Bookmarks menu."> - </message> +@@ -5141,7 +5141,7 @@ Keep your key file in a safe place. You will need it t </if> -- <if expr="is_win or (is_linux and not chromeos)"> -+ <if expr="is_win or (is_posix and not chromeos)"> - <message name="IDS_QUIT_ACCELERATOR_TUTORIAL" desc="Instructions for how the user should quit using keyboard shortcuts."> - Press |<ph name="ACCELERATOR1">$1<ex>Ctrl</ex></ph>|+|<ph name="ACCELERATOR2">$2<ex>Shift</ex></ph>| followed by |<ph name="ACCELERATOR3">$3<ex>Q</ex></ph>| to exit + <!-- chrome://browser-switch strings --> +- <if expr="is_win or is_macosx or (is_linux and not chromeos)"> ++ <if expr="is_win or is_macosx or (is_posix and not chromeos)"> + <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title"> + Legacy Browser Support </message> -@@ -6160,7 +6160,7 @@ the Bookmarks menu."> +@@ -6861,7 +6861,7 @@ the Bookmarks menu."> Google Pay </message> @@ -18,7 +18,7 @@ <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders."> Use system title bar and borders </message> -@@ -6946,7 +6946,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -7822,7 +7822,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> diff --git a/www/iridium/files/patch-chrome_app_google__chrome__strings.grd b/www/iridium/files/patch-chrome_app_google__chrome__strings.grd index 064f31b18f22..47ad7a871540 100644 --- a/www/iridium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/iridium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,6 +1,15 @@ ---- chrome/app/google_chrome_strings.grd.orig 2019-03-11 22:00:52 UTC +--- chrome/app/google_chrome_strings.grd.orig 2020-03-16 18:40:27 UTC +++ chrome/app/google_chrome_strings.grd -@@ -820,7 +820,7 @@ Signing in anyway will merge Chrome information like b +@@ -661,7 +661,7 @@ Google Chrome is unable to recover your settings. + </if> + + <!-- about:browser-switch strings --> +- <if expr="is_win or is_macosx or (is_linux and not chromeos)"> ++ <if expr="is_win or is_macosx or (is_posix and not chromeos)"> + <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> + Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. + </message> +@@ -762,7 +762,7 @@ Google Chrome is unable to recover your settings. </message> <!-- ProcessSingleton --> @@ -9,7 +18,7 @@ <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. </message> -@@ -1075,7 +1075,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2 +@@ -991,7 +991,7 @@ Google Chrome is unable to recover your settings. </message> <!-- Plugin Placeholders --> diff --git a/www/iridium/files/patch-chrome_app_settings__strings.grdp b/www/iridium/files/patch-chrome_app_settings__strings.grdp index 44c1a7bd1c46..18bd3350bdf8 100644 --- a/www/iridium/files/patch-chrome_app_settings__strings.grdp +++ b/www/iridium/files/patch-chrome_app_settings__strings.grdp @@ -1,6 +1,6 @@ ---- chrome/app/settings_strings.grdp.orig 2019-03-11 22:00:52 UTC +--- chrome/app/settings_strings.grdp.orig 2020-03-16 18:40:29 UTC +++ chrome/app/settings_strings.grdp -@@ -580,7 +580,7 @@ +@@ -811,7 +811,7 @@ Themes </message> </if> @@ -9,7 +9,7 @@ <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux"> GTK+ </message> -@@ -594,7 +594,7 @@ +@@ -825,7 +825,7 @@ Use Classic </message> </if> diff --git a/www/iridium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc b/www/iridium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc index a68c54c98713..3678715840b5 100644 --- a/www/iridium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc +++ b/www/iridium/files/patch-chrome_app_shutdown__signal__handlers__posix.cc @@ -1,6 +1,6 @@ ---- chrome/app/shutdown_signal_handlers_posix.cc.orig 2019-03-11 22:00:52 UTC +--- chrome/app/shutdown_signal_handlers_posix.cc.orig 2019-04-30 22:22:32 UTC +++ chrome/app/shutdown_signal_handlers_posix.cc -@@ -183,12 +183,18 @@ void InstallShutdownSignalHandlers( +@@ -186,12 +186,18 @@ void InstallShutdownSignalHandlers( g_pipe_pid = getpid(); g_shutdown_pipe_read_fd = pipefd[0]; g_shutdown_pipe_write_fd = pipefd[1]; @@ -18,4 +18,4 @@ +#endif #endif ShutdownDetector* detector = new ShutdownDetector( - g_shutdown_pipe_read_fd, shutdown_callback, task_runner); + g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner); diff --git a/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd index d8702ebfc748..34bf723d2edc 100644 --- a/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ b/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd @@ -1,11 +1,11 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-03-11 22:00:52 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2020-02-03 21:53:28 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd -@@ -100,7 +100,7 @@ - <include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/common/profile_avatar_sun_cloud.png" type="BINDATA" /> - <include name="IDR_PROFILE_AVATAR_2X_26" file="default_200_percent/common/profile_avatar_placeholder.png" type="BINDATA" /> - </if> -- <if expr="is_linux and enable_app_list"> -+ <if expr="is_posix and enable_app_list"> - <!-- App Launcher icons for desktop icon. --> - <if expr="_google_chrome"> - <then> +@@ -18,7 +18,7 @@ + <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/product_logo_128.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_256" file="google_chrome/product_logo_256.png" type="BINDATA" /> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/product_logo_128_beta.png" type="BINDATA" /> + <include name="IDR_PRODUCT_LOGO_128_DEV" file="google_chrome/product_logo_128_dev.png" type="BINDATA" /> + </if> diff --git a/www/iridium/files/patch-chrome_app_theme_theme__resources.grd b/www/iridium/files/patch-chrome_app_theme_theme__resources.grd new file mode 100644 index 000000000000..a6e63ac69942 --- /dev/null +++ b/www/iridium/files/patch-chrome_app_theme_theme__resources.grd @@ -0,0 +1,11 @@ +--- chrome/app/theme/theme_resources.grd.orig 2019-10-30 15:46:23 UTC ++++ chrome/app/theme/theme_resources.grd +@@ -25,7 +25,7 @@ + <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST + BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE + SAME CONDITIONALS. --> +- <if expr="is_linux or is_win or chromeos"> ++ <if expr="is_posix or is_win or chromeos"> + <structure type="chrome_scaled_image" name="IDR_ACCESSIBILITY_CAPTIONS_PREVIEW_BACKGROUND" file="common/captions-preview-bg.png" /> + </if> + <if expr="toolkit_views and not is_macosx"> diff --git a/www/iridium/files/patch-chrome_browser_about__flags.cc b/www/iridium/files/patch-chrome_browser_about__flags.cc index edd420c43ba8..aec113703d20 100644 --- a/www/iridium/files/patch-chrome_browser_about__flags.cc +++ b/www/iridium/files/patch-chrome_browser_about__flags.cc @@ -1,72 +1,126 @@ ---- chrome/browser/about_flags.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/about_flags.cc.orig 2020-04-03 04:11:28 UTC +++ chrome/browser/about_flags.cc -@@ -749,7 +749,7 @@ const FeatureEntry::FeatureVariation kAutofillPreviewS - {"(Black on GoogleYellow050)", kAutofillPreviewStyleBlackOnYellow050, - base::size(kAutofillPreviewStyleBlackOnYellow050), nullptr}}; +@@ -170,7 +170,7 @@ + #include "ui/gl/gl_switches.h" + #include "ui/native_theme/native_theme_features.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/allocator/buildflags.h" + #endif + +@@ -834,7 +834,7 @@ const FeatureEntry::Choice kMemlogSamplingRateChoices[ + heap_profiling::kMemlogSamplingRate5MB}, + }; -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - const FeatureEntry::FeatureParam kPedalSuggestionInSuggestion[] = { - {OmniboxFieldTrial::kPedalSuggestionModeParam, "in_suggestion"}}; - const FeatureEntry::FeatureParam kPedalSuggestionDedicated[] = { -@@ -760,7 +760,7 @@ const FeatureEntry::FeatureVariation kPedalSuggestionV - {"Dedicated Suggestion Line", kPedalSuggestionDedicated, - base::size(kPedalSuggestionDedicated), nullptr}, - }; + const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { + {"DocumentUseServerScore", "true"}, + {"DocumentUseClientScore", "false"}, +@@ -872,7 +872,7 @@ const FeatureEntry::FeatureVariation kOmniboxDocumentP + base::size(kOmniboxDocumentProviderClientScoring), nullptr}, + {"server and client scores", kOmniboxDocumentProviderServerAndClientScoring, + base::size(kOmniboxDocumentProviderServerAndClientScoring), nullptr}}; -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - const FeatureEntry::Choice kAutoplayPolicyChoices[] = { - {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -2362,12 +2362,12 @@ const FeatureEntry kFeatureEntries[] = { - {"force-text-direction", flag_descriptions::kForceTextDirectionName, - flag_descriptions::kForceTextDirectionDescription, kOsAll, - MULTI_VALUE_TYPE(kForceTextDirectionChoices)}, --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - {"enable-input-ime-api", flag_descriptions::kEnableInputImeApiName, - flag_descriptions::kEnableInputImeApiDescription, kOsWin | kOsLinux, - ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI, - switches::kDisableInputImeAPI)}, --#endif // OS_WIN || OS_LINUX -+#endif // OS_WIN || OS_LINUX || OS_BSD - {"enable-origin-trials", flag_descriptions::kOriginTrialsName, - flag_descriptions::kOriginTrialsDescription, kOsAll, - FEATURE_VALUE_TYPE(features::kOriginTrials)}, -@@ -2562,12 +2562,12 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(chrome::android::kAndroidNightMode)}, - #endif // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE) + const FeatureEntry::FeatureParam kOmniboxOnFocusSuggestionsParamSERP[] = { + {"ZeroSuggestVariant:6:*", "RemoteSendUrl"}}; +@@ -994,14 +994,14 @@ const FeatureEntry::FeatureVariation kOmniboxMaxURLMat + {"6 matches", kOmniboxMaxURLMatches6, base::size(kOmniboxMaxURLMatches6), + nullptr}}; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + const FeatureEntry::FeatureParam kTranslateBubbleUITab[] = { + {language::kTranslateUIBubbleKey, language::kTranslateUIBubbleTabValue}}; + + const FeatureEntry::FeatureVariation kTranslateBubbleUIVariations[] = { + {"Tab", kTranslateBubbleUITab, base::size(kTranslateBubbleUITab), nullptr}}; +-#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS ++#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS || OS_BSD + + const FeatureEntry::FeatureParam kMarkHttpAsDangerous[] = { + {security_state::features::kMarkHttpAsFeatureParameterName, +@@ -2031,13 +2031,13 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kCloudPrintXpsDescription, kOsWin, + SINGLE_VALUE_TYPE(switches::kEnableCloudPrintXps)}, + #endif // OS_WIN +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + {"enable-webgl2-compute-context", + flag_descriptions::kWebGL2ComputeContextName, + flag_descriptions::kWebGL2ComputeContextDescription, + kOsWin | kOsLinux | kOsCrOS, + SINGLE_VALUE_TYPE(switches::kEnableWebGL2ComputeContext)}, +-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + {"enable-webgl-draft-extensions", + flag_descriptions::kWebglDraftExtensionsName, + flag_descriptions::kWebglDraftExtensionsDescription, kOsAll, +@@ -2074,14 +2074,14 @@ const FeatureEntry kFeatureEntries[] = { + "OverrideTranslateTriggerInIndia")}, #endif // OS_ANDROID --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - {"passwords-migrate-linux-to-login-db", - flag_descriptions::kPasswordsMigrateLinuxToLoginDBName, - flag_descriptions::kPasswordsMigrateLinuxToLoginDBDescription, kOsLinux, - FEATURE_VALUE_TYPE(password_manager::features::kMigrateLinuxToLoginDB)}, --#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - {"enable-experimental-accessibility-features", - flag_descriptions::kExperimentalAccessibilityFeaturesName, - flag_descriptions::kExperimentalAccessibilityFeaturesDescription, kOsCrOS, -@@ -3001,7 +3001,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(omnibox::kOmniboxNewAnswerLayout)}, - #endif // defined(OS_ANDROID) + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + {"translate-ui-bubble-options", flag_descriptions::kTranslateBubbleUIName, + flag_descriptions::kTranslateBubbleUIDescription, kOsDesktop, + FEATURE_WITH_PARAMS_VALUE_TYPE(language::kUseButtonTranslateBubbleUi, + kTranslateBubbleUIVariations, + "UseButtonTranslateBubbleUI")}, +-#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS ++#endif // OS_LINUX || OS_MACOSX || OS_WIN || OS_CHROMEOS || OS_BSD + + #if BUILDFLAG(ENABLE_NATIVE_NOTIFICATIONS) && !defined(OS_CHROMEOS) + {"enable-native-notifications", +@@ -2159,13 +2159,13 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kTerminalSystemAppSplitsDescription, kOsCrOS, + FEATURE_VALUE_TYPE(features::kTerminalSystemAppSplits)}, + #endif // OS_CHROMEOS +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + #if BUILDFLAG(USE_TCMALLOC) + {"dynamic-tcmalloc-tuning", flag_descriptions::kDynamicTcmallocName, + flag_descriptions::kDynamicTcmallocDescription, kOsCrOS | kOsLinux, + FEATURE_VALUE_TYPE(performance_manager::features::kDynamicTcmallocTuning)}, + #endif // BUILDFLAG(USE_TCMALLOC) +-#endif // OS_CHROMEOS || OS_LINUX ++#endif // OS_CHROMEOS || OS_LINUX || defined(OS_BSD) + #if defined(OS_ANDROID) + {"enable-credit-card-assist", flag_descriptions::kCreditCardAssistName, + flag_descriptions::kCreditCardAssistDescription, kOsAndroid, +@@ -2239,7 +2239,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableLitePageServerPreviewsDescription, kOsAndroid, + FEATURE_VALUE_TYPE(previews::features::kLitePageServerPreviews)}, + #endif // OS_ANDROID +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + {"enable-save-data", flag_descriptions::kEnableSaveDataName, + flag_descriptions::kEnableSaveDataDescription, kOsCrOS, + SINGLE_VALUE_TYPE( +@@ -2907,7 +2907,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE( + omnibox::kHistoryQuickProviderAllowMidwordContinuations)}, -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - {"omnibox-reverse-answers", flag_descriptions::kOmniboxReverseAnswersName, - flag_descriptions::kOmniboxReverseAnswersDescription, kOsDesktop, - FEATURE_VALUE_TYPE(omnibox::kOmniboxReverseAnswers)}, -@@ -3026,7 +3026,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kOmniboxDriveSuggestionsName, - flag_descriptions::kOmniboxDriveSuggestionsDescriptions, kOsDesktop, - FEATURE_VALUE_TYPE(omnibox::kDocumentProvider)}, + {"omnibox-experimental-keyword-mode", + flag_descriptions::kOmniboxExperimentalKeywordModeName, + flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, +@@ -2956,7 +2956,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kOmniboxAutocompleteTitlesName, + flag_descriptions::kOmniboxAutocompleteTitlesDescription, kOsDesktop, + FEATURE_VALUE_TYPE(omnibox::kAutocompleteTitles)}, -#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) {"enable-speculative-service-worker-start-on-query-input", flag_descriptions::kSpeculativeServiceWorkerStartOnQueryInputName, -@@ -3342,7 +3342,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3182,13 +3182,13 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kClickToOpenPDFDescription, kOsAll, FEATURE_VALUE_TYPE(features::kClickToOpenPDFPlaceholder)}, @@ -75,46 +129,77 @@ {"direct-manipulation-stylus", flag_descriptions::kDirectManipulationStylusName, flag_descriptions::kDirectManipulationStylusDescription, -@@ -3353,7 +3353,7 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kShowManagedUiDescription, - kOsWin | kOsMac | kOsLinux | kOsCrOS, - FEATURE_VALUE_TYPE(features::kShowManagedUi)}, + kOsWin | kOsMac | kOsLinux, + FEATURE_VALUE_TYPE(features::kDirectManipulationStylus)}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - #if defined(OS_ANDROID) - {"third-party-doodles", flag_descriptions::kThirdPartyDoodlesName, -@@ -4280,7 +4280,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kForceEnableSystemAec)}, - #endif // defined(OS_MACOSX) || defined(OS_CHROMEOS) + #if !defined(OS_ANDROID) + {"ntp-confirm-suggestion-removals", +@@ -3850,12 +3850,12 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(kClickToCallDetectionV2)}, + #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - {"autofill-always-show-server-cards-in-sync-transport", - flag_descriptions::kAutofillAlwaysShowServerCardsInSyncTransportName, - flag_descriptions:: -@@ -4288,7 +4288,7 @@ const FeatureEntry kFeatureEntries[] = { - kOsMac | kOsWin | kOsLinux, - FEATURE_VALUE_TYPE( - autofill::features::kAutofillAlwaysShowServerCardsInSyncTransport)}, --#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + {"remote-copy-receiver", flag_descriptions::kRemoteCopyReceiverName, + flag_descriptions::kRemoteCopyReceiverDescription, kOsDesktop, + FEATURE_VALUE_TYPE(kRemoteCopyReceiver)}, +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) - #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && defined(OS_MACOSX) - {"enable-custom-mac-paper-sizes", -@@ -4333,13 +4333,13 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kCrostiniAppSearch)}, - #endif // OS_CHROMEOS + {"shared-clipboard-receiver", +@@ -3899,7 +3899,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kSharingUseDeviceInfoDescription, kOsAll, + FEATURE_VALUE_TYPE(kSharingUseDeviceInfo)}, + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + {"sharing-peer-connection-receiver", + flag_descriptions::kSharingPeerConnectionReceiverName, +@@ -3910,7 +3910,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kSharingPeerConnectionSenderName, + flag_descriptions::kSharingPeerConnectionSenderDescription, kOsDesktop, + FEATURE_VALUE_TYPE(kSharingPeerConnectionSender)}, +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + {"sharing-qr-code-generator", +@@ -3985,13 +3985,13 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(printing::features::kEnableCustomMacPaperSizes)}, + #endif + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + {"enable-reopen-tab-in-product-help", + flag_descriptions::kReopenTabInProductHelpName, + flag_descriptions::kReopenTabInProductHelpDescription, kOsDesktop, + FEATURE_VALUE_TYPE(feature_engagement::kIPHReopenTabFeature)}, +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + {"enable-audio-focus-enforcement", +@@ -4436,7 +4436,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kEnableSyncUSSNigoriDescription, kOsAll, + FEATURE_VALUE_TYPE(switches::kSyncUSSNigori)}, -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - {"autofill-settings-split-by-card-type", - flag_descriptions::kAutofillSettingsSplitByCardTypeName, - flag_descriptions::kAutofillSettingsSplitByCardTypeDescription, - kOsMac | kOsWin | kOsLinux, - FEATURE_VALUE_TYPE(autofill::features::kAutofillSettingsCardTypeSplit)}, + {"global-media-controls", flag_descriptions::kGlobalMediaControlsName, + flag_descriptions::kGlobalMediaControlsDescription, + kOsWin | kOsMac | kOsLinux, +@@ -4453,7 +4453,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kGlobalMediaControlsPictureInPictureDescription, + kOsWin | kOsMac | kOsLinux | kOsCrOS, + FEATURE_VALUE_TYPE(media::kGlobalMediaControlsPictureInPicture)}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) - {"hardware-media-key-handling", + #if BUILDFLAG(ENABLE_SPELLCHECK) && defined(OS_WIN) + {"win-use-native-spellchecker", diff --git a/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc index c59df4a0b8de..fb5b5d6cd963 100644 --- a/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc +++ b/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc @@ -1,15 +1,15 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2020-03-16 18:39:43 UTC +++ chrome/browser/after_startup_task_utils.cc -@@ -29,7 +29,7 @@ - #include "content/public/browser/web_contents.h" - #include "content/public/browser/web_contents_observer.h" +@@ -33,7 +33,7 @@ + #include "chrome/browser/ui/tabs/tab_strip_model.h" + #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -115,7 +115,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue +@@ -120,7 +120,7 @@ void QueueTask(std::unique_ptr<AfterStartupTask> queue void SetBrowserStartupIsComplete() { DCHECK_CURRENTLY_ON(BrowserThread::UI); @@ -18,7 +18,7 @@ // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = base::Process::Current().CreationTime(); -@@ -123,7 +123,7 @@ void SetBrowserStartupIsComplete() { +@@ -128,7 +128,7 @@ void SetBrowserStartupIsComplete() { UMA_HISTOGRAM_LONG_TIMES("Startup.AfterStartupTaskDelayedUntilTime", base::Time::Now() - process_creation_time); } @@ -27,7 +27,7 @@ UMA_HISTOGRAM_COUNTS_10000("Startup.AfterStartupTaskCount", g_after_startup_tasks.Get().size()); g_startup_complete_flag.Get().Set(); -@@ -132,7 +132,7 @@ void SetBrowserStartupIsComplete() { +@@ -137,7 +137,7 @@ void SetBrowserStartupIsComplete() { g_after_startup_tasks.Get().clear(); g_after_startup_tasks.Get().shrink_to_fit(); diff --git a/www/iridium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc b/www/iridium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc index 882f1f84adde..7482f7147a70 100644 --- a/www/iridium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc +++ b/www/iridium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc @@ -1,4 +1,4 @@ ---- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2019-04-30 22:22:32 UTC +++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc @@ -4,6 +4,11 @@ @@ -12,7 +12,7 @@ #include <ifaddrs.h> #include <net/if.h> #include <stddef.h> -@@ -105,9 +110,36 @@ class MacAddressProcessor { +@@ -106,9 +111,36 @@ class MacAddressProcessor { const char* const prefixes[], size_t prefixes_count) { const int MAC_LENGTH = 6; @@ -49,7 +49,7 @@ strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1); int sd = socket(AF_INET, SOCK_DGRAM, 0); -@@ -119,11 +151,18 @@ class MacAddressProcessor { +@@ -120,11 +152,18 @@ class MacAddressProcessor { const char* mac_address = static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data); diff --git a/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc index 5e4fd984b04a..6c2491941fb1 100644 --- a/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc +++ b/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc @@ -1,6 +1,6 @@ ---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2019-04-10 10:50:03 UTC +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2020-04-10 00:39:09 UTC +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc -@@ -60,7 +60,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch +@@ -60,12 +60,12 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch return metrics::OmniboxInputType::QUERY; case ExternalProtocolHandler::UNKNOWN: { @@ -9,3 +9,9 @@ // Linux impl of GetApplicationNameForProtocol doesn't distinguish // between URL schemes with handers and those without. This will // make the default behaviour be search on Linux. + return metrics::OmniboxInputType::EMPTY; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + // If block state is unknown, check if there is an application registered + // for the url scheme. + GURL url(scheme + "://"); diff --git a/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc new file mode 100644 index 000000000000..3aa2fe1a3c84 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -0,0 +1,11 @@ +--- chrome/browser/background/background_mode_manager.cc.orig 2020-02-03 21:52:39 UTC ++++ chrome/browser/background/background_mode_manager.cc +@@ -797,7 +797,7 @@ gfx::ImageSkia GetStatusTrayIcon() { + return gfx::ImageSkia(); + + return family->CreateExact(size).AsImageSkia(); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed( + IDR_PRODUCT_LOGO_128); + #elif defined(OS_MACOSX) diff --git a/www/iridium/files/patch-chrome_browser_browser__resources.grd b/www/iridium/files/patch-chrome_browser_browser__resources.grd index 18889e38aa1e..021a83b1c450 100644 --- a/www/iridium/files/patch-chrome_browser_browser__resources.grd +++ b/www/iridium/files/patch-chrome_browser_browser__resources.grd @@ -1,11 +1,11 @@ ---- chrome/browser/browser_resources.grd.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/browser_resources.grd.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/browser_resources.grd -@@ -679,7 +679,7 @@ - <include name="IDR_WELCOME_WIN10_PIN_WEBP" file="resources\welcome\pin.webp" type="BINDATA" /> - </if> - <include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir="false" type="BINDATA" /> -- <if expr="is_android or is_linux"> -+ <if expr="is_android or is_posix"> - <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" /> - <include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" type="BINDATA" compress="gzip" /> +@@ -54,7 +54,7 @@ + <include name="IDR_DISCARDS_MOJO_PUBLIC_BASE_PROCESS_ID_MOJOM_LITE_JS" file="${root_gen_dir}\mojo\public\mojom\base\process_id.mojom-lite.js" compress="gzip" use_base_dir="false" type="BINDATA" /> + <include name="IDR_DISCARDS_SORTED_TABLE_BEHAVIOR_JS" file="resources\discards\sorted_table_behavior.js" compress="gzip" type="BINDATA" /> </if> +- <if expr="is_win or is_macosx or (is_linux and not chromeos)"> ++ <if expr="is_win or is_macosx or (is_posix and not chromeos)"> + <include name="IDR_BROWSER_SWITCH_APP_JS" file="${root_gen_dir}\chrome\browser\resources\browser_switch\app.js" compress="gzip" use_base_dir="false" type="BINDATA" /> + <include name="IDR_BROWSER_SWITCH_PROXY_JS" file="resources\browser_switch\browser_switch_proxy.js" compress="gzip" type="BINDATA" /> + <include name="IDR_BROWSER_SWITCH_HTML" file="resources\browser_switch\browser_switch.html" compress="gzip" allowexternalscript="true" type="BINDATA" /> diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc new file mode 100644 index 000000000000..80a27c8a8950 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -0,0 +1,20 @@ +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2020-03-17 09:35:03 UTC ++++ chrome/browser/chrome_browser_interface_binders.cc +@@ -97,7 +97,7 @@ + #include "chrome/browser/ui/webui/new_tab_page/new_tab_page_ui.h" + #endif + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + #include "chrome/browser/ui/webui/discards/discards.mojom.h" + #include "chrome/browser/ui/webui/discards/discards_ui.h" +@@ -471,7 +471,7 @@ void PopulateChromeWebUIFrameBinders( + map); + #endif + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + RegisterWebUIControllerInterfaceBinder<discards::mojom::DetailsProvider, + DiscardsUI>(map); diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc index 95d001b3ae64..51bb283f651b 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,24 +1,27 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -217,7 +217,7 @@ - #include "chromeos/settings/cros_settings_names.h" +@@ -224,9 +224,9 @@ + #include "components/arc/metrics/stability_metrics_manager.h" #endif // defined(OS_CHROMEOS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) #include "chrome/browser/first_run/upgrade_util_linux.h" - #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) -@@ -257,7 +257,7 @@ + #if defined(OS_LINUX) + #include "components/crash/content/app/breakpad_linux.h" +@@ -265,7 +265,7 @@ #endif // defined(OS_WIN) #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" + #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" #endif - -@@ -1043,7 +1043,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1068,7 +1068,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); } @@ -27,7 +30,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1052,14 +1052,14 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1077,7 +1077,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { &user_native_messaging_dir)); if (!base::PathExists(user_native_messaging_dir)) base::CreateDirectory(user_native_messaging_dir); @@ -36,33 +39,24 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) --#if defined(OS_LINUX) || defined(OS_OPENBSD) -+#if defined(OS_LINUX) - // Set the product channel for crash reports. - breakpad::SetChannelCrashKey(chrome::GetChannelName()); --#endif // defined(OS_LINUX) || defined(OS_OPENBSD) -+#endif // defined(OS_LINUX) - - #if defined(OS_MACOSX) - // Get the Keychain API to register for distributed notifications on the main -@@ -1087,7 +1087,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1116,7 +1116,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #if defined(OS_WIN) || defined(OS_MACOSX) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + (defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)) metrics::DesktopSessionDurationTracker::Initialize(); + ProfileActivityMetricsRecorder::Initialize(); #endif - metrics::RendererUptimeTracker::Initialize(); -@@ -1267,6 +1267,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { +@@ -1269,6 +1269,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::TimeDelta::FromMinutes(1)); #if !defined(OS_ANDROID) +#if !defined(OS_BSD) if (base::FeatureList::IsEnabled(features::kWebUsb)) { web_usb_detector_.reset(new WebUsbDetector()); - BrowserThread::PostAfterStartupTask( -@@ -1275,6 +1276,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { + base::PostTask( +@@ -1277,6 +1278,7 @@ void ChromeBrowserMainParts::PostBrowserStart() { base::BindOnce(&WebUsbDetector::Initialize, base::Unretained(web_usb_detector_.get()))); } diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc index 45b21faf7412..f7f343f3e0b5 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,22 +1,24 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2019-12-16 21:50:42 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -90,12 +90,14 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { +@@ -81,14 +81,16 @@ void ChromeBrowserMainPartsLinux::PreProfileInit() { void ChromeBrowserMainPartsLinux::PostProfileInit() { ChromeBrowserMainPartsPosix::PostProfileInit(); +#if !defined(OS_BSD) - g_browser_process->metrics_service()->RecordBreakpadRegistration( - breakpad::IsCrashReporterEnabled()); + bool enabled = (crash_reporter::IsCrashpadEnabled() && + crash_reporter::GetUploadsEnabled()) || + breakpad::IsCrashReporterEnabled(); + g_browser_process->metrics_service()->RecordBreakpadRegistration(enabled); +#endif } void ChromeBrowserMainPartsLinux::PostMainMessageLoopStart() { -#if !defined(OS_CHROMEOS) +#if !defined(OS_CHROMEOS) && !defined(OS_BSD) - bluez::BluezDBusThreadManager::Initialize(); - bluez::BluezDBusManager::Initialize(); + bluez::BluezDBusManager::Initialize(nullptr /* system_bus */); #endif -@@ -104,7 +106,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS + +@@ -96,7 +98,7 @@ void ChromeBrowserMainPartsLinux::PostMainMessageLoopS } void ChromeBrowserMainPartsLinux::PostDestroyThreads() { diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc index f5bb295e5563..d217745edf63 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main__posix.cc @@ -1,6 +1,15 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2019-06-04 18:55:16 UTC +++ chrome/browser/chrome_browser_main_posix.cc -@@ -142,7 +142,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS +@@ -70,7 +70,7 @@ void ExitHandler::ExitWhenPossibleOnUIThread(int signa + // ExitHandler takes care of deleting itself. + new ExitHandler(); + } else { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + switch (signal) { + case SIGINT: + case SIGHUP: +@@ -166,7 +166,7 @@ void ChromeBrowserMainPartsPosix::PostMainMessageLoopS void ChromeBrowserMainPartsPosix::ShowMissingLocaleMessageBox() { #if defined(OS_CHROMEOS) NOTREACHED(); // Should not ever happen on ChromeOS. diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc index c6392dbbb473..270f07c28cd5 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,56 +1,65 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -395,7 +395,7 @@ +@@ -390,7 +390,7 @@ + #include "components/user_manager/user.h" #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" - #include "services/ws/common/switches.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) #include "base/android/application_status_listener.h" -@@ -441,11 +441,11 @@ - #include "components/services/patch/public/interfaces/constants.mojom.h" - #endif - --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - #include "chrome/browser/webshare/share_service_impl.h" - #endif +@@ -444,7 +444,7 @@ + #endif // !defined(OS_ANDROID) --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_navigation_throttle.h" + #include "services/service_manager/sandbox/features.h" #endif -@@ -462,7 +462,7 @@ +@@ -477,7 +477,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" - #endif ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #if defined(USE_X11) + #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux_x11.h" + #else +@@ -820,11 +820,13 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHos + } + + int GetCrashSignalFD(const base::CommandLine& command_line) { ++#if !defined(OS_BSD) + if (crash_reporter::IsCrashpadEnabled()) { + int fd; + pid_t pid; + return crash_reporter::GetHandlerSocket(&fd, &pid) ? fd : -1; + } ++#endif -@@ -1144,7 +1144,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: + // Extensions have the same process type as renderers. + if (command_line.HasSwitch(extensions::switches::kExtensionProcess)) { +@@ -1269,7 +1271,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( #elif defined(OS_CHROMEOS) - main_parts = new chromeos::ChromeBrowserMainPartsChromeos( - parameters, chrome_feature_list_creator_); + main_parts = std::make_unique<chromeos::ChromeBrowserMainPartsChromeos>( + parameters, startup_data_); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) main_parts = - new ChromeBrowserMainPartsLinux(parameters, chrome_feature_list_creator_); + std::make_unique<ChromeBrowserMainPartsLinux>(parameters, startup_data_); #elif defined(OS_ANDROID) -@@ -1164,7 +1164,7 @@ content::BrowserMainParts* ChromeContentBrowserClient: - // Construct additional browser parts. Stages are called in the order in - // which they are added. +@@ -1295,7 +1297,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( + // Construct additional browser parts. Stages are called in the order in + // which they are added. #if defined(TOOLKIT_VIEWS) --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) - main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #if defined(USE_X11) + main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinuxX11()); #else - main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -1956,7 +1956,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2020,7 +2022,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } @@ -59,7 +68,16 @@ #if defined(OS_ANDROID) bool enable_crash_reporter = true; #else -@@ -3550,7 +3550,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +@@ -2288,7 +2290,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin + StackSamplingConfiguration::Get()->AppendCommandLineSwitchForChildProcess( + process_type, command_line); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Processes may only query perf_event_open with the BPF sandbox disabled. + if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && + command_line->HasSwitch(service_manager::switches::kNoSandbox)) { +@@ -3564,7 +3566,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -68,30 +86,30 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4288,7 +4288,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati - handle)); - } +@@ -3696,7 +3698,7 @@ void ChromeContentBrowserClient::BindCredentialManager + } --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) - std::unique_ptr<content::NavigationThrottle> browser_switcher_throttle = - browser_switcher::BrowserSwitcherNavigationThrottle :: -@@ -4409,7 +4409,7 @@ void ChromeContentBrowserClient::InitWebContextInterfa - #if defined(OS_ANDROID) - frame_interfaces_parameterized_->AddInterface(base::Bind( - &ForwardToJavaWebContentsRegistry<blink::mojom::ShareService>)); --#elif defined(OS_LINUX) || defined(OS_WIN) -+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - frame_interfaces_->AddInterface(base::Bind(&ShareServiceImpl::Create)); - #endif + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + bool ShouldEnableAudioSandbox(const policy::PolicyMap& policies) { + const base::Value* audio_sandbox_enabled_policy_value = + policies.GetValue(policy::key::kAudioSandboxEnabled); +@@ -3714,7 +3716,7 @@ bool ShouldEnableAudioSandbox(const policy::PolicyMap& + + void ChromeContentBrowserClient::WillStartServiceManager() { + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + if (startup_data_) { + auto* chrome_feature_list_creator = + startup_data_->chrome_feature_list_creator(); +@@ -3999,7 +4001,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati + } -@@ -5047,7 +5047,7 @@ std::unique_ptr<content::OverlayWindow> - ChromeContentBrowserClient::CreateWindowForPictureInPicture( - content::PictureInPictureWindowController* controller) { - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_CHROMEOS) -+ defined(OS_CHROMEOS) || defined(OS_BSD) - // Note: content::OverlayWindow::Create() is defined by platform-specific - // implementation in chrome/browser/ui/views. This layering hack, which goes - // through //content and ContentBrowserClient, allows us to work around the + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + MaybeAddThrottle(&throttles, + browser_switcher::BrowserSwitcherNavigationThrottle:: + MaybeCreateThrottleFor(handle)); diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h index 1a82d82e685c..c8b5fce3597e 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -363,12 +363,12 @@ class ChromeContentBrowserClient : public content::Con +@@ -364,12 +364,12 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; @@ -13,5 +13,5 @@ -#endif // defined(OS_POSIX) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) #if defined(OS_WIN) - bool PreSpawnRenderer(sandbox::TargetPolicy* policy) override; - base::string16 GetAppContainerSidForSandboxType( + bool PreSpawnRenderer(sandbox::TargetPolicy* policy, + RendererSpawnFlags flags) override; diff --git a/www/iridium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc b/www/iridium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc new file mode 100644 index 000000000000..740824d61e61 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc @@ -0,0 +1,11 @@ +--- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2019-12-31 13:55:02 UTC ++++ chrome/browser/crash_upload_list/crash_upload_list.cc +@@ -38,7 +38,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() { + // ChromeOS uses crash_sender as its uploader even when Crashpad is enabled, + // which isn't compatible with CrashUploadListCrashpad. crash_sender continues + // to log uploads in CrashUploadList::kReporterLogFilename. +-#if !defined(OS_CHROMEOS) ++#if !defined(OS_CHROMEOS) && !defined(OS_BSD) + if (crash_reporter::IsCrashpadEnabled()) { + return new CrashUploadListCrashpad(); + } diff --git a/www/iridium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc b/www/iridium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc new file mode 100644 index 000000000000..0f0d4137c678 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_crash__upload__list_crash__upload__list__crashpad.cc @@ -0,0 +1,31 @@ +--- chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc.orig 2019-12-31 13:56:21 UTC ++++ chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc +@@ -42,6 +42,9 @@ CrashUploadListCrashpad::CrashUploadListCrashpad() = d + CrashUploadListCrashpad::~CrashUploadListCrashpad() = default; + + std::vector<UploadList::UploadInfo> CrashUploadListCrashpad::LoadUploadList() { ++#if defined(OS_BSD) ++ return std::vector<UploadInfo>(); ++#else + std::vector<crash_reporter::Report> reports; + crash_reporter::GetReports(&reports); + +@@ -53,13 +56,18 @@ std::vector<UploadList::UploadInfo> CrashUploadListCra + ReportUploadStateToUploadInfoState(report.state))); + } + return uploads; ++#endif + } + + void CrashUploadListCrashpad::ClearUploadList(const base::Time& begin, + const base::Time& end) { ++#if !defined(OS_BSD) + crash_reporter::ClearReportsBetween(begin, end); ++#endif + } + + void CrashUploadListCrashpad::RequestSingleUpload(const std::string& local_id) { ++#if !defined(OS_BSD) + crash_reporter::RequestSingleCrashUpload(local_id); ++#endif + } diff --git a/www/iridium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc b/www/iridium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc index 7fcec9bf2916..b1db05585e76 100644 --- a/www/iridium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc +++ b/www/iridium/files/patch-chrome_browser_custom__handlers_protocol__handler__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2019-03-17 19:35:08 UTC +--- chrome/browser/custom_handlers/protocol_handler_registry.cc.orig 2020-02-03 21:52:39 UTC +++ chrome/browser/custom_handlers/protocol_handler_registry.cc -@@ -48,7 +48,7 @@ const ProtocolHandler& LookupHandler( +@@ -42,7 +42,7 @@ const ProtocolHandler& LookupHandler( // If true default protocol handlers will be removed if the OS level // registration for a protocol is no longer Chrome. bool ShouldRemoveHandlersNotInOS() { diff --git a/www/iridium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/iridium/files/patch-chrome_browser_dev__ui__browser__resources.grd new file mode 100644 index 000000000000..3a56c04bdb97 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_dev__ui__browser__resources.grd @@ -0,0 +1,11 @@ +--- chrome/browser/dev_ui_browser_resources.grd.orig 2020-03-17 09:36:38 UTC ++++ chrome/browser/dev_ui_browser_resources.grd +@@ -55,7 +55,7 @@ This file specifies browser resources for developer-fa + <include name="IDR_PREDICTORS_HTML" file="resources\predictors\predictors.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" /> + <include name="IDR_PREDICTORS_JS" file="resources\predictors\predictors.js" flattenhtml="true" type="BINDATA" compress="gzip" /> + +- <if expr="is_android or is_linux"> ++ <if expr="is_android or is_posix"> + <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" /> + <include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" type="BINDATA" compress="gzip" /> + </if> diff --git a/www/iridium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc b/www/iridium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc index e5313498ca62..d53ca3e6d56b 100644 --- a/www/iridium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc +++ b/www/iridium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc @@ -1,6 +1,6 @@ ---- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2020-02-03 21:53:29 UTC +++ chrome/browser/devtools/devtools_eye_dropper.cc -@@ -163,7 +163,7 @@ void DevToolsEyeDropper::UpdateCursor() { +@@ -164,7 +164,7 @@ void DevToolsEyeDropper::UpdateCursor() { // magnified projection only with centered hotspot. // Mac Retina requires cursor to be > 120px in order to render smoothly. diff --git a/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 3b529f47fd37..e44deb129a08 100644 --- a/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1231,7 +1231,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1249,7 +1249,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe target_info->is_filetype_handled_safely) DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); @@ -9,7 +9,7 @@ if (item->GetOriginalMimeType() == "application/x-x509-user-cert") DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); #endif -@@ -1251,7 +1251,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1273,7 +1273,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { diff --git a/www/iridium/files/patch-chrome_browser_download_download__commands.cc b/www/iridium/files/patch-chrome_browser_download_download__commands.cc index 3b12bd740133..7de89e40fd17 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__commands.cc @@ -1,15 +1,24 @@ ---- chrome/browser/download/download_commands.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_commands.cc.orig 2019-12-16 21:50:42 UTC +++ chrome/browser/download/download_commands.cc -@@ -158,7 +158,7 @@ Browser* DownloadCommands::GetBrowser() const { - return browser_displayer.browser(); +@@ -26,7 +26,7 @@ + #include "net/base/url_util.h" + #include "ui/base/clipboard/scoped_clipboard_writer.h" + +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + #include "chrome/browser/ui/browser.h" + #include "chrome/browser/ui/browser_finder.h" + #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" +@@ -153,7 +153,7 @@ void DownloadCommands::ExecuteCommand(Command command) + model_->ExecuteCommand(this, command); } -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - bool DownloadCommands::IsDownloadPdf() const { - base::FilePath path = model_->GetTargetFilePath(); - return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); -@@ -175,7 +175,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons + + Browser* DownloadCommands::GetBrowser() const { + chrome::ScopedTabbedBrowserDisplayer browser_displayer(model_->profile()); +@@ -176,12 +176,12 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date : true); @@ -18,3 +27,9 @@ return IsDownloadPdf(); #endif } + +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + + void DownloadCommands::CopyFileAsImageToClipboard() { + if (model_->GetState() != download::DownloadItem::COMPLETE || diff --git a/www/iridium/files/patch-chrome_browser_download_download__commands.h b/www/iridium/files/patch-chrome_browser_download_download__commands.h index ad92f02380b9..126f0123875b 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__commands.h +++ b/www/iridium/files/patch-chrome_browser_download_download__commands.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.h.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_commands.h.orig 2020-03-16 18:39:43 UTC +++ chrome/browser/download/download_commands.h -@@ -42,7 +42,7 @@ class DownloadCommands { +@@ -48,7 +48,7 @@ class DownloadCommands { bool IsCommandVisible(Command command) const; void ExecuteCommand(Command command); @@ -8,4 +8,4 @@ +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) bool IsDownloadPdf() const; bool CanOpenPdfInSystemViewer() const; - #endif + Browser* GetBrowser() const; diff --git a/www/iridium/files/patch-chrome_browser_download_download__item__model.cc b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc index 48d6fd2a1ade..4b367d9bc2e5 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_item_model.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/download/download_item_model.cc -@@ -555,7 +555,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -592,7 +592,7 @@ bool DownloadItemModel::IsCommandChecked( return download_->GetOpenWhenComplete() || download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: @@ -9,7 +9,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -592,7 +592,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -632,7 +632,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand bool is_checked = IsCommandChecked(download_commands, DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); diff --git a/www/iridium/files/patch-chrome_browser_download_download__prefs.cc b/www/iridium/files/patch-chrome_browser_download_download__prefs.cc index 2edbf1a66894..ddf30c396fc6 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_prefs.cc.orig 2020-02-03 21:52:39 UTC +++ chrome/browser/download/download_prefs.cc -@@ -62,7 +62,7 @@ namespace { +@@ -63,7 +63,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { @@ -9,7 +9,7 @@ base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -155,7 +155,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi +@@ -159,7 +159,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi GetDefaultDownloadDirectoryForProfile())); #endif // defined(OS_CHROMEOS) @@ -18,7 +18,7 @@ should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -252,7 +252,7 @@ void DownloadPrefs::RegisterProfilePrefs( +@@ -261,7 +261,7 @@ void DownloadPrefs::RegisterProfilePrefs( default_download_path); registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); @@ -27,7 +27,7 @@ registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif #if defined(OS_ANDROID) -@@ -354,7 +354,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { +@@ -360,7 +360,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { } bool DownloadPrefs::IsAutoOpenUsed() const { @@ -36,7 +36,7 @@ if (ShouldOpenPdfInSystemReader()) return true; #endif -@@ -368,7 +368,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension( +@@ -374,7 +374,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension( return false; DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); @@ -45,7 +45,7 @@ if (base::FilePath::CompareEqualIgnoreCase(extension, FILE_PATH_LITERAL("pdf")) && ShouldOpenPdfInSystemReader()) -@@ -405,7 +405,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension( +@@ -411,7 +411,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension( SaveAutoOpenState(); } @@ -54,7 +54,7 @@ void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; -@@ -426,7 +426,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -432,7 +432,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons #endif void DownloadPrefs::ResetAutoOpen() { diff --git a/www/iridium/files/patch-chrome_browser_download_download__prefs.h b/www/iridium/files/patch-chrome_browser_download_download__prefs.h index f6cc56e59c6a..702f54b47279 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__prefs.h +++ b/www/iridium/files/patch-chrome_browser_download_download__prefs.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.h.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_prefs.h.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/download/download_prefs.h -@@ -101,7 +101,7 @@ class DownloadPrefs { +@@ -102,7 +102,7 @@ class DownloadPrefs { // Disables auto-open based on file extension. void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name); @@ -9,7 +9,7 @@ // Store the user preference to disk. If |should_open| is true, also disable // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin. void SetShouldOpenPdfInSystemReader(bool should_open); -@@ -145,7 +145,7 @@ class DownloadPrefs { +@@ -150,7 +150,7 @@ class DownloadPrefs { AutoOpenCompareFunctor> AutoOpenSet; AutoOpenSet auto_open_; diff --git a/www/iridium/files/patch-chrome_browser_download_download__shelf__context__menu.cc b/www/iridium/files/patch-chrome_browser_download_download__shelf__context__menu.cc index a806727be63b..71f0ca430012 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__shelf__context__menu.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__shelf__context__menu.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_shelf_context_menu.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2020-03-16 18:39:43 UTC +++ chrome/browser/download/download_shelf_context_menu.cc -@@ -127,7 +127,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo +@@ -147,7 +147,7 @@ base::string16 DownloadShelfContextMenu::GetLabelForCo : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; break; } diff --git a/www/iridium/files/patch-chrome_browser_download_download__status__updater.cc b/www/iridium/files/patch-chrome_browser_download_download__status__updater.cc deleted file mode 100644 index 4324a56b1770..000000000000 --- a/www/iridium/files/patch-chrome_browser_download_download__status__updater.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/download/download_status_updater.cc.orig 2019-03-11 22:00:53 UTC -+++ chrome/browser/download/download_status_updater.cc -@@ -13,7 +13,7 @@ - #include "base/memory/ptr_util.h" - #include "build/build_config.h" - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - #include "ui/views/linux_ui/linux_ui.h" - #endif - -@@ -136,7 +136,7 @@ void DownloadStatusUpdater::OnDownloadUpdated(content: - #if defined(OS_ANDROID) || (defined(USE_AURA) && !defined(OS_WIN)) - void DownloadStatusUpdater::UpdateAppIconDownloadProgress( - download::DownloadItem* download) { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - const views::LinuxUI* linux_ui = views::LinuxUI::instance(); - if (linux_ui) { - float progress = 0; diff --git a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn index f975a399234e..4309d41da843 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1104,6 +1104,12 @@ jumbo_static_library("extensions") { +@@ -1175,6 +1175,12 @@ jumbo_static_library("extensions") { deps += [ "//chrome/common:service_process_mojom" ] } diff --git a/www/iridium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc b/www/iridium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc index 5ed7b851190f..9d31ad4054df 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc @@ -1,9 +1,9 @@ ---- chrome/browser/extensions/activity_log/activity_log.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/extensions/activity_log/activity_log.cc.orig 2019-12-16 21:50:42 UTC +++ chrome/browser/extensions/activity_log/activity_log.cc -@@ -52,7 +52,11 @@ +@@ -47,7 +47,11 @@ + #include "extensions/browser/extensions_browser_client.h" #include "extensions/common/extension.h" #include "extensions/common/extension_messages.h" - #include "extensions/common/one_shot_event.h" +#if defined(OS_BSD) +#include <re2/re2.h> +#else diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher.cc b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher.cc new file mode 100644 index 000000000000..591517203deb --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher.cc @@ -0,0 +1,20 @@ +--- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher.cc.orig 2020-03-17 09:37:45 UTC ++++ chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher.cc +@@ -11,7 +11,7 @@ + #include "chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_mac.h" + #elif defined(OS_WIN) + #include "chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_win.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #include "chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.h" + #endif + +@@ -58,7 +58,7 @@ std::unique_ptr<DeviceInfoFetcher> DeviceInfoFetcher:: + return std::make_unique<DeviceInfoFetcherMac>(); + #elif defined(OS_WIN) + return std::make_unique<DeviceInfoFetcherWin>(); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return std::make_unique<DeviceInfoFetcherLinux>(); + #else + return std::make_unique<StubDeviceFetcher>(); diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc new file mode 100644 index 000000000000..8620f64e57fd --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_device__info__fetcher__linux.cc @@ -0,0 +1,40 @@ +--- chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc.orig 2020-03-18 08:39:42 UTC ++++ chrome/browser/extensions/api/enterprise_reporting_private/device_info_fetcher_linux.cc +@@ -8,7 +8,9 @@ + #include <gio/gio.h> + #endif // defined(USE_GIO) + #include <sys/stat.h> ++#if !defined(OS_BSD) + #include <sys/sysmacros.h> ++#endif + + #include <string> + +@@ -90,6 +92,7 @@ enterprise_reporting_private::SettingValue GetScreenlo + // Implements the logic from the native host installation script. First find the + // root device identifier, then locate its parent and get its type. + enterprise_reporting_private::SettingValue GetDiskEncrypted() { ++#if !defined(OS_BSD) + struct stat info; + // First figure out the device identifier. + stat("/", &info); +@@ -109,6 +112,7 @@ enterprise_reporting_private::SettingValue GetDiskEncr + return is_encrypted ? enterprise_reporting_private::SETTING_VALUE_ENABLED + : enterprise_reporting_private::SETTING_VALUE_DISABLED; + } ++#endif + return enterprise_reporting_private::SETTING_VALUE_UNKNOWN; + } + +@@ -120,7 +124,11 @@ DeviceInfoFetcherLinux::~DeviceInfoFetcherLinux() = de + + DeviceInfo DeviceInfoFetcherLinux::Fetch() { + DeviceInfo device_info; ++#if defined(OS_FREEBSD) ++ device_info.os_name = "freebsd"; ++#else + device_info.os_name = "linux"; ++#endif + device_info.os_version = GetOsVersion(); + device_info.device_host_name = GetDeviceHostName(); + device_info.device_model = GetDeviceModel(); diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc b/www/iridium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc new file mode 100644 index 000000000000..8a3736baf4ee --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_extensions_api_erp_chrome_desktop_report_request_helper.cc @@ -0,0 +1,29 @@ +--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2020-04-03 04:11:29 UTC ++++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc +@@ -39,7 +39,7 @@ + #include "base/win/registry.h" + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/environment.h" + #include "base/nix/xdg_util.h" + #endif +@@ -382,7 +382,7 @@ base::FilePath GetEndpointVerificationDir() { + return *GetEndpointVerificationDirOverride(); + #if defined(OS_WIN) + if (!base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path)) +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + std::unique_ptr<base::Environment> env(base::Environment::Create()); + path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar, + base::nix::kDotConfigDir); +@@ -393,7 +393,7 @@ base::FilePath GetEndpointVerificationDir() { + if (true) + #endif + return path; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + path = path.AppendASCII("google"); + #else + path = path.AppendASCII("Google"); diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc b/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc index 556750be0ff6..0b5c1a821007 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2019-04-30 22:22:33 UTC +++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc -@@ -20,6 +20,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL +@@ -21,6 +21,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -8,7 +8,7 @@ if (g_test_device_list.Get().get() != nullptr) { base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, -@@ -33,6 +34,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis +@@ -34,6 +35,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}, base::BindOnce(&RemovableStorageProvider::PopulateDeviceList), std::move(callback)); diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc b/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc index 8a6dfbb8c87b..d8b93a7a1069 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_runtime_chrome__runtime__api__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2019-04-30 22:22:33 UTC +++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc -@@ -296,6 +296,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor +@@ -299,6 +299,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor info->os = extensions::api::runtime::PLATFORM_OS_CROS; } else if (strcmp(os, "linux") == 0) { info->os = extensions::api::runtime::PLATFORM_OS_LINUX; diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index bf8482ac98e5..40176332dcff 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,15 +1,15 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -127,7 +127,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist - settings_api::PrefType::PREF_TYPE_BOOLEAN; +@@ -160,7 +160,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist (*s_whitelist)[bookmarks::prefs::kShowBookmarkBar] = settings_api::PrefType::PREF_TYPE_BOOLEAN; + -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) (*s_whitelist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -137,7 +137,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist +@@ -170,7 +170,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetWhitelist // Appearance settings. (*s_whitelist)[::prefs::kCurrentThemeID] = settings_api::PrefType::PREF_TYPE_STRING; diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc new file mode 100644 index 000000000000..7440fdc3cc94 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc @@ -0,0 +1,43 @@ +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2019-10-21 19:06:21 UTC ++++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc +@@ -29,7 +29,7 @@ + #include "extensions/browser/process_manager.h" + #include "extensions/common/error_utils.h" + +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #include "extensions/common/permissions/permissions_data.h" + #endif + +@@ -38,7 +38,7 @@ namespace { + bool CanEnableAudioDebugRecordingsFromExtension( + const extensions::Extension* extension) { + bool enabled_by_permissions = false; +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + if (extension) { + enabled_by_permissions = + extension->permissions_data()->active_permissions().HasAPIPermission( +@@ -557,7 +557,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi + } + + bool WebrtcLoggingPrivateGetLogsDirectoryFunction::RunAsync() { +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Unlike other WebrtcLoggingPrivate functions that take a RequestInfo object, + // this function shouldn't be called by a component extension on behalf of + // some web code. It returns a DirectoryEntry for use directly in the calling +@@ -580,11 +580,11 @@ bool WebrtcLoggingPrivateGetLogsDirectoryFunction::Run + &WebrtcLoggingPrivateGetLogsDirectoryFunction::FireErrorCallback, + this)); + return true; +-#else // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#else // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + SetError("Not supported on the current OS"); + SendResponse(false); + return false; +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + } + + void WebrtcLoggingPrivateGetLogsDirectoryFunction::FireCallback( diff --git a/www/iridium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc b/www/iridium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc deleted file mode 100644 index 2f5e80399717..000000000000 --- a/www/iridium/files/patch-chrome_browser_extensions_bookmark__app__helper.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/extensions/bookmark_app_helper.cc.orig 2019-03-11 22:00:53 UTC -+++ chrome/browser/extensions/bookmark_app_helper.cc -@@ -503,7 +503,7 @@ void BookmarkAppHelper::FinishInstallation(const Exten - if (create_shortcuts_) { - #if !defined(OS_CHROMEOS) - web_app::ShortcutLocations creation_locations; --#if defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - creation_locations.on_desktop = true; - #else - creation_locations.on_desktop = false; diff --git a/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc index 64894bbb4afd..fbddcf6c422b 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc @@ -1,20 +1,20 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2020-02-03 21:52:39 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc -@@ -54,7 +54,7 @@ - #include "chrome/browser/chromeos/extensions/input_method_api.h" - #include "chrome/browser/chromeos/extensions/media_player_api.h" - #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" --#elif defined(OS_LINUX) || defined(OS_WIN) -+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +@@ -52,7 +52,7 @@ + #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" + #include "ppapi/buildflags/buildflags.h" + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" #endif -@@ -93,7 +93,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() - #if defined(OS_CHROMEOS) - extensions::InputImeAPI::GetFactoryInstance(); - extensions::InputMethodAPI::GetFactoryInstance(); --#elif defined(OS_LINUX) || defined(OS_WIN) -+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) +@@ -88,7 +88,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() + extensions::IdentityAPI::GetFactoryInstance(); + extensions::InstallTrackerFactory::GetInstance(); + extensions::InstallVerifierFactory::GetInstance(); +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) extensions::InputImeAPI::GetFactoryInstance(); #endif extensions::LanguageSettingsPrivateDelegateFactory::GetInstance(); diff --git a/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc index 32893bff716f..8c813c1db5c8 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc @@ -1,20 +1,20 @@ ---- chrome/browser/extensions/external_provider_impl.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/extensions/external_provider_impl.cc.orig 2020-03-16 18:39:44 UTC +++ chrome/browser/extensions/external_provider_impl.cc -@@ -747,7 +747,7 @@ void ExternalProviderImpl::CreateExternalProviders( - chromeos::DemoSession::Get()->SetExtensionsExternalLoader(loader); - provider_list->push_back(std::move(demo_apps_provider)); +@@ -760,7 +760,7 @@ void ExternalProviderImpl::CreateExternalProviders( } --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - provider_list->push_back(std::make_unique<ExternalProviderImpl>( - service, - new ExternalPrefLoader(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, -@@ -774,7 +774,7 @@ void ExternalProviderImpl::CreateExternalProviders( - bundled_extension_creation_flags)); - - // Define a per-user source of external extensions. --#if defined(OS_MACOSX) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) -+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) + #endif + if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) provider_list->push_back(std::make_unique<ExternalProviderImpl>( service, - new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS, + base::MakeRefCounted<ExternalPrefLoader>( +@@ -787,7 +787,7 @@ void ExternalProviderImpl::CreateExternalProviders( + bundled_extension_creation_flags)); + + // Define a per-user source of external extensions. +-#if defined(OS_MACOSX) || (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) ++#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) + provider_list->push_back(std::make_unique<ExternalProviderImpl>( + service, + base::MakeRefCounted<ExternalPrefLoader>( diff --git a/www/iridium/files/patch-chrome_browser_extensions_install__signer.cc b/www/iridium/files/patch-chrome_browser_extensions_install__signer.cc index d64e09197a3f..831136e37584 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_install__signer.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_install__signer.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/install_signer.cc.orig 2019-03-17 20:14:24 UTC +--- chrome/browser/extensions/install_signer.cc.orig 2020-03-16 18:39:44 UTC +++ chrome/browser/extensions/install_signer.cc -@@ -293,13 +293,13 @@ void LogRequestStartHistograms() { +@@ -294,13 +294,13 @@ void LogRequestStartHistograms() { DCHECK(g_single_thread_checker.Get().CalledOnValidThread()); // Process::Current().CreationTime is only defined on some platforms. diff --git a/www/iridium/files/patch-chrome_browser_first__run_first__run__dialog.h b/www/iridium/files/patch-chrome_browser_first__run_first__run__dialog.h new file mode 100644 index 000000000000..c079a7eac3e3 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_first__run_first__run__dialog.h @@ -0,0 +1,11 @@ +--- chrome/browser/first_run/first_run_dialog.h.orig 2019-07-29 18:50:26 UTC ++++ chrome/browser/first_run/first_run_dialog.h +@@ -9,7 +9,7 @@ + #include "build/build_config.h" + + // Hide this function on platforms where the dialog does not exist. +-#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + class Profile; + diff --git a/www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h b/www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h new file mode 100644 index 000000000000..5b60fc717be9 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h @@ -0,0 +1,18 @@ +--- chrome/browser/first_run/first_run_internal.h.orig 2019-07-29 18:50:45 UTC ++++ chrome/browser/first_run/first_run_internal.h +@@ -64,13 +64,13 @@ FirstRunState DetermineFirstRunState(bool has_sentinel + bool force_first_run, + bool no_first_run); + +-#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // For testing, forces the first run dialog to either be shown or not. If not + // called, the decision to show the dialog or not will be made by Chrome based + // on a number of factors (such as install type, whether it's a Chrome-branded + // build, etc). + void ForceFirstRunDialogShownForTesting(bool shown); +-#endif // defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#endif // defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + } // namespace internal + } // namespace first_run diff --git a/www/iridium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc b/www/iridium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc index 78e9b44d55f1..1a28c1282fc1 100644 --- a/www/iridium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc +++ b/www/iridium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/first_run/first_run_internal_posix.cc.orig 2019-04-10 10:50:05 UTC +--- chrome/browser/first_run/first_run_internal_posix.cc.orig 2020-04-10 00:39:11 UTC +++ chrome/browser/first_run/first_run_internal_posix.cc -@@ -45,7 +45,7 @@ enum class ForcedShowDialogState { +@@ -46,7 +46,7 @@ enum class ForcedShowDialogState { ForcedShowDialogState g_forced_show_dialog_state = ForcedShowDialogState::kNotForced; @@ -9,7 +9,7 @@ // Returns whether the first run dialog should be shown. This is only true for // certain builds, and only if the user has not already set preferences. In a // real, official-build first run, initializes the default metrics reporting if -@@ -99,7 +99,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) { +@@ -100,7 +100,7 @@ void ForceFirstRunDialogShownForTesting(bool shown) { } void DoPostImportPlatformSpecificTasks(Profile* profile) { diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc index e7c43ca364b8..1a6b198aa788 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,24 +1,55 @@ ---- chrome/browser/flag_descriptions.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/flag_descriptions.cc.orig 2020-04-10 00:39:02 UTC +++ chrome/browser/flag_descriptions.cc -@@ -3656,13 +3656,13 @@ const char kWakeOnPacketsDescription[] = +@@ -3651,7 +3651,7 @@ const char kZeroStateFilesDescription[] = + + #endif // defined(OS_CHROMEOS) + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + + #if BUILDFLAG(USE_TCMALLOC) + const char kDynamicTcmallocName[] = "Dynamic Tcmalloc Tuning"; +@@ -3660,7 +3660,7 @@ const char kDynamicTcmallocDescription[] = + "utilization."; + #endif // BUILDFLAG(USE_TCMALLOC) + +-#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + + // All views-based platforms -------------------------------------------------- + +@@ -3685,13 +3685,13 @@ const char kReopenTabInProductHelpDescription[] = // Random platform combinations ----------------------------------------------- --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + const char kWebGL2ComputeContextName[] = "WebGL 2.0 Compute"; + const char kWebGL2ComputeContextDescription[] = + "Enable the use of WebGL 2.0 Compute API."; + +-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if BUILDFLAG(ENABLE_CLICK_TO_CALL) - const char kEnableInputImeApiName[] = "Enable Input IME API"; - const char kEnableInputImeApiDescription[] = - "Enable the use of chrome.input.ime API."; +@@ -3708,7 +3708,7 @@ const char kClickToCallDetectionV2Description[] = --#endif // defined(OS_WIN) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) - #if defined(OS_WIN) || defined(OS_MACOSX) +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) -@@ -3675,13 +3675,13 @@ const char kAutomaticTabDiscardingDescription[] = + const char kRemoteCopyReceiverName[] = +@@ -3717,16 +3717,16 @@ const char kRemoteCopyReceiverDescription[] = + "Enables the remote copy feature to handle messages by writing content to " + "the clipboard and showing a notification to the user."; - #endif // defined(OS_WIN) || defined(OS_MACOSX) +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) @@ -30,5 +61,5 @@ -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - #if defined(OS_MACOSX) || defined(OS_CHROMEOS) + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.h b/www/iridium/files/patch-chrome_browser_flag__descriptions.h index 19e70914fb72..ad2ca09a3baa 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.h @@ -1,23 +1,63 @@ ---- chrome/browser/flag_descriptions.h.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/flag_descriptions.h.orig 2020-04-10 00:39:02 UTC +++ chrome/browser/flag_descriptions.h -@@ -2192,12 +2192,12 @@ extern const char kWakeOnPacketsDescription[]; +@@ -21,9 +21,9 @@ + #include "ui/android/buildflags.h" + #endif // defined(OS_ANDROID) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/allocator/buildflags.h" +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // This file declares strings used in chrome://flags. These messages are not + // translated, because instead of end-users they target Chromium developers and +@@ -2132,14 +2132,14 @@ extern const char kZeroStateFilesDescription[]; + + #endif // #if defined(OS_CHROMEOS) + +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + + #if BUILDFLAG(USE_TCMALLOC) + extern const char kDynamicTcmallocName[]; + extern const char kDynamicTcmallocDescription[]; + #endif // BUILDFLAG(USE_TCMALLOC) + +-#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#endif // #if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + + // All views-based platforms -------------------------------------------------- + +@@ -2158,12 +2158,12 @@ extern const char kReopenTabInProductHelpDescription[] // Random platform combinations ----------------------------------------------- --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + extern const char kWebGL2ComputeContextName[]; + extern const char kWebGL2ComputeContextDescription[]; + +-#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if BUILDFLAG(ENABLE_CLICK_TO_CALL) + +@@ -2175,21 +2175,21 @@ extern const char kClickToCallDetectionV2Description[] - extern const char kEnableInputImeApiName[]; - extern const char kEnableInputImeApiDescription[]; + #endif // BUILDFLAG(ENABLE_CLICK_TO_CALL) --#endif // defined(OS_WIN) || defined(OS_LINUX) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) - extern const char kExperimentalUiName[]; - extern const char kExperimentalUiDescription[]; -@@ -2209,12 +2209,12 @@ extern const char kAutomaticTabDiscardingDescription[] + extern const char kRemoteCopyReceiverName[]; + extern const char kRemoteCopyReceiverDescription[]; - #endif // defined(OS_WIN) || defined(OS_MACOSX) +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) @@ -28,5 +68,5 @@ -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - #if defined(OS_MACOSX) || defined(OS_CHROMEOS) + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc b/www/iridium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc index d2e3a19c974f..93a3d5742fd1 100644 --- a/www/iridium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc +++ b/www/iridium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2019-04-30 22:22:34 UTC +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc -@@ -38,10 +38,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem( +@@ -39,10 +39,12 @@ void MTPDeviceMapService::RegisterMTPFileSystem( // Note that this initializes the delegate asynchronously, but since // the delegate will only be used from the IO thread, it is guaranteed // to be created before use of it expects it to be there. diff --git a/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc index 4b9563aa1359..922d7c8beb61 100644 --- a/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc +++ b/www/iridium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2019-04-30 22:22:34 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -734,7 +734,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI +@@ -732,7 +732,10 @@ class MediaFileSystemRegistry::MediaFileSystemContextI // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { diff --git a/www/iridium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc b/www/iridium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc index 1c9e21e9cfb2..9b007ae67c87 100644 --- a/www/iridium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc +++ b/www/iridium/files/patch-chrome_browser_media_router_providers_wired__display_wired__display__media__route__provider.cc @@ -1,19 +1,19 @@ ---- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc.orig 2019-09-09 21:55:09 UTC +++ chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc -@@ -111,6 +111,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute( +@@ -112,6 +112,12 @@ void WiredDisplayMediaRouteProvider::CreateRoute( bool incognito, CreateRouteCallback callback) { - DCHECK(!base::ContainsKey(presentations_, presentation_id)); -+#if defined(OS_BSD) // XXX -+ std::move(callback).Run(base::nullopt, nullptr, -+ std::string("Not implemented"), -+ RouteRequestResult::UNKNOWN_ERROR); -+ return; + DCHECK(!base::Contains(presentations_, presentation_id)); ++#if defined(OS_BSD) ++ std::move(callback).Run(base::nullopt, nullptr, ++ std::string("Not implemented"), ++ RouteRequestResult::UNKNOWN_ERROR); ++ return; +#else base::Optional<Display> display = GetDisplayBySinkId(sink_id); if (!display) { std::move(callback).Run(base::nullopt, nullptr, -@@ -137,6 +143,7 @@ void WiredDisplayMediaRouteProvider::CreateRoute( +@@ -138,6 +144,7 @@ void WiredDisplayMediaRouteProvider::CreateRoute( std::move(callback).Run(route, nullptr, base::nullopt, RouteRequestResult::OK); NotifyRouteObservers(); diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc index 08060b059bc0..76fb8bab73c0 100644 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2020-02-03 21:52:40 UTC +++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -@@ -36,7 +36,7 @@ constexpr size_t kExpectedMimeOverheadBytes = 1000; / +@@ -38,7 +38,7 @@ constexpr size_t kExpectedMimeOverheadBytes = 1000; / const char kProduct[] = "Chrome"; #elif defined(OS_MACOSX) const char kProduct[] = "Chrome_Mac"; diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc index c73fdba76494..c1ca8fcabf4e 100644 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -391,6 +391,8 @@ void WebRtcLogUploader::SetupMultipart( +@@ -358,6 +358,8 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_Android"; #elif defined(OS_CHROMEOS) const char product[] = "Chrome_ChromeOS"; diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc index b6a806a8fb58..981d24078676 100644 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.cc +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc @@ -1,33 +1,33 @@ ---- chrome/browser/media/webrtc/webrtc_logging_handler_host.cc.orig 2019-03-17 20:01:28 UTC -+++ chrome/browser/media/webrtc/webrtc_logging_handler_host.cc -@@ -26,10 +26,10 @@ - #include "content/public/browser/content_browser_client.h" +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2020-03-16 18:39:44 UTC ++++ chrome/browser/media/webrtc/webrtc_logging_controller.cc +@@ -24,10 +24,10 @@ #include "content/public/browser/render_process_host.h" + #include "services/service_manager/public/cpp/connector.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "content/public/browser/child_process_security_policy.h" - #include "storage/browser/fileapi/isolated_context.h" + #include "storage/browser/file_system/isolated_context.h" -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - using content::BrowserThread; using webrtc_event_logging::WebRtcEventLogManager; -@@ -281,7 +281,7 @@ void WebRtcLoggingHandlerHost::StartEventLogging( - output_period_ms, web_app_id, callback); + +@@ -270,7 +270,7 @@ void WebRtcLoggingController::StartEventLogging( + web_app_id, callback); } -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - void WebRtcLoggingHandlerHost::GetLogsDirectory( + void WebRtcLoggingController::GetLogsDirectory( const LogsDirectoryCallback& callback, const LogsDirectoryErrorCallback& error_callback) { -@@ -327,7 +327,7 @@ void WebRtcLoggingHandlerHost::GrantLogsDirectoryAcces - FROM_HERE, {BrowserThread::UI}, - base::BindOnce(callback, filesystem_id, registered_name)); +@@ -315,7 +315,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess + base::SequencedTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::BindOnce(callback, file_system.id(), registered_name)); } -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - void WebRtcLoggingHandlerHost::OnRtpPacket( + void WebRtcLoggingController::OnRtpPacket( std::unique_ptr<uint8_t[]> packet_header, diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.h b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h index 30fe4a793160..e3ef33fc829f 100644 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__handler__host.h +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_logging_handler_host.h.orig 2019-03-17 20:00:30 UTC -+++ chrome/browser/media/webrtc/webrtc_logging_handler_host.h -@@ -154,13 +154,13 @@ class WebRtcLoggingHandlerHost : public content::Brows +--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2019-10-30 15:50:11 UTC ++++ chrome/browser/media/webrtc/webrtc_logging_controller.h +@@ -129,13 +129,13 @@ class WebRtcLoggingController size_t web_app_id, const StartEventLoggingCallback& callback); @@ -14,9 +14,9 @@ -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - private: - friend class content::BrowserThread; -@@ -227,7 +227,7 @@ class WebRtcLoggingHandlerHost : public content::Brows + // chrome::mojom::WebRtcLoggingClient methods: + void OnAddMessages( +@@ -188,7 +188,7 @@ class WebRtcLoggingController bool success, const std::string& error_message); @@ -25,12 +25,12 @@ // Grants the render process access to the 'WebRTC Logs' directory, and // invokes |callback| with the ids necessary to create a DirectoryEntry // object. If the |logs_path| couldn't be created or found, |error_callback| -@@ -236,7 +236,7 @@ class WebRtcLoggingHandlerHost : public content::Brows +@@ -197,7 +197,7 @@ class WebRtcLoggingController const LogsDirectoryCallback& callback, const LogsDirectoryErrorCallback& error_callback, const base::FilePath& logs_path); -#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) +#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - // The render process ID this object belongs to. - const int render_process_id_; + static base::FilePath GetLogDirectoryAndEnsureExists( + const base::FilePath& browser_context_directory_path); diff --git a/www/iridium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc b/www/iridium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc index ab487829a64c..3bb3c96f9188 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_bluetooth__available__utility.cc @@ -1,8 +1,8 @@ ---- chrome/browser/metrics/bluetooth_available_utility.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/metrics/bluetooth_available_utility.cc.orig 2019-06-04 18:55:17 UTC +++ chrome/browser/metrics/bluetooth_available_utility.cc -@@ -72,8 +72,10 @@ void ReportBluetoothAvailability() { - if (!device::BluetoothAdapterFactory::Get().IsBluetoothSupported()) - ReportAvailability(BLUETOOTH_NOT_SUPPORTED); +@@ -76,8 +76,10 @@ void ReportBluetoothAvailability() { + return; + } +#if !defined(OS_BSD) device::BluetoothAdapterFactory::Get().GetAdapter( diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index bb0ba23c9542..dd487ab9da88 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2019-09-09 21:55:09 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -44,7 +44,9 @@ +@@ -47,7 +47,9 @@ #if defined(OS_LINUX) && !defined(OS_CHROMEOS) #include <gnu/libc-version.h> @@ -10,7 +10,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -@@ -52,7 +54,7 @@ +@@ -55,7 +57,7 @@ #if defined(USE_X11) #include "ui/base/x/x11_util.h" #endif @@ -18,4 +18,4 @@ +#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #if defined(USE_OZONE) || defined(USE_X11) - #include "ui/events/devices/input_device_event_observer.h" + #include "ui/events/devices/device_data_manager.h" diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc new file mode 100644 index 000000000000..a1c3fbc542a8 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -0,0 +1,25 @@ +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2020-03-16 18:40:29 UTC ++++ chrome/browser/metrics/chrome_metrics_service_client.cc +@@ -718,11 +718,11 @@ void ChromeMetricsServiceClient::RegisterMetricsServic + #endif // defined(OS_WIN) + + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + metrics_service_->RegisterMetricsProvider( + std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); + #endif // defined(OS_WIN) || defined(OS_MACOSX) || \ +- // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + #if BUILDFLAG(ENABLE_PLUGINS) + plugin_metrics_provider_ = new PluginMetricsProvider(local_state); +@@ -980,7 +980,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve + } + #endif + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // This creates the DesktopProfileSessionDurationsServices if it didn't exist + // already. + metrics::DesktopProfileSessionDurationsServiceFactory::GetForBrowserContext( diff --git a/www/iridium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc b/www/iridium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc new file mode 100644 index 000000000000..7994a85f8cec --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_metrics_process__memory__metrics__emitter.cc @@ -0,0 +1,20 @@ +--- chrome/browser/metrics/process_memory_metrics_emitter.cc.orig 2020-03-16 18:40:29 UTC ++++ chrome/browser/metrics/process_memory_metrics_emitter.cc +@@ -438,7 +438,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc + + builder->SetPrivateMemoryFootprint(pmd.os_dump().private_footprint_kb / 1024); + builder->SetSharedMemoryFootprint(pmd.os_dump().shared_footprint_kb / 1024); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + builder->SetPrivateSwapFootprint(pmd.os_dump().private_footprint_swap_kb / + 1024); + #endif +@@ -461,7 +461,7 @@ void EmitProcessUmaAndUkm(const GlobalMemoryDump::Proc + MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) + + process_name + ".SharedMemoryFootprint", + pmd.os_dump().shared_footprint_kb / 1024); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + MEMORY_METRICS_HISTOGRAM_MB(std::string(kMemoryHistogramPrefix) + + process_name + ".PrivateSwapFootprint", + pmd.os_dump().private_footprint_swap_kb / 1024); diff --git a/www/iridium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc b/www/iridium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc new file mode 100644 index 000000000000..21db21328ad3 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_native__file__system_chrome__native__file__system__permission__context.cc @@ -0,0 +1,11 @@ +--- chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc.orig 2020-03-16 18:40:29 UTC ++++ chrome/browser/native_file_system/chrome_native_file_system_permission_context.cc +@@ -144,7 +144,7 @@ const struct { + {base::DIR_APP_DATA, nullptr, true}, + {base::DIR_HOME, FILE_PATH_LITERAL("Library"), true}, + #endif +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On Linux also block access to devices via /dev, as well as security + // sensitive data in /sys and /proc. + {kNoBasePathKey, FILE_PATH_LITERAL("/dev"), true}, diff --git a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc index dc2669b3a0cb..aace9f122f49 100644 --- a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,23 +1,61 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -69,12 +69,12 @@ +@@ -79,11 +79,11 @@ #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #endif // defined(OS_CHROMEOS) -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/common/chrome_paths_internal.h" - #include "chrome/common/chrome_switches.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + #if defined(OS_WIN) || defined(OS_MACOSX) + #include "content/public/common/network_service_util.h" +@@ -160,10 +160,10 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut + auth_dynamic_params->enable_negotiate_port = + local_state->GetBoolean(prefs::kEnableAuthNegotiatePort); + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + auth_dynamic_params->delegate_by_kdc_policy = + local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if defined(OS_POSIX) + auth_dynamic_params->ntlm_v2_enabled = +@@ -429,10 +429,10 @@ SystemNetworkContextManager::SystemNetworkContextManag + pref_change_registrar_.Add(prefs::kEnableAuthNegotiatePort, + auth_pref_callback); + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, + auth_pref_callback); +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) - namespace { + #if defined(OS_POSIX) + pref_change_registrar_.Add(prefs::kNtlmV2Enabled, auth_pref_callback); +@@ -485,10 +485,10 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe + registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); + registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, + std::string()); +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, + false); +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) -@@ -519,7 +519,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea - content::GetNetworkService()->ConfigureStubHostResolver( - stub_resolver_enabled, std::move(dns_over_https_servers)); + #if defined(OS_POSIX) + registry->RegisterBooleanPref( +@@ -610,7 +610,7 @@ void SystemNetworkContextManager::OnNetworkServiceCrea + insecure_stub_resolver_enabled, secure_dns_mode, + std::move(dns_over_https_servers)); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc b/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc new file mode 100644 index 000000000000..7688028b44a2 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc @@ -0,0 +1,20 @@ +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2020-03-16 18:40:29 UTC ++++ chrome/browser/notifications/notification_display_service_impl.cc +@@ -33,7 +33,7 @@ + #include "chrome/browser/notifications/notification_platform_bridge_message_center.h" + #endif + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" + #endif + +@@ -122,7 +122,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer + AddNotificationHandler(NotificationHandler::Type::WEB_PERSISTENT, + std::make_unique<PersistentNotificationHandler>()); + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + AddNotificationHandler( + NotificationHandler::Type::SEND_TAB_TO_SELF, + std::make_unique<send_tab_to_self::DesktopNotificationHandler>( diff --git a/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc index 970ace424458..b9786e7622f2 100644 --- a/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc +++ b/www/iridium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc @@ -1,8 +1,8 @@ ---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/password_manager/chrome_password_manager_client.cc -@@ -80,7 +80,11 @@ +@@ -88,7 +88,11 @@ + #include "net/base/url_util.h" #include "net/cert/cert_status_flags.h" - #include "services/identity/public/cpp/identity_manager.h" #include "services/metrics/public/cpp/ukm_recorder.h" +#if defined(OS_BSD) +#include <re2/re2.h> @@ -11,4 +11,4 @@ +#endif #include "url/url_constants.h" - #if defined(SAFE_BROWSING_DB_LOCAL) + #if BUILDFLAG(FULL_SAFE_BROWSING) diff --git a/www/iridium/files/patch-chrome_browser_password__manager_password__store__factory.cc b/www/iridium/files/patch-chrome_browser_password__manager_password__store__factory.cc index fe2ef21d5d65..889049cf9109 100644 --- a/www/iridium/files/patch-chrome_browser_password__manager_password__store__factory.cc +++ b/www/iridium/files/patch-chrome_browser_password__manager_password__store__factory.cc @@ -1,11 +1,11 @@ ---- chrome/browser/password_manager/password_store_factory.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/password_manager/password_store_factory.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/password_manager/password_store_factory.cc -@@ -300,7 +300,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( - password_manager_util::RemoveUselessCredentials(ps, profile->GetPrefs(), 60, - network_context_getter); +@@ -181,7 +181,7 @@ PasswordStoreFactory::BuildServiceInstanceFor( + base::TimeDelta::FromSeconds(20)); --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) std::unique_ptr<password_manager::PasswordStoreSigninNotifier> notifier = std::make_unique<password_manager::PasswordStoreSigninNotifierImpl>( + IdentityManagerFactory::GetForProfile(profile)); diff --git a/www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc b/www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc new file mode 100644 index 000000000000..98bd40401783 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__history.cc @@ -0,0 +1,38 @@ +--- chrome/browser/performance_monitor/process_metrics_history.cc.orig 2019-10-21 19:06:22 UTC ++++ chrome/browser/performance_monitor/process_metrics_history.cc +@@ -47,7 +47,7 @@ void ProcessMetricsHistory::SampleMetrics() { + #if defined(OS_WIN) + disk_usage_ = process_metrics_->GetDiskUsageBytesPerSecond(); + #endif +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + idle_wakeups_ = process_metrics_->GetIdleWakeupsPerSecond(); + #endif + #if defined(OS_MACOSX) +@@ -88,7 +88,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { + kDiskUsageHistogramMin, kDiskUsageHistogramMax, + kDiskUsageHistogramBucketCount); + #endif +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + UMA_HISTOGRAM_COUNTS_10000( + "PerformanceMonitor.IdleWakeups.BrowserProcess", idle_wakeups_); + #endif +@@ -109,7 +109,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { + UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.RendererProcess", + true); + } +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + UMA_HISTOGRAM_COUNTS_10000( + "PerformanceMonitor.IdleWakeups.RendererProcess", idle_wakeups_); + #endif +@@ -129,7 +129,7 @@ void ProcessMetricsHistory::RunPerformanceTriggers() { + kHistogramBucketCount); + if (cpu_usage_ > kHighCPUUtilizationThreshold) + UMA_HISTOGRAM_BOOLEAN("PerformanceMonitor.HighCPU.GPUProcess", true); +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + UMA_HISTOGRAM_COUNTS_10000("PerformanceMonitor.IdleWakeups.GPUProcess", + idle_wakeups_); + #endif diff --git a/www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h b/www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h new file mode 100644 index 000000000000..cb195b6b0cf5 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__history.h @@ -0,0 +1,11 @@ +--- chrome/browser/performance_monitor/process_metrics_history.h.orig 2019-06-04 18:55:17 UTC ++++ chrome/browser/performance_monitor/process_metrics_history.h +@@ -72,7 +72,7 @@ class ProcessMetricsHistory { + uint64_t disk_usage_ = 0; + #endif + +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + int idle_wakeups_ = 0; + #endif + #if defined(OS_MACOSX) diff --git a/www/iridium/files/patch-chrome_browser_platform__util.h b/www/iridium/files/patch-chrome_browser_platform__util.h deleted file mode 100644 index f5660041edd8..000000000000 --- a/www/iridium/files/patch-chrome_browser_platform__util.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/platform_util.h.orig 2019-03-11 22:00:53 UTC -+++ chrome/browser/platform_util.h -@@ -40,7 +40,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/iridium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc b/www/iridium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc new file mode 100644 index 000000000000..c45a5b0d8d92 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_plugins_plugin__info__host__impl.cc @@ -0,0 +1,11 @@ +--- chrome/browser/plugins/plugin_info_host_impl.cc.orig 2020-02-03 21:52:40 UTC ++++ chrome/browser/plugins/plugin_info_host_impl.cc +@@ -382,7 +382,7 @@ void PluginInfoHostImpl::ComponentPluginLookupDone( + std::unique_ptr<component_updater::ComponentInfo> cus_plugin_info) { + if (cus_plugin_info) { + output->status = chrome::mojom::PluginStatus::kComponentUpdateRequired; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (cus_plugin_info->version != base::Version("0")) { + output->status = chrome::mojom::PluginStatus::kRestartRequired; + } diff --git a/www/iridium/files/patch-chrome_browser_plugins_plugins__resource__service.cc b/www/iridium/files/patch-chrome_browser_plugins_plugins__resource__service.cc index 88dec33a15e3..35342997a152 100644 --- a/www/iridium/files/patch-chrome_browser_plugins_plugins__resource__service.cc +++ b/www/iridium/files/patch-chrome_browser_plugins_plugins__resource__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/plugins/plugins_resource_service.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/plugins/plugins_resource_service.cc.orig 2020-02-03 21:52:40 UTC +++ chrome/browser/plugins/plugins_resource_service.cc -@@ -63,7 +63,7 @@ GURL GetPluginsServerURL() { +@@ -62,7 +62,7 @@ GURL GetPluginsServerURL() { filename = "plugins_win.json"; #elif defined(OS_CHROMEOS) filename = "plugins_chromeos.json"; diff --git a/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc b/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc new file mode 100644 index 000000000000..b79d0d1d66d8 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc @@ -0,0 +1,11 @@ +--- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2019-09-16 07:21:37 UTC ++++ chrome/browser/policy/browser_signin_policy_handler.cc +@@ -39,7 +39,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c + } + switch (static_cast<BrowserSigninMode>(int_value)) { + case BrowserSigninMode::kForced: +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + prefs->SetValue(prefs::kForceBrowserSignin, base::Value(true)); + #endif + FALLTHROUGH; diff --git a/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index cc7d3ae6259e..8f82b5f2a44d 100644 --- a/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,20 +1,43 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -107,7 +107,7 @@ - #include "chrome/browser/policy/browser_signin_policy_handler.h" +@@ -118,7 +118,7 @@ #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -939,7 +939,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - prefs::kEnterpriseHardwarePlatformAPIEnabled, - base::Value::Type::BOOLEAN }, --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) +@@ -355,11 +355,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + { key::kWebComponentsV0Enabled, + prefs::kWebComponentsV0Enabled, + base::Value::Type::BOOLEAN }, +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + { key::kAuthNegotiateDelegateByKdcPolicy, + prefs::kAuthNegotiateDelegateByKdcPolicy, + base::Value::Type::BOOLEAN }, +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #if defined(OS_POSIX) + { key::kNtlmV2Enabled, + prefs::kNtlmV2Enabled, +@@ -1163,7 +1163,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + prefs::kExternalProtocolDialogShowAlwaysOpenCheckbox, + base::Value::Type::BOOLEAN }, + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) { key::kAlternativeBrowserPath, browser_switcher::prefs::kAlternativeBrowserPath, + base::Value::Type::STRING }, +@@ -1203,7 +1203,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + browser_switcher::prefs::kChromeParameters, + base::Value::Type::LIST }, + #endif +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) + { key::kBrowserGuestModeEnforced, + prefs::kBrowserGuestModeEnforced, + base::Value::Type::BOOLEAN }, diff --git a/www/iridium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc b/www/iridium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc deleted file mode 100644 index 73f455032c54..000000000000 --- a/www/iridium/files/patch-chrome_browser_policy_machine__level__user__cloud__policy__controller.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/policy/machine_level_user_cloud_policy_controller.cc.orig 2019-03-11 22:00:53 UTC -+++ chrome/browser/policy/machine_level_user_cloud_policy_controller.cc -@@ -65,7 +65,7 @@ bool IsMachineLevelUserCloudPolicyEnabled() { - #endif - } - --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - void CleanupUnusedPolicyDirectory() { - std::string enrollment_token = - BrowserDMTokenStorage::Get()->RetrieveEnrollmentToken(); -@@ -124,7 +124,7 @@ MachineLevelUserCloudPolicyController::CreatePolicyMan - void MachineLevelUserCloudPolicyController::Init( - PrefService* local_state, - scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) { --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - // This is a function that removes the directory we accidentally create due to - // crbug.com/880870. The directory is only removed when it's empty and - // enrollment token doesn't exist. This function is expected to be removed diff --git a/www/iridium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc b/www/iridium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc index 8a88cf1b3f27..816eeffdc37e 100644 --- a/www/iridium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc +++ b/www/iridium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2020-02-03 21:52:40 UTC +++ chrome/browser/policy/policy_prefs_browsertest.cc -@@ -185,6 +185,8 @@ class PolicyTestCase { +@@ -250,6 +250,8 @@ class PolicyTestCase { const std::string os("chromeos"); #elif defined(OS_LINUX) const std::string os("linux"); diff --git a/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc index 99cc2097f2df..7f9fbfc4cd49 100644 --- a/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,20 +1,20 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -319,7 +319,7 @@ - #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_prefs_manager.h" +@@ -360,7 +360,7 @@ #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -771,7 +771,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync - safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); + +@@ -1022,7 +1022,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry); #endif + diff --git a/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc b/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc index 57bcccf51036..0fc02f402f9c 100644 --- a/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc +++ b/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__whitelist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/prefs/pref_service_incognito_whitelist.cc.orig 2019-12-16 21:50:42 UTC +++ chrome/browser/prefs/pref_service_incognito_whitelist.cc -@@ -164,7 +164,7 @@ const char* const kPersistentPrefNames[] = { +@@ -187,7 +187,7 @@ const char* const kPersistentPrefNames[] = { prefs::kShowFullscreenToolbar, #endif diff --git a/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc b/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc index fe3f353e76b8..f8a7db8e85a3 100644 --- a/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2019-10-21 19:06:22 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -93,11 +93,11 @@ +@@ -95,11 +95,11 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" @@ -14,7 +14,7 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -325,7 +325,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -296,7 +296,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; @@ -23,7 +23,7 @@ base::string16 relaunch_button_text = l10n_util::GetStringUTF16( IDS_PROFILE_IN_USE_LINUX_RELAUNCH); return ShowProcessSingletonDialog(error, relaunch_button_text); -@@ -904,7 +904,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif +@@ -872,7 +872,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif SendRemoteProcessInteractionResultHistogram(REMOTE_PROCESS_SHUTTING_DOWN); return PROCESS_NONE; } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) { diff --git a/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index 73cee1e30aac..a2ac58994f69 100644 --- a/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,11 +1,11 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -326,7 +326,7 @@ void ChromeBrowserMainExtraPartsProfiles:: - #if !defined(OS_ANDROID) - MediaGalleriesPreferencesFactory::GetInstance(); - #endif --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) +@@ -295,7 +295,7 @@ void ChromeBrowserMainExtraPartsProfiles:: + if (base::FeatureList::IsEnabled(media::kUseMediaHistoryStore)) + media_history::MediaHistoryKeyedServiceFactory::GetInstance(); + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif + ModelTypeStoreServiceFactory::GetInstance(); diff --git a/www/iridium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc b/www/iridium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc index b41d40af3973..48f0d0c5ddd2 100644 --- a/www/iridium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc +++ b/www/iridium/files/patch-chrome_browser_profiles_profile__attributes__entry.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_attributes_entry.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/profiles/profile_attributes_entry.cc.orig 2020-03-16 18:39:44 UTC +++ chrome/browser/profiles/profile_attributes_entry.cc -@@ -57,7 +57,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac +@@ -108,7 +108,7 @@ void ProfileAttributesEntry::Initialize(ProfileInfoCac if (is_force_signin_enabled_) { if (!IsAuthenticated()) is_force_signin_profile_locked_ = true; diff --git a/www/iridium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc b/www/iridium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc index 8f31da033031..4a46416a7065 100644 --- a/www/iridium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc +++ b/www/iridium/files/patch-chrome_browser_renderer__context__menu_render__view__context__menu.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/renderer_context_menu/render_view_context_menu.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1507,7 +1507,7 @@ void RenderViewContextMenu::AppendEditableItems() { +@@ -1702,7 +1702,7 @@ void RenderViewContextMenu::AppendEditableItems() { // 'Undo' and 'Redo' for text input with no suggestions and no text selected. // We make an exception for OS X as context clicking will select the closest // word. In this case both items are always shown. @@ -9,7 +9,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_UNDO, IDS_CONTENT_CONTEXT_UNDO); menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_REDO, -@@ -1549,7 +1549,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { +@@ -1744,7 +1744,7 @@ void RenderViewContextMenu::AppendLanguageSettings() { if (!use_spelling) return; @@ -18,7 +18,7 @@ menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS, IDS_CONTENT_CONTEXT_LANGUAGE_SETTINGS); #else -@@ -1823,7 +1823,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) +@@ -2083,7 +2083,7 @@ bool RenderViewContextMenu::IsCommandIdEnabled(int id) case IDC_CHECK_SPELLING_WHILE_TYPING: return prefs->GetBoolean(spellcheck::prefs::kSpellCheckEnable); diff --git a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc index ac9923b9ee0a..db4c5e81a31d 100644 --- a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2019-03-11 22:00:53 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/renderer_preferences_util.cc -@@ -28,7 +28,7 @@ +@@ -31,7 +31,7 @@ #include "ui/base/cocoa/defaults_utils.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" #include "ui/views/linux_ui/linux_ui.h" -@@ -127,7 +127,7 @@ void UpdateFromSystemSettings(content::RendererPrefere +@@ -146,7 +146,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr prefs->caret_blink_interval = interval; #endif @@ -18,7 +18,7 @@ views::LinuxUI* linux_ui = views::LinuxUI::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { -@@ -146,7 +146,7 @@ void UpdateFromSystemSettings(content::RendererPrefere +@@ -165,7 +165,7 @@ void UpdateFromSystemSettings(blink::mojom::RendererPr } #endif diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js index 992704a5c5e1..6512d38fe080 100644 --- a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js +++ b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.js @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js.orig 2019-10-21 19:06:23 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.js -@@ -35,7 +35,7 @@ cr.define('settings', function() { +@@ -19,7 +19,7 @@ cr.define('settings', function() { useDefaultTheme() {} @@ -9,7 +9,7 @@ useSystemTheme() {} // </if> -@@ -93,7 +93,7 @@ cr.define('settings', function() { +@@ -59,7 +59,7 @@ cr.define('settings', function() { chrome.send('useDefaultTheme'); } diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html index 4aa3c61f0cec..1470f1f0d2c0 100644 --- a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html +++ b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html @@ -1,24 +1,24 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html -@@ -65,7 +65,7 @@ - hidden="[[!pageVisibility.setTheme]]" +@@ -49,7 +49,7 @@ + <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]" label="$i18n{themes}" sub-label="[[themeSublabel_]]" - on-click="openThemeUrl_"></cr-link-row> + on-click="openThemeUrl_" external></cr-link-row> -<if expr="not is_linux or chromeos"> +<if expr="not is_posix or chromeos"> <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> <div class="separator"></div> - <paper-button id="useDefault" on-click="onUseDefaultTap_" -@@ -74,7 +74,7 @@ - </paper-button> + <cr-button id="useDefault" on-click="onUseDefaultTap_"> +@@ -57,7 +57,7 @@ + </cr-button> </template> </if> -<if expr="is_linux and not chromeos"> +<if expr="is_posix and not chromeos"> <div class="settings-row continuation" hidden="[[!showThemesSecondary_( - prefs.extensions.theme.id.value, useSystemTheme_)]]" -@@ -139,7 +139,7 @@ + prefs.extensions.theme.id.value, useSystemTheme_)]]" +@@ -120,7 +120,7 @@ pref="{{prefs.bookmark_bar.show_on_all_tabs}}" label="$i18n{showBookmarksBar}"> </settings-toggle-button> diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js index 9a48cb455280..a080e83db65c 100644 --- a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js +++ b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.js @@ -1,6 +1,6 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.js.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.js -@@ -120,7 +120,7 @@ Polymer({ +@@ -104,7 +104,7 @@ Polymer({ 'defaultFontSizeChanged_(prefs.webkit.webprefs.default_font_size.value)', 'themeChanged_(prefs.extensions.theme.id.value, useSystemTheme_)', @@ -9,8 +9,8 @@ // NOTE: this pref only exists on Linux. 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)', // </if> -@@ -223,7 +223,7 @@ Polymer({ - this.browserProxy_.useDefaultTheme(); +@@ -190,7 +190,7 @@ Polymer({ + this.appearanceBrowserProxy_.useDefaultTheme(); }, - // <if expr="is_linux and not chromeos"> @@ -18,7 +18,7 @@ /** * @param {boolean} useSystemTheme * @private -@@ -292,10 +292,10 @@ Polymer({ +@@ -267,10 +267,10 @@ Polymer({ } let i18nId; diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc index 881a83112e53..2d242ce878e6 100644 --- a/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc +++ b/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc @@ -1,8 +1,8 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc @@ -8,7 +8,12 @@ - #include "base/hash.h" + #include "base/hash/hash.h" #include "base/logging.h" +//XXX(rene) needs shim headers? +#if defined(USE_SYSTEM_PROTOBUF) diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc index 8a8afe3af800..0690a0795218 100644 --- a/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc +++ b/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2019-04-10 10:50:04 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2020-04-10 00:39:09 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -718,7 +718,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +@@ -674,7 +674,7 @@ void IncidentReportingService::OnEnvironmentDataCollec environment_collection_pending_ = false; // Process::Current().CreationTime() is missing on some platforms. diff --git a/www/iridium/files/patch-chrome_browser_search_local__files__ntp__source.cc b/www/iridium/files/patch-chrome_browser_search_local__files__ntp__source.cc deleted file mode 100644 index e25c43ecb50b..000000000000 --- a/www/iridium/files/patch-chrome_browser_search_local__files__ntp__source.cc +++ /dev/null @@ -1,16 +0,0 @@ ---- chrome/browser/search/local_files_ntp_source.cc.orig 2019-03-11 22:00:54 UTC -+++ chrome/browser/search/local_files_ntp_source.cc -@@ -20,8 +20,13 @@ - #include "build/build_config.h" - #include "chrome/common/url_constants.h" - #include "content/public/browser/url_data_source.h" -+#if defined(OS_BSD) -+#include <re2/re2.h> -+#include <re2/stringpiece.h> -+#else - #include "third_party/re2/src/re2/re2.h" - #include "third_party/re2/src/re2/stringpiece.h" -+#endif - - namespace { - diff --git a/www/iridium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc b/www/iridium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc new file mode 100644 index 000000000000..bf751427bd2a --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_search_search__suggest_search__suggest__service.cc @@ -0,0 +1,14 @@ +--- chrome/browser/search/search_suggest/search_suggest_service.cc.orig 2019-12-16 21:50:43 UTC ++++ chrome/browser/search/search_suggest/search_suggest_service.cc +@@ -20,7 +20,11 @@ + #include "components/prefs/scoped_user_pref_update.h" + #include "components/signin/public/identity_manager/accounts_in_cookie_jar_info.h" + #include "components/signin/public/identity_manager/identity_manager.h" ++#if defined(OS_BSD) ++#include <re2/re2.h> ++#else + #include "third_party/re2/src/re2/re2.h" ++#endif + + namespace { + diff --git a/www/iridium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc b/www/iridium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc new file mode 100644 index 000000000000..f8a2b34d89f3 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_send__tab__to__self_receiving__ui__handler__registry.cc @@ -0,0 +1,20 @@ +--- chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc.orig 2019-06-07 20:47:39 UTC ++++ chrome/browser/send_tab_to_self/receiving_ui_handler_registry.cc +@@ -11,7 +11,7 @@ + #include "chrome/browser/profiles/profile.h" + #include "chrome/browser/send_tab_to_self/receiving_ui_handler.h" + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + #include "chrome/browser/send_tab_to_self/desktop_notification_handler.h" + #endif + +@@ -32,7 +32,7 @@ ReceivingUiHandlerRegistry* ReceivingUiHandlerRegistry + // Instantiates all the handlers relevant to this platform. + void ReceivingUiHandlerRegistry::InstantiatePlatformSpecificHandlers( + Profile* profile) { +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + applicable_handlers_.push_back( + std::make_unique<send_tab_to_self::DesktopNotificationHandler>(profile)); + #elif defined(OS_ANDROID) diff --git a/www/iridium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc b/www/iridium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc new file mode 100644 index 000000000000..d20b30112256 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_send__tab__to__self_send__tab__to__self__client__service.cc @@ -0,0 +1,11 @@ +--- chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc.orig 2019-07-29 18:57:56 UTC ++++ chrome/browser/send_tab_to_self/send_tab_to_self_client_service.cc +@@ -41,7 +41,7 @@ void SendTabToSelfClientService::SendTabToSelfModelLoa + void SendTabToSelfClientService::EntriesAddedRemotely( + const std::vector<const SendTabToSelfEntry*>& new_entries) { + for (const std::unique_ptr<ReceivingUiHandler>& handler : GetHandlers()) { +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) + // Only respond to notifications corresponding to this service's profile + // for these OSes; mobile does not have a Profile. + // Cast note: on desktop, handlers are guaranteed to be the derived class diff --git a/www/iridium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc b/www/iridium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc new file mode 100644 index 000000000000..e1b209c81c94 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.cc @@ -0,0 +1,17 @@ +--- chrome/browser/sharing/shared_clipboard/feature_flags.cc.orig 2020-02-07 12:34:27 UTC ++++ chrome/browser/sharing/shared_clipboard/feature_flags.cc +@@ -10,12 +10,12 @@ const base::Feature kSharedClipboardReceiver{"SharedCl + const base::Feature kSharedClipboardUI{"SharedClipboardUI", + base::FEATURE_DISABLED_BY_DEFAULT}; + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + const base::Feature kRemoteCopyReceiver{"RemoteCopyReceiver", + base::FEATURE_DISABLED_BY_DEFAULT}; + + const base::FeatureParam<std::string> kRemoteCopyAllowedOrigins = { + &kRemoteCopyReceiver, "RemoteCopyAllowedOrigins", ""}; +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h b/www/iridium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h new file mode 100644 index 000000000000..6a0e3079731b --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_sharing_shared__clipboard_feature__flags.h @@ -0,0 +1,19 @@ +--- chrome/browser/sharing/shared_clipboard/feature_flags.h.orig 2020-03-16 18:40:29 UTC ++++ chrome/browser/sharing/shared_clipboard/feature_flags.h +@@ -17,14 +17,14 @@ extern const base::Feature kSharedClipboardReceiver; + // Feature to allow shared clipboard gets processed. + extern const base::Feature kSharedClipboardUI; + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + // Feature to enable handling remote copy messages. + extern const base::Feature kRemoteCopyReceiver; + + // List of allowed origins to fetch images from, comma separated. + extern const base::FeatureParam<std::string> kRemoteCopyAllowedOrigins; +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + #endif // CHROME_BROWSER_SHARING_SHARED_CLIPBOARD_FEATURE_FLAGS_H_ diff --git a/www/iridium/files/patch-chrome_browser_sharing_sharing__device__registration.cc b/www/iridium/files/patch-chrome_browser_sharing_sharing__device__registration.cc new file mode 100644 index 000000000000..0c3723e85860 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_sharing_sharing__device__registration.cc @@ -0,0 +1,24 @@ +--- chrome/browser/sharing/sharing_device_registration.cc.orig 2020-03-26 18:39:48 UTC ++++ chrome/browser/sharing/sharing_device_registration.cc +@@ -325,7 +325,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( + } + + bool SharingDeviceRegistration::IsRemoteCopySupported() const { +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + return base::FeatureList::IsEnabled(kRemoteCopyReceiver); + #endif +@@ -334,10 +334,10 @@ bool SharingDeviceRegistration::IsRemoteCopySupported( + } + + bool SharingDeviceRegistration::IsPeerConnectionSupported() const { +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + return base::FeatureList::IsEnabled(kSharingPeerConnectionReceiver); +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + return false; diff --git a/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc b/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc new file mode 100644 index 000000000000..a9744c4a6a8d --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc @@ -0,0 +1,32 @@ +--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2020-03-16 18:39:44 UTC ++++ chrome/browser/sharing/sharing_handler_registry_impl.cc +@@ -24,10 +24,10 @@ + #include "chrome/browser/sharing/webrtc/webrtc_message_handler.h" + #endif // defined(OS_ANDROID) + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + #include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h" +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + SharingHandlerRegistryImpl::SharingHandlerRegistryImpl( +@@ -73,14 +73,14 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl + {chrome_browser_sharing::SharingMessage::kSharedClipboardMessage}); + } + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + if (sharing_device_registration->IsRemoteCopySupported()) { + AddSharingHandler( + std::make_unique<RemoteCopyMessageHandler>(profile), + {chrome_browser_sharing::SharingMessage::kRemoteCopyMessage}); + } +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + #if !defined(OS_ANDROID) diff --git a/www/iridium/files/patch-chrome_browser_sharing_sharing__service.cc b/www/iridium/files/patch-chrome_browser_sharing_sharing__service.cc new file mode 100644 index 000000000000..7e096df1b053 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_sharing_sharing__service.cc @@ -0,0 +1,20 @@ +--- chrome/browser/sharing/sharing_service.cc.orig 2020-03-30 09:34:43 UTC ++++ chrome/browser/sharing/sharing_service.cc +@@ -30,7 +30,7 @@ namespace { + SharingMessageSender::DelegateType GetSendDelegateType( + const syncer::DeviceInfo& device, + const chrome_browser_sharing::SharingMessage& message) { +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + // Messages other than SharedClipboard are always sent via FCM. + if (message.payload_case() != +@@ -56,7 +56,7 @@ SharingMessageSender::DelegateType GetSendDelegateType + // logic once we wrap up the experiment and e.g. only send messages over a + // certain size via WebRTC. + return SharingMessageSender::DelegateType::kWebRtc; +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + // defined(OS_CHROMEOS) + + // Only FCM is supported for non desktop OS. diff --git a/www/iridium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.cc b/www/iridium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.cc new file mode 100644 index 000000000000..cfac06c08d3d --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.cc @@ -0,0 +1,17 @@ +--- chrome/browser/sharing/webrtc/webrtc_flags.cc.orig 2020-03-30 09:35:30 UTC ++++ chrome/browser/sharing/webrtc/webrtc_flags.cc +@@ -4,12 +4,12 @@ + + #include "chrome/browser/sharing/webrtc/webrtc_flags.h" + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + const base::Feature kSharingPeerConnectionReceiver{ + "SharingPeerConnectionReceiver", base::FEATURE_DISABLED_BY_DEFAULT}; + + const base::Feature kSharingPeerConnectionSender{ + "SharingPeerConnectionSender", base::FEATURE_ENABLED_BY_DEFAULT}; +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.h b/www/iridium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.h new file mode 100644 index 000000000000..fdec699052e2 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_sharing_webrtc_webrtc__flags.h @@ -0,0 +1,19 @@ +--- chrome/browser/sharing/webrtc/webrtc_flags.h.orig 2020-03-30 09:35:47 UTC ++++ chrome/browser/sharing/webrtc/webrtc_flags.h +@@ -8,14 +8,14 @@ + #include "base/feature_list.h" + #include "build/build_config.h" + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + // Feature flag to enable receiving PeerConnection requests. + extern const base::Feature kSharingPeerConnectionReceiver; + + // Feature flag to enable sending SharingMessage using PeerConnection. + extern const base::Feature kSharingPeerConnectionSender; +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + #endif // CHROME_BROWSER_SHARING_WEBRTC_WEBRTC_FLAGS_H_ diff --git a/www/iridium/files/patch-chrome_browser_signin_signin__util.cc b/www/iridium/files/patch-chrome_browser_signin_signin__util.cc index 1bd2e0affda7..4c230f4f53f2 100644 --- a/www/iridium/files/patch-chrome_browser_signin_signin__util.cc +++ b/www/iridium/files/patch-chrome_browser_signin_signin__util.cc @@ -1,11 +1,11 @@ ---- chrome/browser/signin/signin_util.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/signin/signin_util.cc.orig 2019-12-16 21:50:43 UTC +++ chrome/browser/signin/signin_util.cc -@@ -42,7 +42,7 @@ namespace { - - constexpr char kSignoutSettingKey[] = "signout_setting"; +@@ -34,7 +34,7 @@ + #include "google_apis/gaia/gaia_auth_util.h" + #include "ui/base/l10n/l10n_util.h" -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - #define CAN_DELETE_PROFILE - #endif - + #include "chrome/browser/ui/browser_finder.h" + #include "chrome/browser/ui/browser_list.h" + #include "chrome/browser/ui/browser_list_observer.h" diff --git a/www/iridium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc b/www/iridium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc index 58e3c1beecda..50ed28cdeb0a 100644 --- a/www/iridium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc +++ b/www/iridium/files/patch-chrome_browser_ssl_ssl__error__controller__client.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/ssl/ssl_error_controller_client.cc -@@ -78,7 +78,7 @@ void LaunchDateAndTimeSettingsImpl() { +@@ -79,7 +79,7 @@ void LaunchDateAndTimeSettingsImpl() { #if defined(OS_ANDROID) chrome::android::OpenDateAndTimeSettings(); @@ -9,12 +9,12 @@ struct ClockCommand { const char* const pathname; const char* const argument; -@@ -219,7 +219,7 @@ void SSLErrorControllerClient::Proceed() { +@@ -205,7 +205,7 @@ void SSLErrorControllerClient::Proceed() { + } bool SSLErrorControllerClient::CanLaunchDateAndTimeSettings() { - #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \ -- defined(OS_WIN) -+ defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \ ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || \ + defined(OS_WIN) return true; #else - return false; diff --git a/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc index 92f874d0cb6a..155f4fdf474c 100644 --- a/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,17 +1,17 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -428,7 +428,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -442,7 +442,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy } - #endif // BUILDFLAG(ENABLE_APP_LIST) + #endif // defined(OS_CHROMEOS) -#if defined(OS_LINUX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) // Dictionary sync is enabled by default. if (!disabled_types.Has(syncer::DICTIONARY)) { - if (base::FeatureList::IsEnabled(switches::kSyncPseudoUSSDictionary)) { -@@ -444,7 +444,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy - base::CreateSingleThreadTaskRunnerWithTraits({BrowserThread::UI}))); - } + controllers.push_back( +@@ -450,7 +450,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy + syncer::DICTIONARY, model_type_store_factory, + GetSyncableServiceForType(syncer::DICTIONARY), dump_stack)); } -#endif // defined(OS_LINUX) || defined(OS_WIN) +#endif // defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc index 12d416f849fa..1e077a7ff46c 100644 --- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc +++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.cc @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2019-09-09 21:55:10 UTC +++ chrome/browser/task_manager/sampling/task_group.cc @@ -33,9 +33,9 @@ const int kBackgroundRefreshTypesMask = #if defined(OS_WIN) @@ -12,7 +12,7 @@ #if BUILDFLAG(ENABLE_NACL) REFRESH_TYPE_NACL | #endif // BUILDFLAG(ENABLE_NACL) -@@ -112,9 +112,9 @@ TaskGroup::TaskGroup( +@@ -114,9 +114,9 @@ TaskGroup::TaskGroup( #if BUILDFLAG(ENABLE_NACL) nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown), #endif // BUILDFLAG(ENABLE_NACL) @@ -23,8 +23,8 @@ +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) idle_wakeups_per_second_(-1), gpu_memory_has_duplicates_(false), - is_backgrounded_(false), -@@ -128,10 +128,10 @@ TaskGroup::TaskGroup( + is_backgrounded_(false) { +@@ -129,10 +129,10 @@ TaskGroup::TaskGroup( weak_ptr_factory_.GetWeakPtr()), base::Bind(&TaskGroup::OnIdleWakeupsRefreshDone, weak_ptr_factory_.GetWeakPtr()), @@ -37,7 +37,7 @@ base::Bind(&TaskGroup::OnProcessPriorityDone, weak_ptr_factory_.GetWeakPtr())); -@@ -296,14 +296,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac +@@ -300,14 +300,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac } #endif // BUILDFLAG(ENABLE_NACL) diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h index 9cf571bed1d7..3b055c6018f5 100644 --- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h +++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h @@ -1,6 +1,15 @@ ---- chrome/browser/task_manager/sampling/task_group.h.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/task_manager/sampling/task_group.h.orig 2019-10-21 19:06:23 UTC +++ chrome/browser/task_manager/sampling/task_group.h -@@ -106,9 +106,9 @@ class TaskGroup { +@@ -39,7 +39,7 @@ constexpr int kUnsupportedVMRefreshFlags = + REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE | + REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES | + REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY | +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + REFRESH_TYPE_FD_COUNT | + #endif + REFRESH_TYPE_HARD_FAULTS; +@@ -122,9 +122,9 @@ class TaskGroup { int nacl_debug_stub_port() const { return nacl_debug_stub_port_; } #endif // BUILDFLAG(ENABLE_NACL) @@ -11,8 +20,8 @@ +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) int idle_wakeups_per_second() const { return idle_wakeups_per_second_; } - private: -@@ -121,9 +121,9 @@ class TaskGroup { + +@@ -138,9 +138,9 @@ class TaskGroup { void RefreshNaClDebugStubPort(int child_process_unique_id); void OnRefreshNaClDebugStubPortDone(int port); #endif @@ -24,7 +33,7 @@ void OnCpuRefreshDone(double cpu_usage); void OnSwappedMemRefreshDone(int64_t swapped_mem_bytes); -@@ -191,10 +191,10 @@ class TaskGroup { +@@ -209,10 +209,10 @@ class TaskGroup { #if BUILDFLAG(ENABLE_NACL) int nacl_debug_stub_port_; #endif // BUILDFLAG(ENABLE_NACL) diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc index 1f4bae75e90b..0727f82f22b9 100644 --- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc +++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.cc.orig 2020-03-16 18:39:45 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.cc -@@ -42,9 +42,9 @@ TaskGroupSampler::TaskGroupSampler( +@@ -43,9 +43,9 @@ TaskGroupSampler::TaskGroupSampler( const OnCpuRefreshCallback& on_cpu_refresh, const OnSwappedMemRefreshCallback& on_swapped_mem_refresh, const OnIdleWakeupsCallback& on_idle_wakeups, @@ -12,7 +12,7 @@ const OnProcessPriorityCallback& on_process_priority) : process_(std::move(process)), process_metrics_(CreateProcessMetrics(process_.Handle())), -@@ -52,9 +52,9 @@ TaskGroupSampler::TaskGroupSampler( +@@ -53,9 +53,9 @@ TaskGroupSampler::TaskGroupSampler( on_cpu_refresh_callback_(on_cpu_refresh), on_swapped_mem_refresh_callback_(on_swapped_mem_refresh), on_idle_wakeups_callback_(on_idle_wakeups), @@ -25,7 +25,7 @@ DCHECK(blocking_pool_runner.get()); @@ -85,7 +85,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) - on_swapped_mem_refresh_callback_); + base::BindOnce(on_swapped_mem_refresh_callback_)); } -#if defined(OS_MACOSX) || defined(OS_LINUX) @@ -33,9 +33,9 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_IDLE_WAKEUPS, refresh_flags)) { base::PostTaskAndReplyWithResult( -@@ -94,9 +94,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) - base::Bind(&TaskGroupSampler::RefreshIdleWakeupsPerSecond, this), - on_idle_wakeups_callback_); +@@ -93,9 +93,9 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) + base::BindOnce(&TaskGroupSampler::RefreshIdleWakeupsPerSecond, this), + base::BindOnce(on_idle_wakeups_callback_)); } -#endif // defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) @@ -45,16 +45,16 @@ if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_FD_COUNT, refresh_flags)) { base::PostTaskAndReplyWithResult( -@@ -105,7 +105,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) - base::Bind(&TaskGroupSampler::RefreshOpenFdCount, this), - on_open_fd_count_callback_); +@@ -103,7 +103,7 @@ void TaskGroupSampler::Refresh(int64_t refresh_flags) + base::BindOnce(&TaskGroupSampler::RefreshOpenFdCount, this), + base::BindOnce(on_open_fd_count_callback_)); } -#endif // defined(OS_LINUX) || defined(OS_MACOSX) +#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_PRIORITY, refresh_flags)) { -@@ -144,13 +144,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { +@@ -145,13 +145,13 @@ int TaskGroupSampler::RefreshIdleWakeupsPerSecond() { return process_metrics_->GetIdleWakeupsPerSecond(); } diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h index 317827df924a..ee309764291e 100644 --- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h +++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group__sampler.h @@ -1,4 +1,4 @@ ---- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/task_manager/sampling/task_group_sampler.h.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/task_manager/sampling/task_group_sampler.h @@ -32,9 +32,9 @@ class TaskGroupSampler : public base::RefCountedThread using OnCpuRefreshCallback = base::Callback<void(double)>; @@ -36,7 +36,7 @@ bool RefreshProcessPriority(); // The process that holds the handle that we own so that we can use it for -@@ -80,9 +80,9 @@ class TaskGroupSampler : public base::RefCountedThread +@@ -84,9 +84,9 @@ class TaskGroupSampler : public base::RefCountedThread const OnCpuRefreshCallback on_cpu_refresh_callback_; const OnSwappedMemRefreshCallback on_swapped_mem_refresh_callback_; const OnIdleWakeupsCallback on_idle_wakeups_callback_; diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index d2d95cd4af50..cb287277caa7 100644 --- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2019-10-21 19:06:23 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -207,11 +207,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -219,11 +219,11 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc new file mode 100644 index 000000000000..cf606ad8b2ce --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc @@ -0,0 +1,29 @@ +--- chrome/browser/themes/theme_service_factory.cc.orig 2020-03-16 18:39:45 UTC ++++ chrome/browser/themes/theme_service_factory.cc +@@ -23,7 +23,7 @@ + #include "chrome/browser/themes/theme_helper_win.h" + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #include "chrome/browser/themes/theme_service_aura_linux.h" + #include "ui/views/linux_ui/linux_ui.h" + #endif +@@ -78,7 +78,7 @@ ThemeServiceFactory::~ThemeServiceFactory() {} + + KeyedService* ThemeServiceFactory::BuildServiceInstanceFor( + content::BrowserContext* profile) const { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + using ThemeService = ThemeServiceAuraLinux; + #endif + +@@ -90,7 +90,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc + + void ThemeServiceFactory::RegisterProfilePrefs( + user_prefs::PrefRegistrySyncable* registry) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + bool default_uses_system_theme = false; + + const views::LinuxUI* linux_ui = views::LinuxUI::instance(); diff --git a/www/iridium/files/patch-chrome_browser_tracing_crash__service__uploader.cc b/www/iridium/files/patch-chrome_browser_tracing_crash__service__uploader.cc index d696fb66bcaf..9e2f7535e762 100644 --- a/www/iridium/files/patch-chrome_browser_tracing_crash__service__uploader.cc +++ b/www/iridium/files/patch-chrome_browser_tracing_crash__service__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/tracing/crash_service_uploader.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/tracing/crash_service_uploader.cc.orig 2020-03-16 18:40:29 UTC +++ chrome/browser/tracing/crash_service_uploader.cc -@@ -162,6 +162,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground +@@ -160,6 +160,8 @@ void TraceCrashServiceUploader::DoCompressOnBackground const char product[] = "Chrome_Linux"; #elif defined(OS_ANDROID) const char product[] = "Chrome_Android"; diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc index e623667e5a05..1ee7f7ff4e27 100644 --- a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -79,7 +79,7 @@ +@@ -82,7 +82,7 @@ #include "chrome/browser/ui/browser_commands_chromeos.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -216,7 +216,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -252,7 +252,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( #endif } @@ -18,7 +18,7 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -421,7 +421,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo +@@ -476,7 +476,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo break; #endif @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -860,7 +860,7 @@ void BrowserCommandController::InitCommandState() { +@@ -961,7 +961,7 @@ void BrowserCommandController::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true); command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true); #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__window.h b/www/iridium/files/patch-chrome_browser_ui_browser__window.h deleted file mode 100644 index 88419d5f6d6c..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_browser__window.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/browser_window.h.orig 2019-04-05 00:49:05 UTC -+++ chrome/browser/ui/browser_window.h -@@ -425,7 +425,7 @@ class BrowserWindow : public ui::BaseWindow { - bool is_source_keyboard) = 0; - - #if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \ -- defined(OS_LINUX) -+ defined(OS_LINUX) || defined(OS_BSD) - virtual void ShowHatsBubbleFromAppMenuButton() = 0; - #endif - diff --git a/www/iridium/files/patch-chrome_browser_ui_gtk_print__dialog__gtk.cc b/www/iridium/files/patch-chrome_browser_ui_gtk_print__dialog__gtk.cc new file mode 100644 index 000000000000..6d796805d2fa --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_gtk_print__dialog__gtk.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/gtk/print_dialog_gtk.cc.orig 2020-03-16 18:40:30 UTC ++++ chrome/browser/ui/gtk/print_dialog_gtk.cc +@@ -336,7 +336,7 @@ void PrintDialogGtk::ShowDialog( + // Since we only generate PDF, only show printers that support PDF. + // TODO(thestig) Add more capabilities to support? + GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( +- GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET | ++ GTK_PRINT_CAPABILITY_GENERATE_PS | GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET | + GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | + GTK_PRINT_CAPABILITY_REVERSE); + gtk_print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(dialog_), diff --git a/www/iridium/files/patch-chrome_browser_ui_input__method_input__method__engine.h b/www/iridium/files/patch-chrome_browser_ui_input__method_input__method__engine.h deleted file mode 100644 index 5fe24a4fb65c..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_input__method_input__method__engine.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/input_method/input_method_engine.h.orig 2019-03-11 22:00:54 UTC -+++ chrome/browser/ui/input_method/input_method_engine.h -@@ -27,7 +27,7 @@ class InputMethodEngine : public InputMethodEngineBase - - // ui::IMEEngineHandlerInterface: - bool IsActive() const override; -- std::string GetExtensionId() const override; -+ std::string GetExtensionId() const; - - // Creates and shows the IME window. - // Returns 0 for errors and |error| will contains the error message. diff --git a/www/iridium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc b/www/iridium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc index 2772be3932aa..fd379c49386c 100644 --- a/www/iridium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc +++ b/www/iridium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/input_method/input_method_engine_base.cc.orig 2020-02-03 21:53:29 UTC +++ chrome/browser/ui/input_method/input_method_engine_base.cc -@@ -29,7 +29,7 @@ +@@ -31,7 +31,7 @@ #include "ui/base/ime/chromeos/ime_keymap.h" #elif defined(OS_WIN) #include "ui/events/keycodes/keyboard_codes_win.h" diff --git a/www/iridium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc b/www/iridium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc deleted file mode 100644 index f2e025b23342..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_libgtkui_print__dialog__gtk.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- chrome/browser/ui/libgtkui/print_dialog_gtk.cc.orig 2019-03-11 22:00:54 UTC -+++ chrome/browser/ui/libgtkui/print_dialog_gtk.cc -@@ -333,6 +333,7 @@ void PrintDialogGtk::ShowDialog( - // Since we only generate PDF, only show printers that support PDF. - // TODO(thestig) Add more capabilities to support? - GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( -+ GTK_PRINT_CAPABILITY_GENERATE_PS | - GTK_PRINT_CAPABILITY_GENERATE_PDF | - GTK_PRINT_CAPABILITY_PAGE_SET | - GTK_PRINT_CAPABILITY_COPIES | diff --git a/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc b/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc index 611d7d2c0ae2..d03e6c550af9 100644 --- a/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc +++ b/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/sad_tab.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/sad_tab.cc.orig 2020-03-16 18:39:45 UTC +++ chrome/browser/ui/sad_tab.cc -@@ -180,7 +180,7 @@ std::vector<int> SadTab::GetSubMessages() { - // Only show incognito suggestion if not already in Incognito mode. +@@ -188,7 +188,7 @@ std::vector<int> SadTab::GetSubMessages() { + // Only show Incognito suggestion if not already in Incognito mode. if (!web_contents_->GetBrowserContext()->IsOffTheRecord()) message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO); -#if defined(OS_MACOSX) || defined(OS_LINUX) diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index 6ada31571847..e40b9803cffb 100644 --- a/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2020-02-03 21:53:29 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -84,7 +84,7 @@ static const char* kBadFlags[] = { +@@ -87,7 +87,7 @@ static const char* kBadFlags[] = { extensions::switches::kExtensionsOnChromeURLs, #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index 311a4a2f5833..b3cf9e596cbe 100644 --- a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2020-02-03 21:52:41 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -79,7 +79,7 @@ +@@ -82,7 +82,7 @@ #include "chrome/browser/ui/user_manager.h" #endif @@ -9,7 +9,16 @@ #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -@@ -633,8 +633,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -291,7 +291,7 @@ bool IsSilentLaunchEnabled(const base::CommandLine& co + // true, send a warning if guest mode is requested but not allowed by policy. + bool IsGuestModeEnforced(const base::CommandLine& command_line, + bool show_warning) { +-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) + PrefService* service = g_browser_process->local_state(); + DCHECK(service); + +@@ -662,8 +662,10 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( } #endif // OS_CHROMEOS diff --git a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc index 5b07ae6352d2..053ec7216342 100644 --- a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -116,7 +116,7 @@ +@@ -132,7 +132,7 @@ #include "components/zoom/zoom_controller.h" #endif // defined(OS_ANDROID) @@ -9,7 +9,7 @@ #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" #include "chrome/browser/ui/hats/hats_helper.h" #endif -@@ -309,11 +309,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -347,11 +347,11 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con #endif #if defined(OS_WIN) || defined(OS_MACOSX) || \ @@ -21,5 +21,5 @@ -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) if (base::FeatureList::IsEnabled( - features::kHappinessTrackingSurveysForDesktop)) { - HatsHelper::CreateForWebContents(web_contents); + features::kHappinessTrackingSurveysForDesktop) || + base::FeatureList::IsEnabled( diff --git a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index a1e8ca158374..0f8d7e671406 100644 --- a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc +++ b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2019-12-16 21:50:43 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -430,13 +430,13 @@ base::string16 TaskManagerTableModel::GetText(int row, +@@ -450,13 +450,13 @@ base::string16 TaskManagerTableModel::GetText(int row, ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); @@ -16,7 +16,7 @@ case IDS_TASK_MANAGER_KEEPALIVE_COUNT_COLUMN: { return stringifier_->GetKeepaliveCountText( -@@ -590,7 +590,7 @@ int TaskManagerTableModel::CompareValues(int row1, +@@ -616,7 +616,7 @@ int TaskManagerTableModel::CompareValues(int row1, return BooleanCompare(is_proc1_bg, is_proc2_bg); } @@ -25,7 +25,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -598,7 +598,7 @@ int TaskManagerTableModel::CompareValues(int row1, +@@ -624,7 +624,7 @@ int TaskManagerTableModel::CompareValues(int row1, observed_task_manager()->GetOpenFdCount(tasks_[row2]); return ValueCompare(proc1_fd_count, proc2_fd_count); } @@ -34,7 +34,7 @@ default: NOTREACHED(); -@@ -760,11 +760,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -790,11 +790,11 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; diff --git a/www/iridium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc b/www/iridium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc index 97facbead071..f348ce9eaf16 100644 --- a/www/iridium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc +++ b/www/iridium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/toolbar/app_menu_model.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/toolbar/app_menu_model.cc -@@ -671,7 +671,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) +@@ -684,7 +684,7 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) return app_menu_icon_controller_->GetTypeAndSeverity().type == AppMenuIconController::IconType::UPGRADE_NOTIFICATION; } -#if !defined(OS_LINUX) || defined(USE_AURA) +#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA) - case IDC_BOOKMARK_PAGE: - return !chrome::ShouldRemoveBookmarkThisPageUI(browser_->profile()); + case IDC_BOOKMARK_THIS_TAB: + return !chrome::ShouldRemoveBookmarkThisTabUI(browser_->profile()); case IDC_BOOKMARK_ALL_TABS: diff --git a/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc index 02759854c0fa..5b89c27e8d36 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2019-09-09 21:55:11 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -50,7 +50,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -51,7 +51,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, @@ -9,7 +9,7 @@ {ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, -@@ -80,7 +80,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -81,7 +81,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6}, {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, @@ -18,7 +18,7 @@ {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, -@@ -98,7 +98,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -99,7 +99,7 @@ const AcceleratorMapping kAcceleratorMap[] = { {ui::VKEY_8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_ALT_DOWN, IDC_SELECT_TAB_7}, {ui::VKEY_BROWSER_FAVORITES, ui::EF_NONE, IDC_SHOW_BOOKMARK_BAR}, @@ -27,8 +27,8 @@ {ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_PLATFORM_ACCELERATOR, IDC_SHOW_BOOKMARK_BAR}, {ui::VKEY_OEM_MINUS, ui::EF_PLATFORM_ACCELERATOR, IDC_ZOOM_MINUS}, -@@ -122,14 +122,14 @@ const AcceleratorMapping kAcceleratorMap[] = { - {ui::VKEY_F11, ui::EF_NONE, IDC_FULLSCREEN}, +@@ -125,14 +125,14 @@ const AcceleratorMapping kAcceleratorMap[] = { + IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. -#if defined(OS_LINUX) diff --git a/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc index 9ab402f6a4dd..47a25b7a998d 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_chrome__browser__main__extra__parts__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc.orig 2020-02-03 21:52:41 UTC +++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc -@@ -35,7 +35,7 @@ +@@ -33,7 +33,7 @@ #include "ui/wm/core/wm_state.h" #endif // defined(USE_AURA) @@ -9,25 +9,25 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -45,7 +45,7 @@ +@@ -43,7 +43,7 @@ #include "chrome/grit/generated_resources.h" #include "content/public/common/content_switches.h" #include "ui/base/l10n/l10n_util.h" -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - ChromeBrowserMainExtraPartsViews::ChromeBrowserMainExtraPartsViews() {} - -@@ -93,7 +93,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( + // This connector is used in ui_devtools's TracingAgent to hook up with the + // tracing service. +@@ -105,7 +105,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( + devtools_server_->tracing_agent()); } - #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) // On the Linux desktop, we want to prevent the user from logging in as root, // so that we don't destroy the profile. Now that we have some minimal ui // initialized, check to see if we're running as root and bail if we are. -@@ -124,7 +124,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( +@@ -136,7 +136,7 @@ void ChromeBrowserMainExtraPartsViews::PreProfileInit( base::RunLoop().RunUntilIdle(); exit(EXIT_FAILURE); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h index 7f2632495c6e..59453a839cab 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h @@ -44,7 +44,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat HICON GetSmallWindowIcon() const override; int GetAppbarAutohideEdges(HMONITOR monitor, - const base::Closure& callback) override; + base::OnceClosure callback) override; -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) gfx::ImageSkia* GetDefaultWindowIcon() const override; bool WindowManagerProvidesTitleBar(bool maximized) override; #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_views_download_download__item__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_download_download__item__view.cc new file mode 100644 index 000000000000..2e9f1501f8a7 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_download_download__item__view.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/download/download_item_view.cc.orig 2020-03-17 09:40:34 UTC ++++ chrome/browser/ui/views/download/download_item_view.cc +@@ -234,7 +234,7 @@ DownloadItemView::DownloadItemView(DownloadUIModel::Do + open_button_ = AddChildView(std::move(open_button)); + + int file_name_style = views::style::STYLE_PRIMARY; +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + if (base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings)) + file_name_style = STYLE_EMPHASIZED; + #endif +@@ -1633,7 +1633,7 @@ void DownloadItemView::StyleFilenameInLabel(views::Sty + if (!base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings)) + return; + +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + base::string16 filename = ElidedFilename(); + size_t file_name_position = label->GetText().find(filename); + if (file_name_position != std::string::npos) { diff --git a/www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc b/www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc index 9e9039a5fdbd..d2029ff732a8 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc @@ -1,24 +1,13 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/views/first_run_dialog.cc -@@ -37,8 +37,10 @@ - namespace { - - void InitCrashReporterIfEnabled(bool enabled) { -+#if !defined(OS_BSD) - if (enabled) - breakpad::InitCrashReporter(std::string()); -+#endif - } - - } // namespace -@@ -111,8 +113,10 @@ views::View* FirstRunDialog::CreateExtraView() { +@@ -114,8 +114,10 @@ void FirstRunDialog::Done() { bool FirstRunDialog::Accept() { GetWidget()->Hide(); +#if !defined(OS_BSD) - ChangeMetricsReportingStateWithReply(report_crashes_->checked(), + ChangeMetricsReportingStateWithReply(report_crashes_->GetChecked(), base::Bind(&InitCrashReporterIfEnabled)); +#endif - if (make_default_->checked()) + if (make_default_->GetChecked()) shell_integration::SetAsDefaultBrowser(); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index adf0dd59027e..c1d853c940c7 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,15 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2019-10-21 19:06:24 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc -@@ -37,7 +37,7 @@ - #include "components/user_manager/user_manager.h" - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h" - #endif - -@@ -48,7 +48,7 @@ +@@ -46,7 +46,7 @@ namespace { bool IsUsingGtkTheme(Profile* profile) { @@ -18,12 +9,3 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -104,7 +104,7 @@ void BrowserFrame::InitBrowserFrame() { - non_client_view()->set_context_menu_controller(this); - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - browser_command_handler_.reset(new BrowserCommandHandlerLinux(browser_view_)); - #endif - } diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 8f39a58a4d3b..b69b8869760f 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,29 +1,11 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2019-04-05 00:49:05 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1269,7 +1269,7 @@ void BrowserView::RotatePaneFocus(bool forwards) { - } +@@ -1633,7 +1633,7 @@ void BrowserView::UserChangedTheme(BrowserThemeChangeT + const bool should_use_native_frame = frame_->ShouldUseNativeFrame(); - void BrowserView::DestroyBrowser() { --#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - if (quit_instruction_bubble_controller_) { - GetWidget()->GetNativeView()->RemovePreTargetHandler( - quit_instruction_bubble_controller_.get()); -@@ -2155,7 +2155,7 @@ views::View* BrowserView::CreateOverlayView() { - } - - void BrowserView::OnWidgetDestroying(views::Widget* widget) { --#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - if (quit_instruction_bubble_controller_) { - GetWidget()->GetNativeView()->RemovePreTargetHandler( - quit_instruction_bubble_controller_.get()); -@@ -2499,7 +2499,7 @@ void BrowserView::InitViews() { - GetWidget()->SetNativeWindowProperty(Profile::kProfileKey, - browser_->profile()); - --#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - if (browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR)) { - quit_instruction_bubble_controller_ = - QuitInstructionBubbleController::GetInstance(); + bool must_regenerate_frame; +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // GTK and user theme changes can both change frame buttons, so the frame + // always needs to be regenerated on Linux. + must_regenerate_frame = true; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.h deleted file mode 100644 index 19c7b8856978..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.h +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/ui/views/frame/browser_view.h.orig 2019-04-05 00:49:05 UTC -+++ chrome/browser/ui/views/frame/browser_view.h -@@ -50,7 +50,7 @@ - #include "chrome/browser/ui/views/intent_picker_bubble_view.h" - #endif // defined(OS_CHROMEOS) - --#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - #include "chrome/browser/ui/views/quit_instruction_bubble_controller.h" - #endif - -@@ -853,7 +853,7 @@ class BrowserView : public BrowserWindow, - }; - base::Optional<ResizeSession> interactive_resize_; - --#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) -+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - scoped_refptr<QuitInstructionBubbleController> - quit_instruction_bubble_controller_; - #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index 794a1d2c3b13..9429876dcf27 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2020-03-16 18:39:45 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc -@@ -49,7 +49,7 @@ +@@ -48,7 +48,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" #include "ui/views/window/window_shape.h" @@ -9,16 +9,16 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -356,7 +356,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt - void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source, - const gfx::Point& point, - const ui::Event* event) { +@@ -349,7 +349,7 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Butt + } else if (sender == close_button_) { + frame()->CloseWithReason(views::Widget::ClosedReason::kCloseButtonClicked); + } else if (sender == window_icon_) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), - views::MenuRunner::HAS_MNEMONICS); - menu_runner.RunMenuAt(browser_view()->GetWidget(), window_icon_, -@@ -480,7 +480,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT + // TODO(pbos): Figure out / document why this is Linux only. This needs a + // comment. + views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), +@@ -478,7 +478,7 @@ bool OpaqueBrowserFrameView::EverHasVisibleBackgroundT OpaqueBrowserFrameView::FrameButtonStyle OpaqueBrowserFrameView::GetFrameButtonStyle() const { diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc index b75ea8b7056f..0586d8bb467d 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig 2019-04-30 22:22:36 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc -@@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpecific::IsUsingSy - return false; - } +@@ -6,7 +6,7 @@ + + #include "build/build_config.h" -#if !defined(OS_LINUX) +#if !defined(OS_LINUX) && !defined(OS_FREEBSD) // static - OpaqueBrowserFrameViewPlatformSpecific* + std::unique_ptr<OpaqueBrowserFrameViewPlatformSpecific> diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index f9af94718fda..dc06c4f10c39 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2020-02-03 21:52:41 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -78,7 +78,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM +@@ -62,7 +62,7 @@ void SystemMenuModelBuilder::BuildMenu(ui::SimpleMenuM void SystemMenuModelBuilder::BuildSystemMenuForBrowserWindow( ui::SimpleMenuModel* model) { @@ -9,7 +9,7 @@ model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); -@@ -90,7 +90,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -75,7 +75,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } @@ -18,7 +18,7 @@ model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR, IDS_SHOW_WINDOW_DECORATIONS_MENU); -@@ -126,7 +126,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo +@@ -113,7 +113,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc index 329ca29c6d7b..0e2672a7af5f 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2019-06-04 18:55:18 UTC +++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc @@ -15,7 +15,7 @@ #include "components/sessions/core/tab_restore_service.h" @@ -18,3 +18,12 @@ if (command_id == IDC_USE_SYSTEM_TITLE_BAR) { PrefService* prefs = browser_->profile()->GetPrefs(); return !prefs->GetBoolean(prefs::kUseCustomChromeFrame); +@@ -44,7 +44,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c + } + + bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + bool is_maximized = browser_->window()->IsMaximized(); + switch (command_id) { + case IDC_MAXIMIZE_WINDOW: diff --git a/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc index ca3cec36db89..45d717c16389 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2019-03-17 19:17:01 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -389,7 +389,7 @@ bool HungRendererDialogView::Cancel() { +@@ -417,7 +417,7 @@ bool HungRendererDialogView::Cancel() { content::RenderProcessHost* rph = hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); if (rph) { diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc index 8edcc381d29e..98e130553ec0 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2019-12-16 21:51:24 UTC +++ chrome/browser/ui/views/tabs/new_tab_button.cc -@@ -63,7 +63,7 @@ const gfx::Size NewTabButton::kButtonSize{28, 28}; +@@ -84,7 +84,7 @@ class NewTabButton::HighlightPathGenerator NewTabButton::NewTabButton(TabStrip* tab_strip, views::ButtonListener* listener) : views::ImageButton(listener), tab_strip_(tab_strip) { set_animate_on_state_change(true); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc new file mode 100644 index 000000000000..beabaf0792a0 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/tabs/tab.cc.orig 2020-03-16 18:40:30 UTC ++++ chrome/browser/ui/views/tabs/tab.cc +@@ -584,7 +584,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& + if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) + return; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Move the hit test area for hovering up so that it is not overlapped by tab + // hover cards when they are shown. + // TODO(crbug/978134): Once Linux/CrOS widget transparency is solved, remove diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index 8c91255df89d..166112807cf0 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -390,7 +390,7 @@ void TabDragController::Init(TabStrip* source_tabstrip +@@ -450,7 +450,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. @@ -8,17 +8,17 @@ +#if defined(OS_LINUX) || defined(OS_BSD) can_release_capture_ = false; #endif - start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y()); -@@ -814,7 +814,7 @@ TabDragController::DragBrowserToNewTabStrip(TabStrip* + start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); +@@ -895,7 +895,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon else - target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_); + SetCapture(target_context); --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) || defined(OS_BSD) +-#if !defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if (!defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -1953,7 +1953,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -2082,7 +2082,7 @@ TabDragController::Liveness TabDragController::GetLoca if (dragged_window) exclude.insert(dragged_window); } diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc index 9c0ea349e17d..473b7690ddfc 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2020-02-03 21:52:41 UTC +++ chrome/browser/ui/webui/about_ui.cc -@@ -552,7 +552,7 @@ std::string ChromeURLs() { +@@ -561,7 +561,7 @@ std::string ChromeURLs() { return html; } @@ -9,9 +9,9 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, 0, -@@ -607,7 +607,7 @@ void AboutUIHTMLSource::StartDataRequest( - .GetRawDataResource(idr) - .as_string(); +@@ -617,7 +617,7 @@ void AboutUIHTMLSource::StartDataRequest( + response = + ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index ba760d11b5e9..6fed2b7df1f6 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -192,11 +192,11 @@ - #include "chrome/browser/ui/webui/welcome/welcome_win10_ui.h" +@@ -224,11 +224,11 @@ + #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h" #endif -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) @@ -9,12 +9,12 @@ #include "chrome/browser/ui/webui/discards/discards_ui.h" #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #include "chrome/browser/ui/webui/sandbox_internals_ui.h" +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h" #endif -@@ -314,7 +314,7 @@ bool IsAboutUI(const GURL& url) { +@@ -337,7 +337,7 @@ bool IsAboutUI(const GURL& url) { #if !defined(OS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -23,7 +23,7 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if defined(OS_CHROMEOS) -@@ -588,7 +588,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -669,7 +669,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -32,12 +32,12 @@ if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) return &NewWebUI<ConstrainedWebDialogUI>; #endif -@@ -641,12 +641,12 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -717,17 +717,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we return &NewWebUI<CastUI>; } #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) if (url.host_piece() == chrome::kChromeUISandboxHost) { return &NewWebUI<SandboxInternalsUI>; } @@ -47,3 +47,9 @@ if (url.host_piece() == chrome::kChromeUIDiscardsHost) return &NewWebUI<DiscardsUI>; #endif + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + if (url.host_piece() == chrome::kChromeUIBrowserSwitchHost) + return &NewWebUI<BrowserSwitchUI>; + #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc index c545d3ba2d85..bf333383f3f1 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2019-10-21 19:06:24 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.cc -@@ -31,7 +31,7 @@ void AppearanceHandler::RegisterMessages() { +@@ -27,7 +27,7 @@ void AppearanceHandler::RegisterMessages() { "useDefaultTheme", base::BindRepeating(&AppearanceHandler::HandleUseDefaultTheme, base::Unretained(this))); @@ -9,7 +9,7 @@ web_ui()->RegisterMessageCallback( "useSystemTheme", base::BindRepeating(&AppearanceHandler::HandleUseSystemTheme, -@@ -59,7 +59,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba +@@ -39,7 +39,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba ThemeServiceFactory::GetForProfile(profile_)->UseDefaultTheme(); } diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc b/www/iridium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc deleted file mode 100644 index 7aa51f364344..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_webui_settings_md__settings__localized__strings__provider.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc.orig 2019-03-11 22:00:54 UTC -+++ chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc -@@ -513,7 +513,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht - {"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS}, - {"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED}, - {"themes", IDS_SETTINGS_THEMES}, --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, - {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, - {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -531,7 +531,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht - {"openWallpaperApp", IDS_SETTINGS_OPEN_WALLPAPER_APP}, - {"setWallpaper", IDS_SETTINGS_SET_WALLPAPER}, - #endif --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, - #endif - #if defined(OS_MACOSX) diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc new file mode 100644 index 000000000000..8df5419b8753 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2020-03-16 18:40:30 UTC ++++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +@@ -333,7 +333,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"enterCustomWebAddress", IDS_SETTINGS_ENTER_CUSTOM_WEB_ADDRESS}, + {"homeButtonDisabled", IDS_SETTINGS_HOME_BUTTON_DISABLED}, + {"themes", IDS_SETTINGS_THEMES}, +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, + {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, + {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, +@@ -348,7 +348,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"changeHomePage", IDS_SETTINGS_CHANGE_HOME_PAGE}, + {"themesGalleryUrl", IDS_THEMES_GALLERY_URL}, + {"chooseFromWebStore", IDS_SETTINGS_WEB_STORE}, +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, + #endif + #if defined(OS_MACOSX) diff --git a/www/iridium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.cc b/www/iridium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.cc new file mode 100644 index 000000000000..abc103c98166 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_web__applications_components_web__app__file__handler__registration.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/components/web_app_file_handler_registration.cc.orig 2020-02-07 12:36:50 UTC ++++ chrome/browser/web_applications/components/web_app_file_handler_registration.cc +@@ -15,7 +15,7 @@ namespace web_app { + // + // Note: Because OS_LINUX includes OS_CHROMEOS be sure to use the stub on + // OS_CHROMEOS. +-#if !defined(OS_WIN) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if !defined(OS_WIN) && !((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) + bool ShouldRegisterFileHandlersWithOs() { + return false; + } diff --git a/www/iridium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc b/www/iridium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc new file mode 100644 index 000000000000..934359b14459 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_web__applications_components_web__app__shortcut.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/components/web_app_shortcut.cc.orig 2020-03-17 09:41:50 UTC ++++ chrome/browser/web_applications/components/web_app_shortcut.cc +@@ -35,7 +35,7 @@ namespace { + const int kDesiredIconSizesForShortcut[] = {16, 32, 128, 256, 512}; + const size_t kNumDesiredIconSizesForShortcut = + base::size(kDesiredIconSizesForShortcut); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + // Linux supports icons of any size. FreeDesktop Icon Theme Specification states + // that "Minimally you should install a 48x48 icon in the hicolor theme." + const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512}; diff --git a/www/iridium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc b/www/iridium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc new file mode 100644 index 000000000000..9b0d271a91c7 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_web__applications_extensions_bookmark__app__finalizer__utils.cc @@ -0,0 +1,11 @@ +--- chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc.orig 2019-10-30 15:54:13 UTC ++++ chrome/browser/web_applications/extensions/bookmark_app_finalizer_utils.cc +@@ -15,7 +15,7 @@ namespace { + + #if !defined(OS_CHROMEOS) + bool CanOsAddDesktopShortcuts() { +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + return true; + #else + return false; diff --git a/www/iridium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc b/www/iridium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc deleted file mode 100644 index 0468435bbe7d..000000000000 --- a/www/iridium/files/patch-chrome_browser_web__applications_extensions_web__app__extension__shortcut.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc.orig 2019-03-11 22:00:54 UTC -+++ chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc -@@ -46,7 +46,7 @@ namespace { - #if defined(OS_MACOSX) - const int kDesiredSizes[] = {16, 32, 128, 256, 512}; - const size_t kNumDesiredSizes = base::size(kDesiredSizes); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - // Linux supports icons of any size. FreeDesktop Icon Theme Specification states - // that "Minimally you should install a 48x48 icon in the hicolor theme." - const int kDesiredSizes[] = {16, 32, 48, 128, 256, 512}; diff --git a/www/iridium/files/patch-chrome_common_BUILD.gn b/www/iridium/files/patch-chrome_common_BUILD.gn index 0cefd2907159..bf1e0b6e0415 100644 --- a/www/iridium/files/patch-chrome_common_BUILD.gn +++ b/www/iridium/files/patch-chrome_common_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/common/BUILD.gn.orig 2019-03-11 22:00:54 UTC +--- chrome/common/BUILD.gn.orig 2020-03-16 18:40:30 UTC +++ chrome/common/BUILD.gn -@@ -300,6 +300,10 @@ static_library("common") { +@@ -272,6 +272,10 @@ static_library("common") { public_deps += [ "//ppapi/shared_impl" ] } diff --git a/www/iridium/files/patch-chrome_common_channel__info.h b/www/iridium/files/patch-chrome_common_channel__info.h new file mode 100644 index 000000000000..b290d11bd40c --- /dev/null +++ b/www/iridium/files/patch-chrome_common_channel__info.h @@ -0,0 +1,11 @@ +--- chrome/common/channel_info.h.orig 2019-12-17 19:22:25 UTC ++++ chrome/common/channel_info.h +@@ -55,7 +55,7 @@ version_info::Channel GetChannelByName(const std::stri + std::string GetChannelSuffixForDataDir(); + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // Returns the channel-specific filename of the desktop shortcut used to launch + // the browser. + std::string GetDesktopName(base::Environment* env); diff --git a/www/iridium/files/patch-chrome_common_channel__info__posix.cc b/www/iridium/files/patch-chrome_common_channel__info__posix.cc new file mode 100644 index 000000000000..11726bed5663 --- /dev/null +++ b/www/iridium/files/patch-chrome_common_channel__info__posix.cc @@ -0,0 +1,20 @@ +--- chrome/common/channel_info_posix.cc.orig 2020-02-03 21:52:41 UTC ++++ chrome/common/channel_info_posix.cc +@@ -67,7 +67,7 @@ std::string GetChannelSuffixForDataDir() { + } + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + std::string GetDesktopName(base::Environment* env) { + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) + version_info::Channel product_channel(GetChannel()); +@@ -89,7 +89,7 @@ std::string GetDesktopName(base::Environment* env) { + return "chromium-browser.desktop"; + #endif + } +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + version_info::Channel GetChannel() { + return GetChannelImpl(nullptr); diff --git a/www/iridium/files/patch-chrome_common_chrome__features.cc b/www/iridium/files/patch-chrome_common_chrome__features.cc index 87c61435a02d..4591e746fab7 100644 --- a/www/iridium/files/patch-chrome_common_chrome__features.cc +++ b/www/iridium/files/patch-chrome_common_chrome__features.cc @@ -1,8 +1,8 @@ ---- chrome/common/chrome_features.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/common/chrome_features.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/common/chrome_features.cc -@@ -82,13 +82,13 @@ const base::Feature kAutomaticTabDiscarding{"Automatic - base::FEATURE_ENABLED_BY_DEFAULT}; - #endif // defined(OS_WIN) || defined(OS_MACOSX) +@@ -86,13 +86,13 @@ const base::Feature kAsyncDns { + #endif + }; -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) @@ -14,23 +14,5 @@ -#endif // defined(OS_WIN) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - // Enables or disables whether permission prompts are automatically blocked - // after the user has explicitly dismissed them too many times. -@@ -131,7 +131,7 @@ const base::Feature kThirdPartyModulesBlocking{ - "ThirdPartyModulesBlocking", base::FEATURE_DISABLED_BY_DEFAULT}; - #endif - --#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) - // Enables the dual certificate verification trial feature. - // https://crbug.com/649026 - const base::Feature kCertDualVerificationTrialFeature{ -@@ -195,7 +195,7 @@ const base::Feature kUsageTimeLimitPolicy{"UsageTimeLi - const base::Feature kDesktopPWAWindowing { - "DesktopPWAWindowing", - #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || \ -- defined(OS_MACOSX) -+ defined(OS_MACOSX) || defined(OS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT + // Once the user declines a notification permission prompt in a WebContents, + // automatically dismiss subsequent prompts in the same WebContents, from any diff --git a/www/iridium/files/patch-chrome_common_chrome__features.h b/www/iridium/files/patch-chrome_common_chrome__features.h index 7fda4187540d..d23bca53bf82 100644 --- a/www/iridium/files/patch-chrome_common_chrome__features.h +++ b/www/iridium/files/patch-chrome_common_chrome__features.h @@ -1,8 +1,8 @@ ---- chrome/common/chrome_features.h.orig 2019-03-11 22:00:54 UTC +--- chrome/common/chrome_features.h.orig 2020-03-16 18:40:30 UTC +++ chrome/common/chrome_features.h -@@ -61,10 +61,10 @@ COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kAutomaticTabDiscarding; - #endif // defined(OS_WIN) || defined(OS_MACOSX) +@@ -68,10 +68,10 @@ extern const base::Feature kAppServiceShelf; + + COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) @@ -12,13 +12,4 @@ +#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kBlockPromptsIfDismissedOften; -@@ -81,7 +81,7 @@ extern const base::Feature kBrowserHangFixesExperiment - COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kBundledConnectionHelpFeature; - --#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) - COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kCertDualVerificationTrialFeature; - #endif + extern const base::Feature kBlockRepeatedNotificationPermissionPrompts; diff --git a/www/iridium/files/patch-chrome_common_chrome__paths.cc b/www/iridium/files/patch-chrome_common_chrome__paths.cc index 5fd257b0521b..8f8695168ae5 100644 --- a/www/iridium/files/patch-chrome_common_chrome__paths.cc +++ b/www/iridium/files/patch-chrome_common_chrome__paths.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.cc.orig 2019-04-05 00:49:06 UTC +--- chrome/common/chrome_paths.cc.orig 2020-02-03 21:52:41 UTC +++ chrome/common/chrome_paths.cc -@@ -52,21 +52,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD +@@ -51,21 +51,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer"); #endif @@ -9,12 +9,13 @@ // The path to the external extension <id>.json files. // /usr/share seems like a good choice, see: http://www.pathname.com/fhs/ const base::FilePath::CharType kFilepathSinglePrefExtensions[] = - #if defined(GOOGLE_CHROME_BUILD) - FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) +- FILE_PATH_LITERAL("/usr/share/google-chrome/extensions"); ++ FILE_PATH_LITERAL("/usr/local/share/google-chrome/extensions"); #else - FILE_PATH_LITERAL("/usr/share/chromium/extensions"); + FILE_PATH_LITERAL("/usr/local/share/chromium/extensions"); - #endif // defined(GOOGLE_CHROME_BUILD) + #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) // The path to the hint file that tells the pepper plugin loader // where it can find the latest component updated flash. @@ -23,9 +24,9 @@ -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - #if defined(OS_CHROMEOS) - const base::FilePath::CharType kChromeOSComponentFlash[] = FILE_PATH_LITERAL( -@@ -197,7 +197,7 @@ bool PathProvider(int key, base::FilePath* result) { + #if defined(OS_LINUX) && BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) + // The name of the hint file that tells the latest component updated Widevine +@@ -204,7 +204,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; break; case chrome::DIR_DEFAULT_DOWNLOADS_SAFE: @@ -34,30 +35,26 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -459,10 +459,12 @@ bool PathProvider(int key, base::FilePath* result) { - if (!base::PathExists(cur)) // We don't want to create this - return false; - break; --#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) +@@ -495,6 +495,9 @@ bool PathProvider(int key, base::FilePath* result) { case chrome::DIR_POLICY_FILES: { - #if defined(GOOGLE_CHROME_BUILD) + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); +#elif defined(OS_BSD) -+ cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies")); ++ cur = base::FilePath(FILE_PATH_LITERAL( ++ "/usr/local/etc/chrome/policies")); #else cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); #endif -@@ -470,7 +472,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -502,7 +505,7 @@ bool PathProvider(int key, base::FilePath* result) { } #endif - #if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ -- defined(OS_MACOSX) -+ defined(OS_MACOSX) || defined(OS_BSD) + #if defined(OS_CHROMEOS) || \ +- (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) ++ ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) return false; -@@ -478,7 +480,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -510,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -66,7 +63,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -513,7 +515,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -545,7 +548,7 @@ bool PathProvider(int key, base::FilePath* result) { #endif break; @@ -74,9 +71,9 @@ +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) - #if defined(GOOGLE_CHROME_BUILD) -@@ -527,6 +529,9 @@ bool PathProvider(int key, base::FilePath* result) { - #if defined(GOOGLE_CHROME_BUILD) + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) +@@ -559,6 +562,9 @@ bool PathProvider(int key, base::FilePath* result) { + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); +#elif defined(OS_BSD) @@ -85,7 +82,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -539,7 +544,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -571,7 +577,7 @@ bool PathProvider(int key, base::FilePath* result) { return false; cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts")); break; @@ -94,7 +91,7 @@ #if !defined(OS_ANDROID) case chrome::DIR_GLOBAL_GCM_STORE: if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) -@@ -547,7 +552,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -579,7 +585,7 @@ bool PathProvider(int key, base::FilePath* result) { cur = cur.Append(kGCMStoreDirname); break; #endif // !defined(OS_ANDROID) @@ -103,7 +100,7 @@ case chrome::FILE_COMPONENT_FLASH_HINT: if (!base::PathService::Get( chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) { -@@ -555,7 +560,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -587,7 +593,7 @@ bool PathProvider(int key, base::FilePath* result) { } cur = cur.Append(kComponentUpdatedFlashHint); break; diff --git a/www/iridium/files/patch-chrome_common_chrome__paths.h b/www/iridium/files/patch-chrome_common_chrome__paths.h index 3227f08d0d77..703fb6677e76 100644 --- a/www/iridium/files/patch-chrome_common_chrome__paths.h +++ b/www/iridium/files/patch-chrome_common_chrome__paths.h @@ -1,15 +1,15 @@ ---- chrome/common/chrome_paths.h.orig 2019-04-05 00:49:06 UTC +--- chrome/common/chrome_paths.h.orig 2019-12-16 21:50:44 UTC +++ chrome/common/chrome_paths.h -@@ -51,7 +51,7 @@ enum { - // to set policies for chrome. This directory - // contains subdirectories. +@@ -53,7 +53,7 @@ enum { + // contains subdirectories. #endif --#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \ -+#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) || \ - defined(OS_MACOSX) + #if defined(OS_CHROMEOS) || \ +- (defined(OS_LINUX) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) ++ ((defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(CHROMIUM_BRANDING)) || defined(OS_MACOSX) DIR_USER_EXTERNAL_EXTENSIONS, // Directory for per-user external extensions // on Chrome Mac and Chromium Linux. -@@ -60,7 +60,7 @@ enum { + // On Chrome OS, this path is used for OEM +@@ -61,7 +61,7 @@ enum { // create it. #endif @@ -18,23 +18,23 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -107,7 +107,7 @@ enum { +@@ -122,7 +122,7 @@ enum { DIR_SUPERVISED_USER_INSTALLED_WHITELISTS, // Directory where sanitized // supervised user whitelists are // installed. -#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_MACOSX) - DIR_NATIVE_MESSAGING, // System directory where native messaging host - // manifest files are stored. - DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts -@@ -122,10 +122,10 @@ enum { - DIR_GEN_TEST_DATA, // Directory where generated test data resides. - DIR_TEST_DATA, // Directory where unit test data resides. - DIR_TEST_TOOLS, // Directory where unit test tools reside. ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + DIR_NATIVE_MESSAGING, // System directory where native messaging host + // manifest files are stored. + DIR_USER_NATIVE_MESSAGING, // Directory with Native Messaging Hosts +@@ -137,10 +137,10 @@ enum { + DIR_GEN_TEST_DATA, // Directory where generated test data resides. + DIR_TEST_DATA, // Directory where unit test data resides. + DIR_TEST_TOOLS, // Directory where unit test tools reside. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - FILE_COMPONENT_FLASH_HINT, // A file in a known location that points to - // the component updated flash plugin. + FILE_COMPONENT_FLASH_HINT, // A file in a known location that points to + // the component updated flash plugin. -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_common_chrome__paths__internal.h b/www/iridium/files/patch-chrome_common_chrome__paths__internal.h index 3fb733cf24c3..9bf429302cd3 100644 --- a/www/iridium/files/patch-chrome_common_chrome__paths__internal.h +++ b/www/iridium/files/patch-chrome_common_chrome__paths__internal.h @@ -1,4 +1,4 @@ ---- chrome/common/chrome_paths_internal.h.orig 2019-03-11 22:00:54 UTC +--- chrome/common/chrome_paths_internal.h.orig 2019-07-24 18:58:13 UTC +++ chrome/common/chrome_paths_internal.h @@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi // Get the path to the user's documents directory. diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.cc b/www/iridium/files/patch-chrome_common_chrome__switches.cc index a96bc4f817cf..0cf96df2deef 100644 --- a/www/iridium/files/patch-chrome_common_chrome__switches.cc +++ b/www/iridium/files/patch-chrome_common_chrome__switches.cc @@ -1,17 +1,11 @@ ---- chrome/common/chrome_switches.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/common/chrome_switches.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/common/chrome_switches.cc -@@ -914,12 +914,12 @@ const char kAllowNaClFileHandleAPI[] = "allow-n +@@ -846,7 +846,7 @@ const char kAllowNaClFileHandleAPI[] = "allow-n const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api"; #endif --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - const char kDisableInputImeAPI[] = "disable-input-ime-api"; - const char kEnableInputImeAPI[] = "enable-input-ime-api"; - #endif - -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon"; - #endif + // Causes the browser to launch directly in guest mode. diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.h b/www/iridium/files/patch-chrome_common_chrome__switches.h index fcf6113a2957..957faae8a127 100644 --- a/www/iridium/files/patch-chrome_common_chrome__switches.h +++ b/www/iridium/files/patch-chrome_common_chrome__switches.h @@ -1,17 +1,11 @@ ---- chrome/common/chrome_switches.h.orig 2019-03-11 22:00:54 UTC +--- chrome/common/chrome_switches.h.orig 2020-03-16 18:40:30 UTC +++ chrome/common/chrome_switches.h -@@ -282,12 +282,12 @@ extern const char kAllowNaClFileHandleAPI[]; +@@ -261,7 +261,7 @@ extern const char kAllowNaClFileHandleAPI[]; extern const char kAllowNaClSocketAPI[]; #endif --#if defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - extern const char kDisableInputImeAPI[]; - extern const char kEnableInputImeAPI[]; - #endif - -#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) extern const char kEnableNewAppMenuIcon[]; + extern const char kGuest[]; #endif - diff --git a/www/iridium/files/patch-chrome_common_extensions_api_api__sources.gni b/www/iridium/files/patch-chrome_common_extensions_api_api__sources.gni index 3d9c9f081c82..52d07bac4945 100644 --- a/www/iridium/files/patch-chrome_common_extensions_api_api__sources.gni +++ b/www/iridium/files/patch-chrome_common_extensions_api_api__sources.gni @@ -1,9 +1,9 @@ ---- chrome/common/extensions/api/api_sources.gni.orig 2019-03-11 22:00:54 UTC +--- chrome/common/extensions/api/api_sources.gni.orig 2020-02-03 21:52:41 UTC +++ chrome/common/extensions/api/api_sources.gni -@@ -109,7 +109,7 @@ if (is_chromeos) { - "wallpaper.json", - "wallpaper_private.json", - ] +@@ -113,7 +113,7 @@ if (is_chromeos) { + if (use_cups) { + schema_sources_ += [ "printing.idl" ] + } -} else if (is_linux || is_win) { +} else if (is_linux || is_bsd || is_win) { schema_sources_ += [ "input_ime.json" ] diff --git a/www/iridium/files/patch-chrome_common_extensions_command.cc b/www/iridium/files/patch-chrome_common_extensions_command.cc index f5cea90a6889..d69c38703319 100644 --- a/www/iridium/files/patch-chrome_common_extensions_command.cc +++ b/www/iridium/files/patch-chrome_common_extensions_command.cc @@ -1,6 +1,6 @@ ---- chrome/common/extensions/command.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/common/extensions/command.cc.orig 2019-04-30 22:22:37 UTC +++ chrome/common/extensions/command.cc -@@ -309,7 +309,7 @@ std::string Command::CommandPlatform() { +@@ -300,7 +300,7 @@ std::string Command::CommandPlatform() { return values::kKeybindingPlatformMac; #elif defined(OS_CHROMEOS) return values::kKeybindingPlatformChromeOs; diff --git a/www/iridium/files/patch-chrome_common_features.gni b/www/iridium/files/patch-chrome_common_features.gni index d6696dfe5af4..5af21971a15e 100644 --- a/www/iridium/files/patch-chrome_common_features.gni +++ b/www/iridium/files/patch-chrome_common_features.gni @@ -1,14 +1,14 @@ ---- chrome/common/features.gni.orig 2019-03-11 22:00:54 UTC +--- chrome/common/features.gni.orig 2020-03-16 18:40:30 UTC +++ chrome/common/features.gni -@@ -41,9 +41,9 @@ declare_args() { +@@ -49,9 +49,9 @@ declare_args() { (is_desktop_linux && use_dbus) || is_chromeos enable_one_click_signin = - is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast) + is_win || is_mac || is_bsd || (is_linux && !is_chromeos && !is_chromecast) -- enable_service_discovery = (enable_mdns && !is_android && !is_ios) || is_mac -+ enable_service_discovery = (enable_mdns && !is_android && !is_ios) || is_mac || is_bsd +- enable_service_discovery = (enable_mdns && !is_android) || is_mac ++ enable_service_discovery = (enable_mdns && !is_android) || is_mac || is_bsd # Enables use of the session service, which is enabled by default. # Android stores them separately on the Java side. diff --git a/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc b/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc new file mode 100644 index 000000000000..0f28ca47dca6 --- /dev/null +++ b/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc @@ -0,0 +1,11 @@ +--- chrome/common/media/cdm_host_file_path.cc.orig 2020-03-17 09:44:41 UTC ++++ chrome/common/media/cdm_host_file_path.cc +@@ -98,7 +98,7 @@ void AddCdmHostFilePaths( + cdm_host_file_paths->emplace_back(chrome_framework_path, + chrome_framework_sig_path); + +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + + base::FilePath chrome_exe_dir; + if (!base::PathService::Get(base::DIR_EXE, &chrome_exe_dir)) diff --git a/www/iridium/files/patch-chrome_common_pref__names.cc b/www/iridium/files/patch-chrome_common_pref__names.cc index 9a7e44a3fff7..edf68e0cec56 100644 --- a/www/iridium/files/patch-chrome_common_pref__names.cc +++ b/www/iridium/files/patch-chrome_common_pref__names.cc @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/common/pref_names.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/common/pref_names.cc -@@ -946,7 +946,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y +@@ -1059,7 +1059,7 @@ const char kForceYouTubeRestrict[] = "settings.force_y // only using an account that belongs to one of the domains from this pref. const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps"; @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1038,7 +1038,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1193,7 +1193,7 @@ const char kShowUpdatePromotionInfoBar[] = "browser.show_update_promotion_info_bar"; #endif @@ -18,7 +18,7 @@ // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1419,7 +1419,7 @@ const char kDownloadDefaultDirectory[] = "download.def +@@ -1621,7 +1621,7 @@ const char kDownloadDefaultDirectory[] = "download.def // upgrade a unsafe location to a safe location. const char kDownloadDirUpgraded[] = "download.directory_upgrade"; @@ -27,3 +27,18 @@ const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif +@@ -1917,12 +1917,12 @@ const char kGloballyScopeHTTPAuthCacheEnabled[] = + const char kAmbientAuthenticationInPrivateModesEnabled[] = + "auth.ambient_auth_in_private_modes"; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected + // along with kAuthNegotiateDelegateWhitelist. + const char kAuthNegotiateDelegateByKdcPolicy[] = + "auth.negotiate_delegate_by_kdc_policy"; +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if defined(OS_POSIX) + // Boolean that specifies whether NTLMv2 is enabled. diff --git a/www/iridium/files/patch-chrome_common_pref__names.h b/www/iridium/files/patch-chrome_common_pref__names.h index 4de35f813a85..7f7af0082f1f 100644 --- a/www/iridium/files/patch-chrome_common_pref__names.h +++ b/www/iridium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2019-03-11 22:00:54 UTC +--- chrome/common/pref_names.h.orig 2020-03-16 18:40:30 UTC +++ chrome/common/pref_names.h -@@ -300,7 +300,7 @@ extern const char kMdHistoryMenuPromoShown[]; +@@ -334,7 +334,7 @@ extern const char kHistoryMenuPromoShown[]; extern const char kForceGoogleSafeSearch[]; extern const char kForceYouTubeRestrict[]; extern const char kAllowedDomainsForApps[]; @@ -9,7 +9,7 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -333,7 +333,7 @@ extern const char kDefaultBrowserSettingEnabled[]; +@@ -365,7 +365,7 @@ extern const char kDefaultBrowserSettingEnabled[]; #if defined(OS_MACOSX) extern const char kShowUpdatePromotionInfoBar[]; #endif @@ -18,7 +18,7 @@ extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -487,7 +487,7 @@ extern const char kAppWindowPlacement[]; +@@ -532,7 +532,7 @@ extern const char kAppWindowPlacement[]; extern const char kDownloadDefaultDirectory[]; extern const char kDownloadExtensionsToOpen[]; extern const char kDownloadDirUpgraded[]; @@ -27,3 +27,15 @@ extern const char kOpenPdfDownloadInSystemReader[]; #endif #if defined(OS_ANDROID) +@@ -744,9 +744,9 @@ extern const char kAllowCrossOriginAuthPrompt[]; + extern const char kGloballyScopeHTTPAuthCacheEnabled[]; + extern const char kAmbientAuthenticationInPrivateModesEnabled[]; + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + extern const char kAuthNegotiateDelegateByKdcPolicy[]; +-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if defined(OS_POSIX) + extern const char kNtlmV2Enabled[]; diff --git a/www/iridium/files/patch-chrome_common_webui__url__constants.cc b/www/iridium/files/patch-chrome_common_webui__url__constants.cc index f212e20609c5..c9a01fc94ffe 100644 --- a/www/iridium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/iridium/files/patch-chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/common/webui_url_constants.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/common/webui_url_constants.cc -@@ -246,7 +246,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me +@@ -321,7 +321,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { const char kChromeUICastHost[] = "cast"; #endif @@ -9,21 +9,28 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; const char kChromeUIHatsHost[] = "hats"; -@@ -257,11 +257,11 @@ const char kChromeUIHatsURL[] = "chrome://hats/"; +@@ -332,17 +332,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/"; const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config"; #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) const char kChromeUISandboxHost[] = "sandbox"; #endif + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + const char kChromeUIBrowserSwitchHost[] = "browser-switch"; + const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; + #endif + -#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) -+#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) ++#if ((defined(OS_LINUX) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; #endif -@@ -415,13 +415,13 @@ const char* const kChromeHostURLs[] = { +@@ -608,13 +608,13 @@ const char* const kChromeHostURLs[] = { kChromeUIInternetDetailDialogHost, kChromeUIAssistantOptInHost, #endif @@ -34,8 +41,8 @@ #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) kChromeUILinuxProxyConfigHost, #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) kChromeUISandboxHost, #endif #if defined(OS_WIN) diff --git a/www/iridium/files/patch-chrome_common_webui__url__constants.h b/www/iridium/files/patch-chrome_common_webui__url__constants.h index 2fd054c9aa0e..dc27881da387 100644 --- a/www/iridium/files/patch-chrome_common_webui__url__constants.h +++ b/www/iridium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2019-03-11 22:00:54 UTC +--- chrome/common/webui_url_constants.h.orig 2020-03-16 18:40:30 UTC +++ chrome/common/webui_url_constants.h -@@ -241,7 +241,7 @@ extern const char kChromeUIMetroFlowURL[]; +@@ -275,7 +275,7 @@ bool IsSystemWebUIHost(base::StringPiece host); extern const char kChromeUICastHost[]; #endif @@ -9,17 +9,24 @@ extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; extern const char kChromeUIHatsHost[]; -@@ -253,11 +253,11 @@ extern const char kChromeUIHatsURL[]; +@@ -287,17 +287,17 @@ extern const char kChromeUIHatsURL[]; extern const char kChromeUILinuxProxyConfigHost[]; #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) extern const char kChromeUISandboxHost[]; #endif + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + extern const char kChromeUIBrowserSwitchHost[]; + extern const char kChromeUIBrowserSwitchURL[]; + #endif + -#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) -+#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) ++#if ((defined(OS_LINUX) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA) extern const char kChromeUITabModalConfirmDialogHost[]; #endif diff --git a/www/iridium/files/patch-chrome_renderer_chrome__content__renderer__client.cc b/www/iridium/files/patch-chrome_renderer_chrome__content__renderer__client.cc index ccb3ec50ca26..e6be28220164 100644 --- a/www/iridium/files/patch-chrome_renderer_chrome__content__renderer__client.cc +++ b/www/iridium/files/patch-chrome_renderer_chrome__content__renderer__client.cc @@ -1,11 +1,11 @@ ---- chrome/renderer/chrome_content_renderer_client.cc.orig 2019-03-17 20:22:37 UTC +--- chrome/renderer/chrome_content_renderer_client.cc.orig 2020-03-16 18:40:30 UTC +++ chrome/renderer/chrome_content_renderer_client.cc -@@ -1012,7 +1012,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( +@@ -1053,7 +1053,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( } case chrome::mojom::PluginStatus::kRestartRequired: { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - placeholder = create_blocked_plugin( - IDR_BLOCKED_PLUGIN_HTML, - l10n_util::GetStringFUTF16(IDS_PLUGIN_RESTART_REQUIRED, + placeholder = + create_blocked_plugin(IDR_BLOCKED_PLUGIN_HTML, + l10n_util::GetStringFUTF16( diff --git a/www/iridium/files/patch-chrome_test_BUILD.gn b/www/iridium/files/patch-chrome_test_BUILD.gn index daae8086939d..67e371b45b43 100644 --- a/www/iridium/files/patch-chrome_test_BUILD.gn +++ b/www/iridium/files/patch-chrome_test_BUILD.gn @@ -1,8 +1,8 @@ ---- chrome/test/BUILD.gn.orig 2019-04-05 00:49:07 UTC +--- chrome/test/BUILD.gn.orig 2020-03-16 18:40:30 UTC +++ chrome/test/BUILD.gn -@@ -5232,7 +5232,7 @@ test("chrome_app_unittests") { - "//components/crash/core/common", - "//components/flags_ui:switches", +@@ -6042,7 +6042,7 @@ test("chrome_app_unittests") { + "//components/safe_browsing:buildflags", + "//components/tracing", ] - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { diff --git a/www/iridium/files/patch-chrome_test_base_chrome__test__launcher.cc b/www/iridium/files/patch-chrome_test_base_chrome__test__launcher.cc new file mode 100644 index 000000000000..d09f2d1d0fd1 --- /dev/null +++ b/www/iridium/files/patch-chrome_test_base_chrome__test__launcher.cc @@ -0,0 +1,20 @@ +--- chrome/test/base/chrome_test_launcher.cc.orig 2020-04-06 07:46:40 UTC ++++ chrome/test/base/chrome_test_launcher.cc +@@ -59,7 +59,7 @@ + #endif + + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #include "chrome/browser/first_run/scoped_relaunch_chrome_browser_override.h" + #include "testing/gtest/include/gtest/gtest.h" + #endif +@@ -221,7 +221,7 @@ int LaunchChromeTests(size_t parallel_jobs, + } + + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // Cause a test failure for any test that triggers an unexpected relaunch. + // Tests that fail here should likely be restructured to put the "before + // relaunch" code into a PRE_ test with its own diff --git a/www/iridium/files/patch-chrome_test_base_in__process__browser__test.cc b/www/iridium/files/patch-chrome_test_base_in__process__browser__test.cc index 46364dec4660..f4de4bb39b0c 100644 --- a/www/iridium/files/patch-chrome_test_base_in__process__browser__test.cc +++ b/www/iridium/files/patch-chrome_test_base_in__process__browser__test.cc @@ -1,6 +1,6 @@ ---- chrome/test/base/in_process_browser_test.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/test/base/in_process_browser_test.cc.orig 2020-04-03 04:11:30 UTC +++ chrome/test/base/in_process_browser_test.cc -@@ -74,6 +74,10 @@ +@@ -77,6 +77,10 @@ #include "chrome/test/base/scoped_bundle_swizzler_mac.h" #endif @@ -11,7 +11,7 @@ #if defined(OS_WIN) #include "base/win/scoped_com_initializer.h" #include "base/win/windows_version.h" -@@ -102,7 +106,7 @@ +@@ -104,7 +108,7 @@ #include "ui/events/test/event_generator.h" #endif // defined(OS_CHROMEOS) @@ -20,3 +20,21 @@ #include "ui/views/test/test_desktop_screen_x11.h" #endif +@@ -253,7 +257,7 @@ void InProcessBrowserTest::SetUp() { + // Cookies). Without this on Mac and Linux, many tests will hang waiting for a + // user to approve KeyChain/kwallet access. On Windows this is not needed as + // OS APIs never block. +-#if defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + OSCryptMocker::SetUp(); + #endif + +@@ -308,7 +312,7 @@ void InProcessBrowserTest::TearDown() { + com_initializer_.reset(); + #endif + BrowserTestBase::TearDown(); +-#if defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + OSCryptMocker::TearDown(); + #endif + diff --git a/www/iridium/files/patch-chrome_test_base_interactive__ui__tests__main.cc b/www/iridium/files/patch-chrome_test_base_interactive__ui__tests__main.cc new file mode 100644 index 000000000000..f80c31dcc8d4 --- /dev/null +++ b/www/iridium/files/patch-chrome_test_base_interactive__ui__tests__main.cc @@ -0,0 +1,25 @@ +--- chrome/test/base/interactive_ui_tests_main.cc.orig 2020-04-06 07:47:38 UTC ++++ chrome/test/base/interactive_ui_tests_main.cc +@@ -16,7 +16,7 @@ + #if defined(USE_AURA) + #include "ui/aura/test/ui_controls_factory_aura.h" + #include "ui/base/test/ui_controls_aura.h" +-#if defined(USE_OZONE) && defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(USE_OZONE) && ((defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)) + #include "ui/ozone/public/ozone_platform.h" + #endif + #if defined(USE_X11) +@@ -54,11 +54,11 @@ class InteractiveUITestSuite : public ChromeTestSuite + com_initializer_.reset(new base::win::ScopedCOMInitializer()); + ui_controls::InstallUIControlsAura( + aura::test::CreateUIControlsAura(nullptr)); +-#elif defined(USE_OZONE) && defined(OS_LINUX) ++#elif defined(USE_OZONE) && (defined(OS_LINUX) || defined(OS_BSD)) + ui::OzonePlatform::InitParams params; + params.single_process = true; + ui::OzonePlatform::InitializeForUI(params); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + ui_controls::InstallUIControlsAura( + views::test::CreateUIControlsDesktopAura()); + #else diff --git a/www/iridium/files/patch-chrome_test_base_test__browser__window.h b/www/iridium/files/patch-chrome_test_base_test__browser__window.h new file mode 100644 index 000000000000..842f9dd09dd2 --- /dev/null +++ b/www/iridium/files/patch-chrome_test_base_test__browser__window.h @@ -0,0 +1,11 @@ +--- chrome/test/base/test_browser_window.h.orig 2020-04-06 07:48:42 UTC ++++ chrome/test/base/test_browser_window.h +@@ -178,7 +178,7 @@ class TestBrowserWindow : public BrowserWindow { + bool is_source_keyboard) override {} + + #if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \ +- defined(OS_LINUX) ++ defined(OS_LINUX) || defined(OS_BSD) + void ShowHatsBubble(const std::string& site_id) override {} + #endif + diff --git a/www/iridium/files/patch-chrome_test_base_testing__browser__process.h b/www/iridium/files/patch-chrome_test_base_testing__browser__process.h index c60b12af1029..97a81118bddd 100644 --- a/www/iridium/files/patch-chrome_test_base_testing__browser__process.h +++ b/www/iridium/files/patch-chrome_test_base_testing__browser__process.h @@ -1,8 +1,8 @@ ---- chrome/test/base/testing_browser_process.h.orig 2019-03-11 22:00:54 UTC +--- chrome/test/base/testing_browser_process.h.orig 2019-09-09 21:55:11 UTC +++ chrome/test/base/testing_browser_process.h -@@ -119,8 +119,8 @@ class TestingBrowserProcess : public BrowserProcess { - DownloadStatusUpdater* download_status_updater() override; +@@ -116,8 +116,8 @@ class TestingBrowserProcess : public BrowserProcess { DownloadRequestLimiter* download_request_limiter() override; + StartupData* startup_data() override; -#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - void StartAutoupdateTimer() override {} @@ -10,4 +10,4 @@ + void StartAutoupdateTimer() /*override*/ {} #endif - net_log::ChromeNetLog* net_log() override; + component_updater::ComponentUpdateService* component_updater() override; diff --git a/www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc b/www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc new file mode 100644 index 000000000000..79b4cc08b788 --- /dev/null +++ b/www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc @@ -0,0 +1,13 @@ +--- chrome/test/chromedriver/chrome_launcher.cc.orig 2020-03-16 18:40:30 UTC ++++ chrome/test/chromedriver/chrome_launcher.cc +@@ -69,6 +69,10 @@ + #include "chrome/test/chromedriver/keycode_text_conversion.h" + #endif + ++#if defined(OS_BSD) ++#include <sys/wait.h> ++#endif ++ + namespace { + + const char* const kCommonSwitches[] = { diff --git a/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc index abae565184f1..1aa645203816 100644 --- a/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc +++ b/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2019-03-11 22:00:54 UTC +--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2020-02-24 18:39:10 UTC +++ chrome/test/chromedriver/chrome/chrome_finder.cc -@@ -48,7 +48,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l +@@ -50,7 +50,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l installation_locations[i].Append(L"Chromium\\Application")); } } @@ -9,12 +9,12 @@ void GetApplicationDirs(std::vector<base::FilePath>* locations) { // TODO: Respect users' PATH variables. // Until then, we use an approximation of the most common defaults. -@@ -135,7 +135,7 @@ bool FindChrome(base::FilePath* browser_exe) { - #elif defined(OS_MACOSX) - base::FilePath("Google Chrome.app/Contents/MacOS/Google Chrome"), - base::FilePath("Chromium.app/Contents/MacOS/Chromium") +@@ -136,7 +136,7 @@ bool FindChrome(base::FilePath* browser_exe) { + #if defined(OS_WIN) || defined(OS_MACOSX) + base::FilePath(chrome::kBrowserProcessExecutablePath), + base::FilePath(chrome::kBrowserProcessExecutablePathChromium) -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - base::FilePath("google-chrome"), - base::FilePath("chrome"), - base::FilePath("chromium"), + base::FilePath("google-chrome"), + base::FilePath(chrome::kBrowserProcessExecutablePath), + base::FilePath(chrome::kBrowserProcessExecutablePathChromium), diff --git a/www/iridium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc b/www/iridium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc new file mode 100644 index 000000000000..81970dcbbec1 --- /dev/null +++ b/www/iridium/files/patch-chrome_test_chromedriver_key__converter__unittest.cc @@ -0,0 +1,38 @@ +--- chrome/test/chromedriver/key_converter_unittest.cc.orig 2020-03-23 14:46:39 UTC ++++ chrome/test/chromedriver/key_converter_unittest.cc +@@ -278,7 +278,7 @@ TEST(KeyConverter, AllShorthandKeys) { + ->Generate(&key_events); + builder.Generate(&key_events); + builder.SetKeyCode(ui::VKEY_TAB); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + builder.SetText("\t", "\t")->Generate(&key_events); + #else + builder.SetText(std::string(), std::string()); +@@ -286,7 +286,7 @@ TEST(KeyConverter, AllShorthandKeys) { + key_events.push_back(builder.SetType(kKeyUpEventType)->Build()); + #endif + builder.SetKeyCode(ui::VKEY_BACK); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + builder.SetText("\b", "\b")->Generate(&key_events); + #else + builder.SetText(std::string(), std::string()); +@@ -297,7 +297,7 @@ TEST(KeyConverter, AllShorthandKeys) { + CheckEventsReleaseModifiers("\n\r\n\t\b ", key_events); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Fails on bots: crbug.com/174962 + #define MAYBE_AllEnglishKeyboardSymbols DISABLED_AllEnglishKeyboardSymbols + #else +@@ -354,7 +354,7 @@ TEST(KeyConverter, AllEnglishKeyboardTextChars) { + TEST(KeyConverter, AllSpecialWebDriverKeysOnEnglishKeyboard) { + ui::ScopedKeyboardLayout keyboard_layout(ui::KEYBOARD_LAYOUT_ENGLISH_US); + const char kTextForKeys[] = { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + 0, 0, 0, 0, '\t', 0, '\r', '\r', 0, 0, 0, 0, 0, + #else + 0, 0, 0, 0, 0, 0, '\r', '\r', 0, 0, 0, 0, 0, diff --git a/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc index a665fc7ccd3b..06032792b186 100644 --- a/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,7 +1,7 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2019-03-11 22:00:56 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2020-03-16 18:40:30 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -66,7 +66,7 @@ - #include "ui/compositor/compositor_switches.h" +@@ -74,7 +74,7 @@ + #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" -#if defined(OS_LINUX) @@ -9,7 +9,25 @@ #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> -@@ -244,7 +244,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -263,7 +263,7 @@ class CastViewsDelegate : public views::ViewsDelegate + + #endif // defined(USE_AURA) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + + base::FilePath GetApplicationFontsDir() { + std::unique_ptr<base::Environment> env(base::Environment::Create()); +@@ -279,7 +279,7 @@ base::FilePath GetApplicationFontsDir() { + } + } + +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + } // namespace + +@@ -308,7 +308,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // defined(OS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) @@ -18,12 +36,21 @@ #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -393,7 +393,7 @@ void CastBrowserMainParts::PostMainMessageLoopStart() - } +@@ -318,7 +318,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { + {switches::kEnableHardwareOverlays, "cast"}, + #endif + #endif +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + // It's better to start GPU process on demand. For example, for TV platforms + // cast starts in background and can't render until TV switches to cast + // input. +@@ -459,7 +459,7 @@ void CastBrowserMainParts::ToolkitInitialized() { + views_delegate_ = std::make_unique<CastViewsDelegate>(); + #endif // defined(USE_AURA) - void CastBrowserMainParts::ToolkitInitialized() { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // Without this call, the FontConfig library gets implicitly initialized - // on the first call to FontConfig. Since it's not safe to initialize it - // concurrently from multiple threads, we explicitly initialize it here + base::FilePath dir_font = GetApplicationFontsDir(); + const FcChar8 *dir_font_char8 = reinterpret_cast<const FcChar8*>(dir_font.value().data()); + if (!FcConfigAppFontAddDir(gfx::GetGlobalFontConfig(), dir_font_char8)) { diff --git a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc index 16182b516e4f..ceca4fa67274 100644 --- a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,11 +1,11 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2019-03-11 22:00:56 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2020-03-16 18:40:30 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -524,7 +524,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -448,7 +448,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // Necessary for accelerated 2d canvas. By default on Linux, Chromium assumes - // GLES2 contexts can be lost to a power-save mode, which breaks GPU canvas - // apps. + // Necessary for accelerated 2d canvas. By default on Linux, Chromium + // assumes GLES2 contexts can be lost to a power-save mode, which breaks GPU + // canvas apps. diff --git a/www/iridium/files/patch-chromecast_browser_metrics_BUILD.gn b/www/iridium/files/patch-chromecast_browser_metrics_BUILD.gn new file mode 100644 index 000000000000..e3c84406e9bf --- /dev/null +++ b/www/iridium/files/patch-chromecast_browser_metrics_BUILD.gn @@ -0,0 +1,11 @@ +--- chromecast/browser/metrics/BUILD.gn.orig 2019-07-24 18:58:17 UTC ++++ chromecast/browser/metrics/BUILD.gn +@@ -32,7 +32,7 @@ cast_source_set("metrics") { + "//third_party/metrics_proto", + ] + +- if (is_linux) { ++ if (is_linux || is_bsd) { + sources += [ + "external_metrics.cc", + "external_metrics.h", diff --git a/www/iridium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc b/www/iridium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc new file mode 100644 index 000000000000..381734887dcb --- /dev/null +++ b/www/iridium/files/patch-chromecast_external__mojo_public_cpp_external__mojo__broker.cc @@ -0,0 +1,20 @@ +--- chromecast/external_mojo/public/cpp/external_mojo_broker.cc.orig 2020-02-03 21:52:43 UTC ++++ chromecast/external_mojo/public/cpp/external_mojo_broker.cc +@@ -7,7 +7,7 @@ + #include <map> + #include <utility> + +-#if OS_LINUX ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <sys/stat.h> + #endif + +@@ -393,7 +393,7 @@ ExternalMojoBroker::ExternalMojoBroker(const std::stri + named_channel.TakeServerEndpoint(); + DCHECK(server_endpoint.is_valid()); + +-#if OS_LINUX ++#if defined(OS_LINUX) || defined(OS_BSD) + chmod(broker_path.c_str(), 0770); + #endif + diff --git a/www/iridium/files/patch-chromecast_media_base_monotonic__clock.cc b/www/iridium/files/patch-chromecast_media_base_monotonic__clock.cc new file mode 100644 index 000000000000..d141e1f0a1cb --- /dev/null +++ b/www/iridium/files/patch-chromecast_media_base_monotonic__clock.cc @@ -0,0 +1,23 @@ +--- chromecast/media/base/monotonic_clock.cc.orig 2019-10-30 15:55:35 UTC ++++ chromecast/media/base/monotonic_clock.cc +@@ -9,9 +9,9 @@ + #include "base/time/time.h" + #include "build/build_config.h" + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + #include "chromecast/media/base/buildflags.h" +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_FUCHSIA) + #include <zircon/syscalls.h> +@@ -20,7 +20,7 @@ + namespace chromecast { + namespace media { + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + int64_t MonotonicClockNow() { + timespec now = {0, 0}; + #if BUILDFLAG(MEDIA_CLOCK_MONOTONIC_RAW) diff --git a/www/iridium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc b/www/iridium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc deleted file mode 100644 index ae7b2dfdab4a..000000000000 --- a/www/iridium/files/patch-chromecast_media_cma_backend_media__pipeline__backend__for__mixer.cc +++ /dev/null @@ -1,23 +0,0 @@ ---- chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc.orig 2019-03-17 18:44:55 UTC -+++ chromecast/media/cma/backend/media_pipeline_backend_for_mixer.cc -@@ -14,9 +14,9 @@ - #include "chromecast/media/cma/backend/av_sync.h" - #include "chromecast/media/cma/backend/video_decoder_for_mixer.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "chromecast/media/cma/backend/audio_buildflags.h" --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - #if defined(OS_FUCHSIA) - #include <zircon/syscalls.h> -@@ -226,7 +226,7 @@ MediaPipelineBackendForMixer::GetTaskRunner() const { - return static_cast<TaskRunnerImpl*>(params_.task_runner)->runner(); - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - int64_t MediaPipelineBackendForMixer::MonotonicClockNow() const { - timespec now = {0, 0}; - #if BUILDFLAG(MEDIA_CLOCK_MONOTONIC_RAW) diff --git a/www/iridium/files/patch-chromecast_renderer_cast__content__renderer__client.cc b/www/iridium/files/patch-chromecast_renderer_cast__content__renderer__client.cc new file mode 100644 index 000000000000..079d79856b84 --- /dev/null +++ b/www/iridium/files/patch-chromecast_renderer_cast__content__renderer__client.cc @@ -0,0 +1,11 @@ +--- chromecast/renderer/cast_content_renderer_client.cc.orig 2020-03-17 09:46:13 UTC ++++ chromecast/renderer/cast_content_renderer_client.cc +@@ -208,7 +208,7 @@ void CastContentRendererClient::RenderFrameCreated( + dispatcher->OnRenderFrameCreated(render_frame); + #endif + +-#if defined(OS_LINUX) && defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + // JsChannelBindings destroys itself when the RenderFrame is destroyed. + JsChannelBindings::Create(render_frame); + #endif diff --git a/www/iridium/files/patch-components_autofill__strings.grdp b/www/iridium/files/patch-components_autofill__strings.grdp deleted file mode 100644 index 44b96476a5a2..000000000000 --- a/www/iridium/files/patch-components_autofill__strings.grdp +++ /dev/null @@ -1,11 +0,0 @@ ---- components/autofill_strings.grdp.orig 2019-03-11 22:00:56 UTC -+++ components/autofill_strings.grdp -@@ -217,7 +217,7 @@ - <message name="IDS_AUTOFILL_NAME_FIX_FLOW_PROMPT_SAVE_CARD" desc="Text to show for the Autofill save credit card prompt card holder name fix flow button." formatter_data="android_java"> - Save card - </message> -- <if expr="is_linux and not chromeos"> -+ <if expr="is_posix and not chromeos"> - <then> - <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD" desc="Title text for the Autofill save card prompt when the card is to be saved by uploading it to Google Payments and also saved locally. The prompt can be either a bubble or an infobar."> - Do you want to save this card to your Google Account? diff --git a/www/iridium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc b/www/iridium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc index 4ea93ce1bac1..f9da88b9683c 100644 --- a/www/iridium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc +++ b/www/iridium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc @@ -1,6 +1,6 @@ ---- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2019-03-11 22:00:56 UTC +--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig 2019-12-16 21:50:45 UTC +++ components/autofill/content/renderer/password_form_conversion_utils.cc -@@ -37,7 +37,11 @@ +@@ -19,7 +19,11 @@ #include "third_party/blink/public/web/web_form_control_element.h" #include "third_party/blink/public/web/web_input_element.h" #include "third_party/blink/public/web/web_local_frame.h" @@ -11,4 +11,4 @@ +#endif #include "url/gurl.h" - using blink::WebFormControlElement; + using blink::WebElement; diff --git a/www/iridium/files/patch-components_autofill_core_browser_autofill__experiments.cc b/www/iridium/files/patch-components_autofill_core_browser_autofill__experiments.cc index 63f7feda9982..294953ed5551 100644 --- a/www/iridium/files/patch-components_autofill_core_browser_autofill__experiments.cc +++ b/www/iridium/files/patch-components_autofill_core_browser_autofill__experiments.cc @@ -1,24 +1,6 @@ ---- components/autofill/core/browser/autofill_experiments.cc.orig 2019-03-11 22:00:56 UTC +--- components/autofill/core/browser/autofill_experiments.cc.orig 2019-12-16 21:50:45 UTC +++ components/autofill/core/browser/autofill_experiments.cc -@@ -28,7 +28,7 @@ - - namespace autofill { - --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - const base::Feature kAutofillDropdownLayoutExperiment{ - "AutofillDropdownLayout", base::FEATURE_DISABLED_BY_DEFAULT}; - const char kAutofillDropdownLayoutParameterName[] = "variant"; -@@ -36,7 +36,7 @@ const char kAutofillDropdownLayoutParameterLeadingIcon - const char kAutofillDropdownLayoutParameterTrailingIcon[] = "trailing-icon"; - const char kAutofillDropdownLayoutParameterTwoLinesLeadingIcon[] = - "two-lines-leading-icon"; --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - - bool IsCreditCardUploadEnabled(const PrefService* pref_service, - const syncer::SyncService* sync_service, -@@ -143,7 +143,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna +@@ -233,7 +233,7 @@ bool IsAutofillNoLocalSaveOnUploadSuccessExperimentEna } bool OfferStoreUnmaskedCards(bool is_off_the_record) { @@ -27,20 +9,3 @@ // The checkbox can be forced on with a flag, but by default we don't store // on Linux due to lack of system keychain integration. See crbug.com/162735 return base::CommandLine::ForCurrentProcess()->HasSwitch( -@@ -181,7 +181,7 @@ bool ShouldUseActiveSignedInAccount() { - features::kAutofillGetPaymentsIdentityFromSync); - } - --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - ForcedPopupLayoutState GetForcedPopupLayoutState() { - if (!base::FeatureList::IsEnabled( - autofill::kAutofillDropdownLayoutExperiment)) -@@ -205,6 +205,6 @@ ForcedPopupLayoutState GetForcedPopupLayoutState() { - NOTREACHED(); - return ForcedPopupLayoutState::kDefault; - } --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - - } // namespace autofill diff --git a/www/iridium/files/patch-components_autofill_core_browser_autofill__experiments.h b/www/iridium/files/patch-components_autofill_core_browser_autofill__experiments.h deleted file mode 100644 index b7727fba91a8..000000000000 --- a/www/iridium/files/patch-components_autofill_core_browser_autofill__experiments.h +++ /dev/null @@ -1,36 +0,0 @@ ---- components/autofill/core/browser/autofill_experiments.h.orig 2019-03-11 22:00:56 UTC -+++ components/autofill/core/browser/autofill_experiments.h -@@ -23,13 +23,13 @@ class SyncService; - namespace autofill { - - // Parameterized Features (grouped with parameter name and options) --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - extern const base::Feature kAutofillDropdownLayoutExperiment; - extern const char kAutofillDropdownLayoutParameterName[]; - extern const char kAutofillDropdownLayoutParameterLeadingIcon[]; - extern const char kAutofillDropdownLayoutParameterTrailingIcon[]; - extern const char kAutofillDropdownLayoutParameterTwoLinesLeadingIcon[]; --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - - // Returns true if uploading credit cards to Wallet servers is enabled. This - // requires the appropriate flags and user settings to be true and the user to -@@ -59,7 +59,7 @@ bool OfferStoreUnmaskedCards(bool is_off_the_record); - // Returns whether the account of the active signed-in user should be used. - bool ShouldUseActiveSignedInAccount(); - --#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - enum class ForcedPopupLayoutState { - kDefault, // No popup layout forced by experiment. - kLeadingIcon, // Experiment forces leading (left in LTR) icon layout. -@@ -73,7 +73,7 @@ enum class ForcedPopupLayoutState { - // if the experiment param matches kAutofillDropdownLayoutParameterLeadingIcon - // or kAutofillDropdownLayoutParameterTrailingIcon, respectively. - ForcedPopupLayoutState GetForcedPopupLayoutState(); --#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD) - - } // namespace autofill - diff --git a/www/iridium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc b/www/iridium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc new file mode 100644 index 000000000000..25ba63628ba8 --- /dev/null +++ b/www/iridium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc @@ -0,0 +1,11 @@ +--- components/autofill/core/browser/autofill_external_delegate.cc.orig 2020-03-16 18:40:30 UTC ++++ components/autofill/core/browser/autofill_external_delegate.cc +@@ -118,7 +118,7 @@ void AutofillExternalDelegate::OnSuggestionsReturned( + + // Append the "Hide Suggestions" menu item for only Autofill Address and + // Autocomplete popups. +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + if (base::FeatureList::IsEnabled( + features::kAutofillEnableHideSuggestionsUI)) { diff --git a/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc new file mode 100644 index 000000000000..76d3e7dee3ed --- /dev/null +++ b/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -0,0 +1,15 @@ +--- components/autofill/core/browser/personal_data_manager.cc.orig 2020-03-16 18:40:30 UTC ++++ components/autofill/core/browser/personal_data_manager.cc +@@ -1856,10 +1856,10 @@ bool PersonalDataManager::IsServerCard(const CreditCar + + bool PersonalDataManager::ShouldShowCardsFromAccountOption() const { + // The feature is only for Linux, Windows and Mac. +-#if (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX)) || \ ++#if (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD)) || \ + defined(OS_CHROMEOS) + return false; +-#endif // (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX)) || ++#endif // (!defined(OS_LINUX) && !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_BSD)) || + // defined(OS_CHROMEOS) + + // This option should only be shown for users that have not enabled the Sync diff --git a/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc new file mode 100644 index 000000000000..016f6de85d3c --- /dev/null +++ b/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -0,0 +1,11 @@ +--- components/autofill/core/common/autofill_payments_features.cc.orig 2020-03-16 18:40:30 UTC ++++ components/autofill/core/common/autofill_payments_features.cc +@@ -122,7 +122,7 @@ const base::Feature kAutofillUpstreamEditableExpiratio + + bool ShouldShowImprovedUserConsentForCreditCardSave() { + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // The new user consent UI is fully launched on MacOS, Windows and Linux. + return true; + #endif diff --git a/www/iridium/files/patch-components_autofill_core_common_autofill__util.cc b/www/iridium/files/patch-components_autofill_core_common_autofill__util.cc index 2b810cc6850d..f4cdea27b407 100644 --- a/www/iridium/files/patch-components_autofill_core_common_autofill__util.cc +++ b/www/iridium/files/patch-components_autofill_core_common_autofill__util.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_util.cc.orig 2019-03-11 22:00:56 UTC +--- components/autofill/core/common/autofill_util.cc.orig 2019-09-09 21:55:14 UTC +++ components/autofill/core/common/autofill_util.cc -@@ -203,7 +203,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value +@@ -213,7 +213,7 @@ bool SanitizedFieldIsEmpty(const base::string16& value } bool ShouldAutoselectFirstSuggestionOnArrowDown() { diff --git a/www/iridium/files/patch-components_crash_content_app_BUILD.gn b/www/iridium/files/patch-components_crash_content_app_BUILD.gn index 84201e8fd7e3..2d01264b0bad 100644 --- a/www/iridium/files/patch-components_crash_content_app_BUILD.gn +++ b/www/iridium/files/patch-components_crash_content_app_BUILD.gn @@ -1,13 +1,12 @@ ---- components/crash/content/app/BUILD.gn.orig 2019-03-11 22:00:56 UTC +--- components/crash/content/app/BUILD.gn.orig 2020-03-16 18:40:30 UTC +++ components/crash/content/app/BUILD.gn -@@ -36,12 +36,12 @@ static_library("app") { - sources += [ "crashpad.cc" ] - } +@@ -49,17 +49,20 @@ static_library("app") { + "crashpad_win.cc", + ] -- if (is_android || (is_linux && !is_chromeos)) { -+ if (is_android || (is_linux && !is_chromeos && !is_bsd)) { - set_sources_assignment_filter([]) - sources += [ "crashpad_linux.cc" ] +- if (is_mac || is_win || is_android || is_linux) { ++ if ((is_mac || is_win || is_android || is_linux) && !is_bsd) { + sources += [ "crashpad.cc" ] } - if (is_linux) { @@ -15,15 +14,39 @@ sources += [ "breakpad_linux.cc", "breakpad_linux.h", -@@ -79,7 +79,10 @@ static_library("app") { - "//third_party/crashpad/crashpad/snapshot", + "breakpad_linux_impl.h", ] + } ++ if (is_bsd) { ++ sources -= [ "crashpad_linux.cc" ] ++ } + + defines = [ "CRASH_IMPLEMENTATION" ] + +@@ -69,7 +72,7 @@ static_library("app") { + "//build:branding_buildflags", + ] + +- if (is_mac || is_win || is_android || is_linux) { ++ if ((is_mac || is_win || is_android || is_linux) && !is_bsd) { + deps += [ + "//third_party/crashpad/crashpad/client", + "//third_party/crashpad/crashpad/util", +@@ -95,7 +98,7 @@ static_library("app") { + ] + } -- if (is_linux) { -+ if (is_bsd) { -+ deps -= [ "//third_party/crashpad/crashpad/snapshot" ] -+ } -+ if (is_linux && !is_bsd) { - deps += [ "//third_party/breakpad:client" ] - } +- if (is_linux) { ++ if (is_linux && !is_bsd) { + deps += [ "//third_party/breakpad:client" ] + } + +@@ -126,7 +129,7 @@ static_library("app") { + libs = [ "log" ] + } + +- if (is_linux) { ++ if (is_linux && !is_bsd) { + data_deps = [ "//third_party/crashpad/crashpad/handler:crashpad_handler" ] } + } diff --git a/www/iridium/files/patch-components_crash_content_app_crashpad.cc b/www/iridium/files/patch-components_crash_content_app_crashpad.cc index d0641d172733..f709f5f3087d 100644 --- a/www/iridium/files/patch-components_crash_content_app_crashpad.cc +++ b/www/iridium/files/patch-components_crash_content_app_crashpad.cc @@ -1,6 +1,6 @@ ---- components/crash/content/app/crashpad.cc.orig 2019-03-11 22:00:56 UTC +--- components/crash/content/app/crashpad.cc.orig 2019-04-30 22:22:41 UTC +++ components/crash/content/app/crashpad.cc -@@ -102,6 +102,12 @@ void InitializeCrashpadImpl(bool initial_client, +@@ -104,6 +104,12 @@ void InitializeCrashpadImpl(bool initial_client, const base::FilePath& exe_path, const std::vector<std::string>& initial_arguments, bool embedded_handler) { @@ -13,7 +13,7 @@ static bool initialized = false; DCHECK(!initialized); initialized = true; -@@ -122,7 +128,7 @@ void InitializeCrashpadImpl(bool initial_client, +@@ -124,7 +130,7 @@ void InitializeCrashpadImpl(bool initial_client, DCHECK(browser_process || process_type == "Chrome Installer" || process_type == "notification-helper" || process_type == "GCPW Installer" || process_type == "GCPW DLL"); @@ -22,7 +22,7 @@ DCHECK(browser_process); #else #error Port. -@@ -187,7 +193,7 @@ void InitializeCrashpadImpl(bool initial_client, +@@ -192,7 +198,7 @@ void InitializeCrashpadImpl(bool initial_client, // other "main, first process" to initialize things. There is no "relauncher" // on Windows, so this is synonymous with initial_client. const bool should_initialize_database_and_set_upload_policy = initial_client; @@ -31,7 +31,7 @@ const bool should_initialize_database_and_set_upload_policy = browser_process; #endif if (should_initialize_database_and_set_upload_policy) { -@@ -267,7 +273,9 @@ bool GetUploadsEnabled() { +@@ -272,7 +278,9 @@ bool GetUploadsEnabled() { #if !defined(OS_ANDROID) void DumpWithoutCrashing() { diff --git a/www/iridium/files/patch-components_crash_content_app_crashpad.h b/www/iridium/files/patch-components_crash_content_app_crashpad.h new file mode 100644 index 000000000000..caf10f1a4f6a --- /dev/null +++ b/www/iridium/files/patch-components_crash_content_app_crashpad.h @@ -0,0 +1,66 @@ +--- components/crash/content/app/crashpad.h.orig 2019-12-19 16:46:22 UTC ++++ components/crash/content/app/crashpad.h +@@ -22,7 +22,7 @@ + #include <windows.h> + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <signal.h> + #endif + +@@ -37,7 +37,7 @@ class CrashReportDatabase; + + namespace crash_reporter { + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // TODO(jperaza): Remove kEnableCrashpad and IsCrashpadEnabled() when Crashpad + // is fully enabled on Linux. + extern const char kEnableCrashpad[]; +@@ -146,11 +146,11 @@ void RequestSingleCrashUpload(const std::string& local + + void DumpWithoutCrashing(); + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + // Logs message and immediately crashes the current process without triggering a + // crash dump. + void CrashWithoutDumping(const std::string& message); +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + + // Returns the Crashpad database path, only valid in the browser. + base::FilePath GetCrashpadDatabasePath(); +@@ -188,7 +188,7 @@ bool DumpWithoutCrashingForClient(CrashReporterClient* + void WhitelistMemoryRange(void* begin, size_t size); + #endif // OS_ANDROID + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Install a handler that gets a chance to handle faults before Crashpad. This + // is used by V8 for trap-based bounds checks. + void SetFirstChanceExceptionHandler(bool (*handler)(int, siginfo_t*, void*)); +@@ -196,7 +196,7 @@ void SetFirstChanceExceptionHandler(bool (*handler)(in + // Gets the socket and process ID of the Crashpad handler connected to this + // process, valid if this function returns `true`. + bool GetHandlerSocket(int* sock, pid_t* pid); +-#endif // OS_LINUX ++#endif // OS_LINUX || OS_BSD + + namespace internal { + +@@ -212,11 +212,11 @@ DWORD WINAPI DumpProcessForHungInputThread(void* param + + #endif // defined(OS_WIN) + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + // Starts the handler process with an initial client connected on fd. + // Returns `true` on success. + bool StartHandlerForClient(int fd); +-#endif // OS_LINUX || OS_ANDROID ++#endif // OS_LINUX || OS_ANDROID || OS_BSD + + // The platform-specific portion of InitializeCrashpad(). On Windows, if + // |user_data_dir| is non-empty, the user data directory will be passed to the diff --git a/www/iridium/files/patch-components_crash_content_app_crashpad__linux.cc b/www/iridium/files/patch-components_crash_content_app_crashpad__linux.cc new file mode 100644 index 000000000000..20d5d6295eb7 --- /dev/null +++ b/www/iridium/files/patch-components_crash_content_app_crashpad__linux.cc @@ -0,0 +1,24 @@ +--- components/crash/content/app/crashpad_linux.cc.orig 2020-03-16 18:39:48 UTC ++++ components/crash/content/app/crashpad_linux.cc +@@ -5,7 +5,9 @@ + #include "components/crash/content/app/crashpad.h" + + #include <pthread.h> ++#if !defined(OS_BSD) + #include <sys/prctl.h> ++#endif + + #include <limits> + +@@ -67,9 +69,11 @@ void SetPtracerAtFork() { + if (!GetHandlerSocket(nullptr, &pid)) { + return; + } ++#if !defined(OS_BSD) + if (pid > 0 && prctl(PR_SET_PTRACER, pid, 0, 0, 0) != 0) { + PLOG(ERROR) << "prctl"; + } ++#endif + } + + namespace internal { diff --git a/www/iridium/files/patch-components_crash_core_common_BUILD.gn b/www/iridium/files/patch-components_crash_core_common_BUILD.gn index 39279777640b..b7c5ab969a32 100644 --- a/www/iridium/files/patch-components_crash_core_common_BUILD.gn +++ b/www/iridium/files/patch-components_crash_core_common_BUILD.gn @@ -1,6 +1,6 @@ ---- components/crash/core/common/BUILD.gn.orig 2019-03-11 22:00:56 UTC +--- components/crash/core/common/BUILD.gn.orig 2020-03-16 18:39:48 UTC +++ components/crash/core/common/BUILD.gn -@@ -6,7 +6,7 @@ import("//build/buildflag_header.gni") +@@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn declare_args() { # If set to true, this will stub out and disable the entire crash key system. @@ -9,20 +9,23 @@ } group("common") { -@@ -89,7 +89,6 @@ target(crash_key_target_type, "crash_key") { +@@ -104,7 +104,9 @@ target(crash_key_target_type, "crash_key_lib") { ] } - deps += [ "//third_party/breakpad:client" ] - } - } - -@@ -144,7 +143,7 @@ source_set("unit_tests") { ++ if (!is_bsd) { ++ deps += [ "//third_party/breakpad:client" ] ++ } + if (use_combined_annotations) { + public_deps += [ "//third_party/crashpad/crashpad/client" ] + } +@@ -167,7 +169,7 @@ source_set("unit_tests") { sources += [ "objc_zombie_unittest.mm" ] } -- if (!is_mac && !is_win && !is_fuchsia && !is_android) { -+ if (!is_mac && !is_win && !is_fuchsia && !is_android && !is_bsd) { +- if (!is_mac && !is_ios && !is_win && !is_fuchsia && !is_android) { ++ if (!is_mac && !is_ios && !is_win && !is_fuchsia && !is_android && !is_bsd) { include_dirs = [ "//third_party/breakpad/breakpad/src/" ] sources += [ "crash_key_breakpad_unittest.cc" ] } diff --git a/www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc b/www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc new file mode 100644 index 000000000000..def54d6eaffa --- /dev/null +++ b/www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc @@ -0,0 +1,20 @@ +--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2020-03-16 18:40:30 UTC ++++ components/discardable_memory/service/discardable_shared_memory_manager.cc +@@ -33,7 +33,7 @@ + #include "components/discardable_memory/common/discardable_shared_memory_heap.h" + #include "mojo/public/cpp/bindings/self_owned_receiver.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/files/file_path.h" + #include "base/files/file_util.h" + #include "base/metrics/histogram_macros.h" +@@ -182,7 +182,7 @@ int64_t GetDefaultMemoryLimit() { + max_default_memory_limit /= 8; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + base::FilePath shmem_dir; + if (base::GetShmemTempDir(false, &shmem_dir)) { + int64_t shmem_dir_amount_of_free_space = diff --git a/www/iridium/files/patch-components_download_internal_common_base__file.cc b/www/iridium/files/patch-components_download_internal_common_base__file.cc index c1b465c08211..dbb0a0dd18dd 100644 --- a/www/iridium/files/patch-components_download_internal_common_base__file.cc +++ b/www/iridium/files/patch-components_download_internal_common_base__file.cc @@ -1,11 +1,20 @@ ---- components/download/internal/common/base_file.cc.orig 2019-03-11 22:00:56 UTC +--- components/download/internal/common/base_file.cc.orig 2019-12-16 21:50:45 UTC +++ components/download/internal/common/base_file.cc -@@ -446,7 +446,7 @@ DownloadInterruptReason BaseFile::LogInterruptReason( - return reason; - } +@@ -603,7 +603,7 @@ GURL GetEffectiveAuthorityURL(const GURL& source_url, + + } // namespace -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - namespace { + DownloadInterruptReason BaseFile::AnnotateWithSourceInformationSync( + const std::string& client_guid, +@@ -621,7 +621,7 @@ DownloadInterruptReason BaseFile::AnnotateWithSourceIn + return QuarantineFileResultToReason(result); + } +-#else // !OS_WIN && !OS_MACOSX && !OS_LINUX ++#else // !OS_WIN && !OS_MACOSX && !OS_LINUX && !OS_BSD + DownloadInterruptReason BaseFile::AnnotateWithSourceInformationSync( + const std::string& client_guid, + const GURL& source_url, diff --git a/www/iridium/files/patch-components_download_quarantine_quarantine__linux.cc b/www/iridium/files/patch-components_download_quarantine_quarantine__linux.cc deleted file mode 100644 index 01a891ce5421..000000000000 --- a/www/iridium/files/patch-components_download_quarantine_quarantine__linux.cc +++ /dev/null @@ -1,36 +0,0 @@ ---- components/download/quarantine/quarantine_linux.cc.orig 2019-03-11 22:00:56 UTC -+++ components/download/quarantine/quarantine_linux.cc -@@ -2,11 +2,15 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include "build/build_config.h" -+ - #include "components/download/quarantine/quarantine.h" - - #include <stddef.h> - #include <sys/types.h> -+#if !defined(OS_BSD) - #include <sys/xattr.h> -+#endif - - #include "base/files/file_path.h" - #include "base/logging.h" -@@ -25,7 +29,7 @@ bool SetExtendedFileAttribute(const char* path, - int flags) { - // On Chrome OS, there is no component that can validate these extended - // attributes so there is no need to set them. --#if !defined(OS_CHROMEOS) -+#if !defined(OS_CHROMEOS) && !defined(OS_BSD) - base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK); - int result = setxattr(path, name, value, value_size, flags); - if (result) { -@@ -33,7 +37,7 @@ bool SetExtendedFileAttribute(const char* path, - << path; - return false; - } --#endif // !defined(OS_CHROMEOS) -+#endif // !defined(OS_CHROMEOS) && !defined(OS_BSD) - return true; - } - diff --git a/www/iridium/files/patch-components_download_quarantine_test__support__linux.cc b/www/iridium/files/patch-components_download_quarantine_test__support__linux.cc deleted file mode 100644 index e49bc39198d3..000000000000 --- a/www/iridium/files/patch-components_download_quarantine_test__support__linux.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- components/download/quarantine/test_support_linux.cc.orig 2019-03-11 22:00:56 UTC -+++ components/download/quarantine/test_support_linux.cc -@@ -21,6 +21,7 @@ namespace download { - namespace { - - std::string GetExtendedFileAttribute(const char* path, const char* name) { -+#if !defined(OS_BSD) - base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK); - ssize_t len = getxattr(path, name, nullptr, 0); - if (len <= 0) -@@ -31,6 +32,9 @@ std::string GetExtendedFileAttribute(const char* path, - if (len < static_cast<ssize_t>(buffer.size())) - return std::string(); - return std::string(buffer.begin(), buffer.end()); -+#else -+ return std::string(); -+#endif // !defined(OS_BSD) - } - - } // namespace diff --git a/www/iridium/files/patch-components_feature__engagement_public_event__constants.cc b/www/iridium/files/patch-components_feature__engagement_public_event__constants.cc index e8252eefd572..ea4af4e91c50 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_event__constants.cc +++ b/www/iridium/files/patch-components_feature__engagement_public_event__constants.cc @@ -1,14 +1,27 @@ ---- components/feature_engagement/public/event_constants.cc.orig 2019-03-11 22:00:56 UTC +--- components/feature_engagement/public/event_constants.cc.orig 2020-02-03 21:52:44 UTC +++ components/feature_engagement/public/event_constants.cc -@@ -26,9 +26,9 @@ const char kReopenTabConditionsMet[] = "reopen_tab_con - const char kTabReopened[] = "tab_reopened"; - #endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP) +@@ -12,12 +12,12 @@ namespace feature_engagement { + namespace events { --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) || defined(OS_BSD) + #if defined(OS_IOS) || defined(OS_WIN) || defined(OS_MACOSX) || \ +- defined(OS_LINUX) || defined(OS_CHROMEOS) ++ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) const char kNewTabOpened[] = "new_tab_opened"; --#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) || defined(OS_BSD) + #endif // defined(OS_IOS) || defined(OS_WIN) || defined(OS_MACOSX) || +- // defined(OS_LINUX) || defined(OS_CHROMEOS) ++ // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + const char kReopenTabConditionsMet[] = "reopen_tab_conditions_met"; + const char kTabReopened[] = "tab_reopened"; +@@ -42,7 +42,7 @@ const char kIncognitoWindowOpened[] = "incognito_windo + const char kIncognitoWindowSessionTimeMet[] = + "incognito_window_session_time_met"; + #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) #if defined(OS_IOS) - const char kChromeOpened[] = "chrome_opened"; diff --git a/www/iridium/files/patch-components_feature__engagement_public_event__constants.h b/www/iridium/files/patch-components_feature__engagement_public_event__constants.h index 6fea1eadd62f..96b274df41fb 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_event__constants.h +++ b/www/iridium/files/patch-components_feature__engagement_public_event__constants.h @@ -1,20 +1,30 @@ ---- components/feature_engagement/public/event_constants.h.orig 2019-03-11 22:00:56 UTC +--- components/feature_engagement/public/event_constants.h.orig 2020-02-03 21:52:44 UTC +++ components/feature_engagement/public/event_constants.h -@@ -49,7 +49,7 @@ extern const char kReopenTabConditionsMet[]; - extern const char kTabReopened[]; - #endif // BUILDFLAG(ENABLE_DESKTOP_IN_PRODUCT_HELP) +@@ -14,15 +14,15 @@ namespace events { --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) || defined(OS_BSD) - // This event is included in the deferred onboarding events for the New Tab - // described above, but it is also used on iOS, so it must be compiled - // separately. -@@ -57,7 +57,7 @@ extern const char kTabReopened[]; + // Desktop and IOS. + #if defined(OS_IOS) || defined(OS_WIN) || defined(OS_MACOSX) || \ +- defined(OS_LINUX) || defined(OS_CHROMEOS) ++ defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // The user has explicitly opened a new tab via an entry point from inside of // Chrome. extern const char kNewTabOpened[]; --#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) -+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_IOS) || defined(OS_BSD) + #endif // defined(OS_IOS) || defined(OS_WIN) || defined(OS_MACOSX) || +- // defined(OS_LINUX) || defined(OS_CHROMEOS) ++ // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + // Desktop +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + // All conditions for reopen closed tab IPH were met. Since this IPH needs to + // track user events (opening/closing tabs, focusing the omnibox, etc) on the +@@ -80,7 +80,7 @@ extern const char kIncognitoWindowOpened[]; + extern const char kIncognitoWindowSessionTimeMet[]; + #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) + +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) #if defined(OS_IOS) - // The user has opened Chrome (cold start or from background). diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc new file mode 100644 index 000000000000..699be09ed7b4 --- /dev/null +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -0,0 +1,20 @@ +--- components/feature_engagement/public/feature_constants.cc.orig 2020-02-03 21:53:30 UTC ++++ components/feature_engagement/public/feature_constants.cc +@@ -14,7 +14,7 @@ const base::Feature kIPHDemoMode{"IPH_DemoMode", + const base::Feature kIPHDummyFeature{"IPH_Dummy", + base::FEATURE_DISABLED_BY_DEFAULT}; + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + const base::Feature kIPHFocusModeFeature{"IPH_FocusMode", + base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -33,7 +33,7 @@ const base::Feature kIPHIncognitoWindowFeature{ + const base::Feature kIPHNewTabFeature{"IPH_NewTab", + base::FEATURE_DISABLED_BY_DEFAULT}; + #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + #if defined(OS_ANDROID) diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h new file mode 100644 index 000000000000..415b6f1d8c71 --- /dev/null +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h @@ -0,0 +1,20 @@ +--- components/feature_engagement/public/feature_constants.h.orig 2020-02-03 21:53:30 UTC ++++ components/feature_engagement/public/feature_constants.h +@@ -17,7 +17,7 @@ extern const base::Feature kIPHDemoMode; + // A feature to ensure all arrays can contain at least one feature. + extern const base::Feature kIPHDummyFeature; + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + extern const base::Feature kIPHFocusModeFeature; + extern const base::Feature kIPHGlobalMediaControlsFeature; +@@ -29,7 +29,7 @@ extern const base::Feature kIPHBookmarkFeature; + extern const base::Feature kIPHIncognitoWindowFeature; + extern const base::Feature kIPHNewTabFeature; + #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IPH) +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + // All the features declared for Android below that are also used in Java, diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc new file mode 100644 index 000000000000..6bfd36f75f8d --- /dev/null +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc @@ -0,0 +1,20 @@ +--- components/feature_engagement/public/feature_list.cc.orig 2020-03-16 18:39:48 UTC ++++ components/feature_engagement/public/feature_list.cc +@@ -58,7 +58,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHBadgedReadingListFeature, + &kIPHBadgedTranslateManualTriggerFeature, + #endif // defined(OS_IOS) +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + &kIPHFocusModeFeature, + &kIPHGlobalMediaControlsFeature, +@@ -69,7 +69,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHIncognitoWindowFeature, + &kIPHNewTabFeature, + #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + }; + } // namespace diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__list.h b/www/iridium/files/patch-components_feature__engagement_public_feature__list.h new file mode 100644 index 000000000000..246d10568f99 --- /dev/null +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__list.h @@ -0,0 +1,38 @@ +--- components/feature_engagement/public/feature_list.h.orig 2020-03-16 18:39:48 UTC ++++ components/feature_engagement/public/feature_list.h +@@ -111,7 +111,7 @@ DEFINE_VARIATION_PARAM(kIPHBadgedTranslateManualTrigge + "IPH_BadgedTranslateManualTrigger"); + #endif // defined(OS_IOS) + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode"); + DEFINE_VARIATION_PARAM(kIPHGlobalMediaControls, "IPH_GlobalMediaControls"); +@@ -122,7 +122,7 @@ DEFINE_VARIATION_PARAM(kIPHBookmarkFeature, "IPH_Bookm + DEFINE_VARIATION_PARAM(kIPHIncognitoWindowFeature, "IPH_IncognitoWindow"); + DEFINE_VARIATION_PARAM(kIPHNewTabFeature, "IPH_NewTab"); + #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + + } // namespace +@@ -172,7 +172,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHNewIncognitoTabTipFeature), + VARIATION_ENTRY(kIPHBadgedReadingListFeature), + VARIATION_ENTRY(kIPHBadgedTranslateManualTriggerFeature), +-#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#elif defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) + VARIATION_ENTRY(kIPHFocusModeFeature), + VARIATION_ENTRY(kIPHGlobalMediaControls), +@@ -183,7 +183,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHIncognitoWindowFeature), + VARIATION_ENTRY(kIPHNewTabFeature), + #endif // BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP) +-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || ++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || + // defined(OS_CHROMEOS) + }; + diff --git a/www/iridium/files/patch-components_feedback_anonymizer__tool.cc b/www/iridium/files/patch-components_feedback_anonymizer__tool.cc index 56186203822c..ec853d75bd26 100644 --- a/www/iridium/files/patch-components_feedback_anonymizer__tool.cc +++ b/www/iridium/files/patch-components_feedback_anonymizer__tool.cc @@ -1,7 +1,7 @@ ---- components/feedback/anonymizer_tool.cc.orig 2019-03-11 22:00:56 UTC +--- components/feedback/anonymizer_tool.cc.orig 2020-03-16 18:40:30 UTC +++ components/feedback/anonymizer_tool.cc -@@ -13,7 +13,11 @@ - #include "base/strings/stringprintf.h" +@@ -15,7 +15,11 @@ + #include "base/threading/thread_restrictions.h" #include "content/public/browser/browser_thread.h" #include "net/base/ip_address.h" +#if defined(OS_BSD) diff --git a/www/iridium/files/patch-components_flags__ui_flags__state.cc b/www/iridium/files/patch-components_flags__ui_flags__state.cc index a2dbc0a29a13..fdaa3f2f453c 100644 --- a/www/iridium/files/patch-components_flags__ui_flags__state.cc +++ b/www/iridium/files/patch-components_flags__ui_flags__state.cc @@ -1,6 +1,6 @@ ---- components/flags_ui/flags_state.cc.orig 2019-03-11 22:00:56 UTC +--- components/flags_ui/flags_state.cc.orig 2020-02-03 21:53:30 UTC +++ components/flags_ui/flags_state.cc -@@ -618,7 +618,7 @@ int FlagsState::GetCurrentPlatform() { +@@ -693,7 +693,7 @@ int FlagsState::GetCurrentPlatform() { return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; diff --git a/www/iridium/files/patch-components_gcm__driver_gcm__client.h b/www/iridium/files/patch-components_gcm__driver_gcm__client.h index 25e9740ff93f..d40f905a889e 100644 --- a/www/iridium/files/patch-components_gcm__driver_gcm__client.h +++ b/www/iridium/files/patch-components_gcm__driver_gcm__client.h @@ -1,6 +1,6 @@ ---- components/gcm_driver/gcm_client.h.orig 2019-03-11 22:00:56 UTC +--- components/gcm_driver/gcm_client.h.orig 2020-02-03 21:53:30 UTC +++ components/gcm_driver/gcm_client.h -@@ -85,6 +85,7 @@ class GCMClient { +@@ -87,6 +87,7 @@ class GCMClient { PLATFORM_CROS, PLATFORM_IOS, PLATFORM_ANDROID, diff --git a/www/iridium/files/patch-components_gcm__driver_gcm__client__impl.cc b/www/iridium/files/patch-components_gcm__driver_gcm__client__impl.cc index b74cc52fc72f..52e43837a5bd 100644 --- a/www/iridium/files/patch-components_gcm__driver_gcm__client__impl.cc +++ b/www/iridium/files/patch-components_gcm__driver_gcm__client__impl.cc @@ -1,6 +1,6 @@ ---- components/gcm_driver/gcm_client_impl.cc.orig 2019-03-11 22:00:56 UTC +--- components/gcm_driver/gcm_client_impl.cc.orig 2020-02-03 21:53:30 UTC +++ components/gcm_driver/gcm_client_impl.cc -@@ -150,6 +150,9 @@ void ToCheckinProtoVersion( +@@ -135,6 +135,9 @@ void ToCheckinProtoVersion( case GCMClient::PLATFORM_CROS: platform = checkin_proto::ChromeBuildProto_Platform_PLATFORM_CROS; break; diff --git a/www/iridium/files/patch-components_metrics_BUILD.gn b/www/iridium/files/patch-components_metrics_BUILD.gn index 48f72989095e..b89758947847 100644 --- a/www/iridium/files/patch-components_metrics_BUILD.gn +++ b/www/iridium/files/patch-components_metrics_BUILD.gn @@ -1,6 +1,6 @@ ---- components/metrics/BUILD.gn.orig 2019-03-11 22:00:56 UTC +--- components/metrics/BUILD.gn.orig 2020-03-16 18:40:30 UTC +++ components/metrics/BUILD.gn -@@ -143,6 +143,11 @@ jumbo_static_library("metrics") { +@@ -173,6 +173,11 @@ jumbo_static_library("metrics") { if (is_fuchsia) { sources += [ "drive_metrics_provider_fuchsia.cc" ] } @@ -11,4 +11,4 @@ + } - # The component metrics provider is a separate target because it depends upon + if (is_android) { diff --git a/www/iridium/files/patch-components_metrics_metrics__log.cc b/www/iridium/files/patch-components_metrics_metrics__log.cc index 2c387d6b45ee..22cb98c234a2 100644 --- a/www/iridium/files/patch-components_metrics_metrics__log.cc +++ b/www/iridium/files/patch-components_metrics_metrics__log.cc @@ -1,6 +1,6 @@ ---- components/metrics/metrics_log.cc.orig 2019-03-17 18:40:58 UTC +--- components/metrics/metrics_log.cc.orig 2019-10-21 19:06:29 UTC +++ components/metrics/metrics_log.cc -@@ -198,7 +198,7 @@ void MetricsLog::RecordCoreSystemProfile(MetricsServic +@@ -202,7 +202,7 @@ void MetricsLog::RecordCoreSystemProfile( // OperatingSystemVersion refers to the ChromeOS release version. #if defined(OS_CHROMEOS) os->set_kernel_version(base::SysInfo::KernelVersion()); diff --git a/www/iridium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc b/www/iridium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc index e7fb3cdd8939..1cb338f7464b 100644 --- a/www/iridium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc +++ b/www/iridium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc @@ -1,4 +1,4 @@ ---- components/metrics/system_memory_stats_recorder_linux.cc.orig 2019-03-11 22:00:56 UTC +--- components/metrics/system_memory_stats_recorder_linux.cc.orig 2019-09-09 21:55:14 UTC +++ components/metrics/system_memory_stats_recorder_linux.cc @@ -30,6 +30,7 @@ namespace metrics { UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50) @@ -8,7 +8,7 @@ base::SystemMemoryInfoKB memory; if (!base::GetSystemMemoryInfo(&memory)) return; -@@ -93,6 +94,7 @@ void RecordMemoryStats(RecordMemoryStatsType type) { +@@ -81,6 +82,7 @@ void RecordMemoryStats(RecordMemoryStatsType type) { break; } } diff --git a/www/iridium/files/patch-components_neterror_resources_neterror.js b/www/iridium/files/patch-components_neterror_resources_neterror.js index 7a5d6317acba..07a9dedb488d 100644 --- a/www/iridium/files/patch-components_neterror_resources_neterror.js +++ b/www/iridium/files/patch-components_neterror_resources_neterror.js @@ -1,9 +1,9 @@ ---- components/neterror/resources/neterror.js.orig 2019-03-11 22:00:56 UTC +--- components/neterror/resources/neterror.js.orig 2020-02-03 21:53:30 UTC +++ components/neterror/resources/neterror.js -@@ -166,7 +166,7 @@ function setUpCachedButton(buttonStrings) { +@@ -201,7 +201,7 @@ function setUpCachedButton(buttonStrings) { } - var primaryControlOnLeft = true; + let primaryControlOnLeft = true; -// <if expr="is_macosx or is_ios or is_linux or is_android"> +// <if expr="is_macosx or is_ios or is_linux or is_android or is_bsd"> primaryControlOnLeft = false; diff --git a/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc index 03b0cb2986a0..658b31ad44fb 100644 --- a/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc +++ b/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc @@ -1,6 +1,6 @@ ---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2019-03-11 22:00:56 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2020-03-16 18:40:30 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -662,7 +662,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -718,7 +718,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } #endif // #if !defined(OS_ANDROID) diff --git a/www/iridium/files/patch-components_new__or__sad__tab__strings.grdp b/www/iridium/files/patch-components_new__or__sad__tab__strings.grdp index d017cf36031e..015ca5836d21 100644 --- a/www/iridium/files/patch-components_new__or__sad__tab__strings.grdp +++ b/www/iridium/files/patch-components_new__or__sad__tab__strings.grdp @@ -1,4 +1,4 @@ ---- components/new_or_sad_tab_strings.grdp.orig 2019-03-11 22:00:56 UTC +--- components/new_or_sad_tab_strings.grdp.orig 2020-03-16 18:40:30 UTC +++ components/new_or_sad_tab_strings.grdp @@ -51,7 +51,7 @@ Open page in a new Incognito window (⇧⌘N) @@ -9,7 +9,7 @@ <message name="IDS_SAD_TAB_RELOAD_INCOGNITO" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to open the web page in Chrome's Incognito mode."> Open page in a new Incognito window (Ctrl-Shift-N) </message> -@@ -69,7 +69,7 @@ +@@ -66,7 +66,7 @@ Close other tabs or apps </message> </if> @@ -18,7 +18,7 @@ <message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other Chrome tabs or programs running on their computer."> Close other tabs or programs </message> -@@ -79,7 +79,7 @@ +@@ -76,7 +76,7 @@ Close other apps </message> </if> @@ -27,7 +27,7 @@ <message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other programs running on their computer (Linux)."> Close other programs </message> -@@ -94,7 +94,7 @@ +@@ -91,7 +91,7 @@ Restart Chromium </message> </if> @@ -36,3 +36,12 @@ <message name="IDS_SAD_TAB_RELOAD_RESTART_DEVICE" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to restart their computer."> Restart your computer </message> +@@ -106,7 +106,7 @@ + Learn more + </message> + </if> +- <if expr="is_win or is_linux or is_macosx or chromeos"> ++ <if expr="is_win or is_posix or is_macosx or chromeos"> + <message name="IDS_SAD_TAB_ERROR_CODE" desc="The message displayed on the crashed web page indicating the type of the crash."> + Error code: <ph name="ERROR_CODE">$1<ex>STATUS_ACCESS_VIOLATION</ex></ph> + </message> diff --git a/www/iridium/files/patch-components_os__crypt_os__crypt.h b/www/iridium/files/patch-components_os__crypt_os__crypt.h index 6b62d0377822..f9e601a9a454 100644 --- a/www/iridium/files/patch-components_os__crypt_os__crypt.h +++ b/www/iridium/files/patch-components_os__crypt_os__crypt.h @@ -1,4 +1,4 @@ ---- components/os_crypt/os_crypt.h.orig 2019-03-11 22:00:56 UTC +--- components/os_crypt/os_crypt.h.orig 2020-02-03 21:53:30 UTC +++ components/os_crypt/os_crypt.h @@ -15,9 +15,9 @@ #include "base/strings/string16.h" @@ -10,7 +10,7 @@ -#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) +#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - #if defined(OS_MACOSX) && !defined(OS_IOS) + #if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS)) class PrefRegistrySimple; @@ -34,13 +34,13 @@ struct Config; // true for Linux, if a password management tool is available. @@ -29,7 +29,7 @@ // On Linux returns true iff the real secret key (not hardcoded one) is // available. On MacOS returns true if Keychain is available (for mock // Keychain it returns true if not using locked Keychain, false if using -@@ -112,7 +112,7 @@ class OSCrypt { +@@ -131,7 +131,7 @@ class OSCrypt { DISALLOW_IMPLICIT_CONSTRUCTORS(OSCrypt); }; @@ -38,7 +38,7 @@ // For unit testing purposes, inject methods to be used. // |get_key_storage_mock| provides the desired |KeyStorage| implementation. // If the provider returns |nullptr|, a hardcoded password will be used. -@@ -127,6 +127,6 @@ void UseMockKeyStorageForTesting( +@@ -146,6 +146,6 @@ void UseMockKeyStorageForTesting( // Clears any caching and most lazy initialisations performed by the production // code. Should be used after any test which required a password. COMPONENT_EXPORT(OS_CRYPT) void ClearCacheForTesting(); diff --git a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc index 8e2191d4bc74..06a59baab59d 100644 --- a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc +++ b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc @@ -1,4 +1,4 @@ ---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2019-03-11 22:00:56 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2020-02-03 21:52:44 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc @@ -16,7 +16,7 @@ #include <wincred.h> @@ -9,8 +9,8 @@ #include <pwd.h> #include <sys/types.h> #include <unistd.h> -@@ -28,7 +28,7 @@ - #include <sys/sysctl.h> +@@ -31,7 +31,7 @@ + #import <SystemConfiguration/SCDynamicStoreCopySpecific.h> #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -18,7 +18,7 @@ #include <limits.h> // For HOST_NAME_MAX #endif -@@ -52,7 +52,7 @@ +@@ -60,7 +60,7 @@ #include "base/system/sys_info.h" #endif @@ -27,7 +27,7 @@ #include "base/system/sys_info.h" #endif -@@ -61,11 +61,24 @@ namespace policy { +@@ -69,11 +69,24 @@ namespace policy { namespace em = enterprise_management; std::string GetMachineName() { @@ -51,18 +51,18 @@ + } + return std::string(); #elif defined(OS_MACOSX) - // Do not use NSHost currentHost, as it's very slow. http://crbug.com/138570 - SCDynamicStoreContext context = {0, NULL, NULL, NULL}; -@@ -111,7 +124,7 @@ std::string GetMachineName() { + // TODO(crbug.com/1024115): Find a different replacement for -[NSHost + // currentHost] on iOS. +@@ -123,7 +136,7 @@ std::string GetMachineName() { } std::string GetOSVersion() { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_MACOSX) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) return base::SysInfo::OperatingSystemVersion(); #elif defined(OS_WIN) base::win::OSInfo::VersionNumber version_number = -@@ -134,7 +147,7 @@ std::string GetOSArchitecture() { +@@ -146,7 +159,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { diff --git a/www/iridium/files/patch-components_policy_resources_policy__templates.json b/www/iridium/files/patch-components_policy_resources_policy__templates.json index 354bf7e0992c..5eca40e4b2ae 100644 --- a/www/iridium/files/patch-components_policy_resources_policy__templates.json +++ b/www/iridium/files/patch-components_policy_resources_policy__templates.json @@ -1,16 +1,16 @@ ---- components/policy/resources/policy_templates.json.orig 2019-03-11 22:00:56 UTC +--- components/policy/resources/policy_templates.json.orig 2020-03-16 18:40:31 UTC +++ components/policy/resources/policy_templates.json -@@ -956,7 +956,7 @@ - 'name': 'HomepageLocation', +@@ -1088,7 +1088,7 @@ + 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, -- 'supported_on': ['chrome.*:8-', 'chrome_os:11-'], -+ 'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'chrome.freebsd:9-'], +- 'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'android:81-'], ++ 'supported_on': ['chrome.*:8-', 'chrome_os:11-', 'android:81-', 'chrome.freebsd:9-'], 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -983,7 +983,7 @@ - 'name': 'HomepageIsNewTabPage', +@@ -1118,7 +1118,7 @@ + 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.*:8-', 'chrome_os:11-'], @@ -18,8 +18,8 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1009,7 +1009,7 @@ - 'name': 'NewTabPageLocation', +@@ -1145,7 +1145,7 @@ + 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, - 'supported_on': ['chrome.*:58-', 'chrome_os:58-'], @@ -27,8 +27,8 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -1702,7 +1702,7 @@ - 'name': 'RemoteAccessHostMatchUsername', +@@ -1944,7 +1944,7 @@ + 'owners': ['jamiewalch@chromium.org', 'rkjnsn@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.linux:25-', 'chrome.mac:25-', 'chrome_os:42-'], @@ -36,8 +36,8 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -3192,7 +3192,7 @@ - 'name': 'GSSAPILibraryName', +@@ -3807,7 +3807,7 @@ + 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'string', 'schema': { 'type': 'string' }, - 'supported_on': ['chrome.linux:9-'], @@ -45,8 +45,8 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -3244,7 +3244,7 @@ - 'name': 'NtlmV2Enabled', +@@ -3861,7 +3861,7 @@ + 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.linux:63-','chrome.mac:63-','chrome_os:63-','android:63-','webview_android:63-'], @@ -54,8 +54,8 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -6303,7 +6303,7 @@ - 'name': 'RequireOnlineRevocationChecksForLocalAnchors', +@@ -7329,7 +7329,7 @@ + 'owners': ['file://src/net/cert/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'], @@ -63,8 +63,8 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -7433,7 +7433,7 @@ - 'name': 'BackgroundModeEnabled', +@@ -8621,7 +8621,7 @@ + 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win:19-', 'chrome.linux:19-'], @@ -72,8 +72,8 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -7948,7 +7948,7 @@ - 'name': 'FullscreenAllowed', +@@ -9297,7 +9297,7 @@ + 'owners': ['file://components/policy/resources/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-'], diff --git a/www/iridium/files/patch-components_policy_tools_generate__policy__source.py b/www/iridium/files/patch-components_policy_tools_generate__policy__source.py index 33c7fd91658e..0274c627676a 100644 --- a/www/iridium/files/patch-components_policy_tools_generate__policy__source.py +++ b/www/iridium/files/patch-components_policy_tools_generate__policy__source.py @@ -1,20 +1,19 @@ ---- components/policy/tools/generate_policy_source.py.orig 2019-03-11 22:00:57 UTC +--- components/policy/tools/generate_policy_source.py.orig 2020-02-03 21:53:30 UTC +++ components/policy/tools/generate_policy_source.py -@@ -86,7 +86,7 @@ class PolicyDetails: - if platform not in [ - 'chrome_frame', 'chrome_os', 'android', 'webview_android', - 'chrome.win', 'chrome.linux', 'chrome.mac', 'chrome.fuchsia', -- 'chrome.*' -+ 'chrome.freebsd', 'chrome.*' +@@ -97,6 +97,7 @@ class PolicyDetails: + 'chrome.linux', + 'chrome.mac', + 'chrome.fuchsia', ++ 'chrome.freebsd', + 'chrome.*', + 'chrome.win7', ]: - raise RuntimeError('Platform "%s" is not supported' % platform) - -@@ -105,7 +105,7 @@ class PolicyDetails: +@@ -119,7 +120,7 @@ class PolicyDetails: if platform.startswith('chrome.'): platform_sub = platform[7:] if platform_sub == '*': - self.platforms.extend(['win', 'mac', 'linux', 'fuchsia']) + self.platforms.extend(['win', 'mac', 'linux', 'fuchsia', 'freebsd']) + elif platform_sub == 'win7': + self.platforms.append('win') else: - self.platforms.append(platform_sub) - else: diff --git a/www/iridium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc b/www/iridium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc new file mode 100644 index 000000000000..b9eaf2aa1e95 --- /dev/null +++ b/www/iridium/files/patch-components_security__interstitials_content_captive__portal__blocking__page.cc @@ -0,0 +1,11 @@ +--- components/security_interstitials/content/captive_portal_blocking_page.cc.orig 2020-03-16 18:39:49 UTC ++++ components/security_interstitials/content/captive_portal_blocking_page.cc +@@ -106,7 +106,7 @@ std::string CaptivePortalBlockingPage::GetWiFiSSID() c + wifi_service->GetConnectedNetworkSSID(&ssid, &error); + if (!error.empty()) + return std::string(); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + ssid = net::GetWifiSSID(); + #elif defined(OS_ANDROID) + ssid = net::android::GetWifiSSID(); diff --git a/www/iridium/files/patch-components_services_filesystem_file__system__app.cc b/www/iridium/files/patch-components_services_filesystem_file__system__app.cc deleted file mode 100644 index 0f048efa703b..000000000000 --- a/www/iridium/files/patch-components_services_filesystem_file__system__app.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- components/services/filesystem/file_system_app.cc.orig 2019-03-11 22:00:57 UTC -+++ components/services/filesystem/file_system_app.cc -@@ -19,7 +19,7 @@ - #elif defined(OS_ANDROID) - #include "base/base_paths_android.h" - #include "base/path_service.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #include "base/environment.h" - #include "base/nix/xdg_util.h" - #elif defined(OS_MACOSX) -@@ -73,7 +73,7 @@ base::FilePath FileSystemApp::GetUserDataDir() { - CHECK(base::PathService::Get(base::DIR_APP_DATA, &path)); - #elif defined(OS_ANDROID) - CHECK(base::PathService::Get(base::DIR_ANDROID_APP_DATA, &path)); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - std::unique_ptr<base::Environment> env(base::Environment::Create()); - path = base::nix::GetXDGDirectory( - env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir); diff --git a/www/iridium/files/patch-components_services_font_font__service__app.cc b/www/iridium/files/patch-components_services_font_font__service__app.cc deleted file mode 100644 index 4e23e0f9389d..000000000000 --- a/www/iridium/files/patch-components_services_font_font__service__app.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/services/font/font_service_app.cc.orig 2019-03-11 22:00:57 UTC -+++ components/services/font/font_service_app.cc -@@ -20,7 +20,7 @@ - #include "components/services/font/ppapi_fontconfig_matching.h" // nogncheck - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "base/test/fontconfig_util_linux.h" - #endif - diff --git a/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc b/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc new file mode 100644 index 000000000000..f6e9116c28d0 --- /dev/null +++ b/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc @@ -0,0 +1,29 @@ +--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2020-02-24 18:39:14 UTC ++++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc +@@ -15,7 +15,7 @@ + + #if defined(OS_WIN) + #include "content/public/child/dwrite_font_proxy_init_win.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #include "components/services/font/public/cpp/font_loader.h" + #endif + +@@ -35,7 +35,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp + // Initialize font access for Skia. + #if defined(OS_WIN) + content::InitializeDWriteFontProxy(); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + mojo::PendingRemote<font_service::mojom::FontService> font_service; + content::UtilityThread::Get()->BindHostReceiver( + font_service.InitWithNewPipeAndPassReceiver()); +@@ -54,7 +54,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp + // encoding to PNG or we could provide our own codec implementations. + + // Sanity check that fonts are working. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // No WebSandbox is provided on Linux so the local fonts aren't accessible. + // This is fine since since the subsetted fonts are provided in the SkPicture. + // However, we still need to check that the SkFontMgr starts as it is used by diff --git a/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h b/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h new file mode 100644 index 000000000000..d84c48a27037 --- /dev/null +++ b/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h @@ -0,0 +1,20 @@ +--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h.orig 2020-02-26 13:13:33 UTC ++++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h +@@ -19,7 +19,7 @@ + #include "mojo/public/cpp/bindings/pending_receiver.h" + #include "mojo/public/cpp/bindings/receiver.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "components/services/font/public/cpp/font_loader.h" + #include "third_party/skia/include/core/SkRefCnt.h" + #endif +@@ -68,7 +68,7 @@ class PaintPreviewCompositorCollectionImpl + std::unique_ptr<PaintPreviewCompositorImpl>> + compositors_; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + sk_sp<font_service::FontLoader> font_loader_; + #endif + diff --git a/www/iridium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc b/www/iridium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc deleted file mode 100644 index cb195fd2fce6..000000000000 --- a/www/iridium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2019-03-17 18:33:50 UTC -+++ components/startup_metric_utils/browser/startup_metric_utils.cc -@@ -456,7 +456,7 @@ void AddStartupEventsForTelemetry() - // RecordBrowserMainMessageLoopStart, the time since last startup is also logged - // to a histogram suffixed with the startup temperature. - void RecordTimeSinceLastStartup(PrefService* pref_service) { --#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) -+#if defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - DCHECK(pref_service); - - // Get the timestamp of the current startup. -@@ -485,7 +485,7 @@ void RecordTimeSinceLastStartup(PrefService* pref_serv - // Write the timestamp of the current startup in |pref_service|. - pref_service->SetInt64(prefs::kLastStartupTimestamp, - process_start_time.ToInternalValue()); --#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) -+#endif // defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) - } - - // Logs the Startup.SameVersionStartupCount histogram. Relies on |pref_service| diff --git a/www/iridium/files/patch-components_storage__monitor_BUILD.gn b/www/iridium/files/patch-components_storage__monitor_BUILD.gn index cb4df570df73..3d90d22d647b 100644 --- a/www/iridium/files/patch-components_storage__monitor_BUILD.gn +++ b/www/iridium/files/patch-components_storage__monitor_BUILD.gn @@ -1,14 +1,10 @@ ---- components/storage_monitor/BUILD.gn.orig 2019-03-11 22:00:57 UTC +--- components/storage_monitor/BUILD.gn.orig 2019-10-21 19:06:30 UTC +++ components/storage_monitor/BUILD.gn -@@ -65,6 +65,17 @@ static_library("storage_monitor") { - ] +@@ -81,6 +81,13 @@ static_library("storage_monitor") { + } } + if (is_bsd) { -+ sources -= [ -+ "mtab_watcher_linux.cc", -+ "mtab_watcher_linux.h", -+ ] + sources += [ + "storage_monitor_freebsd.cc", + "storage_monitor_freebsd.h", @@ -16,5 +12,5 @@ + } + if (use_udev) { - deps += [ "//device/udev_linux" ] - } else if (is_linux) { + sources += [ + "udev_util_linux.cc", diff --git a/www/iridium/files/patch-components_sync__device__info_device__info__sync__bridge.cc b/www/iridium/files/patch-components_sync__device__info_device__info__sync__bridge.cc new file mode 100644 index 000000000000..c075e1c2a99c --- /dev/null +++ b/www/iridium/files/patch-components_sync__device__info_device__info__sync__bridge.cc @@ -0,0 +1,16 @@ +--- components/sync_device_info/device_info_sync_bridge.cc.orig 2020-03-16 18:40:31 UTC ++++ components/sync_device_info/device_info_sync_bridge.cc +@@ -456,11 +456,13 @@ void DeviceInfoSyncBridge::OnStoreCreated( + return; + } + ++#if !defined(OS_BSD) + store_ = std::move(store); + + base::SysInfo::GetHardwareInfo( + base::BindOnce(&DeviceInfoSyncBridge::OnHardwareInfoRetrieved, + weak_ptr_factory_.GetWeakPtr())); ++#endif + } + + void DeviceInfoSyncBridge::OnHardwareInfoRetrieved( diff --git a/www/iridium/files/patch-components_sync__device__info_local__device__info__util.cc b/www/iridium/files/patch-components_sync__device__info_local__device__info__util.cc new file mode 100644 index 000000000000..19d4b54c7495 --- /dev/null +++ b/www/iridium/files/patch-components_sync__device__info_local__device__info__util.cc @@ -0,0 +1,11 @@ +--- components/sync_device_info/local_device_info_util.cc.orig 2019-12-31 14:40:27 UTC ++++ components/sync_device_info/local_device_info_util.cc +@@ -19,7 +19,7 @@ std::string GetPersonalizableDeviceNameInternal(); + sync_pb::SyncEnums::DeviceType GetLocalDeviceType() { + #if defined(OS_CHROMEOS) + return sync_pb::SyncEnums_DeviceType_TYPE_CROS; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return sync_pb::SyncEnums_DeviceType_TYPE_LINUX; + #elif defined(OS_ANDROID) || defined(OS_IOS) + return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET diff --git a/www/iridium/files/patch-components_sync__device__info_local__device__info__util__linux.cc b/www/iridium/files/patch-components_sync__device__info_local__device__info__util__linux.cc new file mode 100644 index 000000000000..5c9398a7ea7c --- /dev/null +++ b/www/iridium/files/patch-components_sync__device__info_local__device__info__util__linux.cc @@ -0,0 +1,14 @@ +--- components/sync_device_info/local_device_info_util_linux.cc.orig 2020-02-24 18:39:14 UTC ++++ components/sync_device_info/local_device_info_util_linux.cc +@@ -37,8 +37,9 @@ std::string GetPersonalizableDeviceNameInternal() { + #if defined(OS_CHROMEOS) + return GetChromeOSDeviceNameFromType(); + #else +- char hostname[HOST_NAME_MAX]; +- if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. ++ int len = sysconf(_SC_HOST_NAME_MAX); ++ char hostname[len]; ++ if (gethostname(hostname, _SC_HOST_NAME_MAX) == 0) // Success. + return hostname; + return base::GetLinuxDistro(); + #endif diff --git a/www/iridium/files/patch-components_sync_base_get__session__name.cc b/www/iridium/files/patch-components_sync_base_get__session__name.cc deleted file mode 100644 index d59c6a39959e..000000000000 --- a/www/iridium/files/patch-components_sync_base_get__session__name.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- components/sync/base/get_session_name.cc.orig 2019-03-11 22:00:57 UTC -+++ components/sync/base/get_session_name.cc -@@ -17,7 +17,7 @@ - - #if defined(OS_CHROMEOS) - #include "chromeos/constants/devicetype.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #include "components/sync/base/get_session_name_linux.h" - #elif defined(OS_IOS) - #include "components/sync/base/get_session_name_ios.h" -@@ -52,7 +52,7 @@ std::string GetSessionNameBlocking() { - session_name = "Chromebook"; - break; - } --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - session_name = internal::GetHostname(); - #elif defined(OS_IOS) - session_name = internal::GetComputerName(); diff --git a/www/iridium/files/patch-components_sync_base_get__session__name__linux.cc b/www/iridium/files/patch-components_sync_base_get__session__name__linux.cc deleted file mode 100644 index f82fe5e19719..000000000000 --- a/www/iridium/files/patch-components_sync_base_get__session__name__linux.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- components/sync/base/get_session_name_linux.cc.orig 2019-03-11 22:00:57 UTC -+++ components/sync/base/get_session_name_linux.cc -@@ -13,8 +13,9 @@ namespace syncer { - namespace internal { - - std::string GetHostname() { -- char hostname[HOST_NAME_MAX]; -- if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. -+ int len = sysconf(_SC_HOST_NAME_MAX); -+ char hostname[len]; -+ if (gethostname(hostname, len) == 0) // Success. - return hostname; - return base::GetLinuxDistro(); - } diff --git a/www/iridium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc b/www/iridium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc deleted file mode 100644 index 6d0f62b2804d..000000000000 --- a/www/iridium/files/patch-components_sync_device__info_local__device__info__provider__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/sync/device_info/local_device_info_provider_impl.cc.orig 2019-03-17 18:30:00 UTC -+++ components/sync/device_info/local_device_info_provider_impl.cc -@@ -15,7 +15,7 @@ namespace { - sync_pb::SyncEnums::DeviceType GetLocalDeviceType(bool is_tablet) { - #if defined(OS_CHROMEOS) - return sync_pb::SyncEnums_DeviceType_TYPE_CROS; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - return sync_pb::SyncEnums_DeviceType_TYPE_LINUX; - #elif defined(OS_ANDROID) || defined(OS_IOS) - return is_tablet ? sync_pb::SyncEnums_DeviceType_TYPE_TABLET diff --git a/www/iridium/files/patch-components_update__client_update__query__params.cc b/www/iridium/files/patch-components_update__client_update__query__params.cc index a7fac7d5c9ef..7da3a9299fb1 100644 --- a/www/iridium/files/patch-components_update__client_update__query__params.cc +++ b/www/iridium/files/patch-components_update__client_update__query__params.cc @@ -1,6 +1,6 @@ ---- components/update_client/update_query_params.cc.orig 2019-03-11 22:00:57 UTC +--- components/update_client/update_query_params.cc.orig 2019-10-21 19:06:31 UTC +++ components/update_client/update_query_params.cc -@@ -38,6 +38,8 @@ const char kOs[] = +@@ -39,6 +39,8 @@ const char kOs[] = "fuchsia"; #elif defined(OS_OPENBSD) "openbsd"; diff --git a/www/iridium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc b/www/iridium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc new file mode 100644 index 000000000000..5b6a93f948a3 --- /dev/null +++ b/www/iridium/files/patch-components_url__formatter_spoof__checks_idn__spoof__checker.cc @@ -0,0 +1,11 @@ +--- components/url_formatter/spoof_checks/idn_spoof_checker.cc.orig 2020-03-17 09:48:11 UTC ++++ components/url_formatter/spoof_checks/idn_spoof_checker.cc +@@ -262,7 +262,7 @@ IDNSpoofChecker::IDNSpoofChecker() { + // The ideal fix would be to change the omnibox font used for Thai. In + // that case, the Linux-only list should be revisited and potentially + // removed. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + "[ทนบพรหเแ๐ดลปฟม]", + #else + "[บพเแ๐]", diff --git a/www/iridium/files/patch-components_viz_common_features.cc b/www/iridium/files/patch-components_viz_common_features.cc new file mode 100644 index 000000000000..ad1c4166adfc --- /dev/null +++ b/www/iridium/files/patch-components_viz_common_features.cc @@ -0,0 +1,20 @@ +--- components/viz/common/features.cc.orig 2020-03-17 09:49:01 UTC ++++ components/viz/common/features.cc +@@ -17,7 +17,7 @@ + namespace features { + + // Use Skia's readback API instead of GLRendererCopier. +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + const base::Feature kUseSkiaForGLReadback{"UseSkiaForGLReadback", + base::FEATURE_ENABLED_BY_DEFAULT}; + #else +@@ -26,7 +26,7 @@ const base::Feature kUseSkiaForGLReadback{"UseSkiaForG + #endif + + // Use the SkiaRenderer. +-#if defined(OS_LINUX) && !(defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMECAST)) ++#if (defined(OS_LINUX) && !(defined(OS_CHROMEOS) || BUILDFLAG(IS_CHROMECAST))) || defined(OS_BSD) + const base::Feature kUseSkiaRenderer{"UseSkiaRenderer", + base::FEATURE_ENABLED_BY_DEFAULT}; + #else diff --git a/www/iridium/files/patch-components_viz_common_gpu_dawn__context__provider.cc b/www/iridium/files/patch-components_viz_common_gpu_dawn__context__provider.cc new file mode 100644 index 000000000000..ea33615fe7e0 --- /dev/null +++ b/www/iridium/files/patch-components_viz_common_gpu_dawn__context__provider.cc @@ -0,0 +1,11 @@ +--- components/viz/common/gpu/dawn_context_provider.cc.orig 2020-02-26 13:14:08 UTC ++++ components/viz/common/gpu/dawn_context_provider.cc +@@ -17,7 +17,7 @@ namespace { + dawn_native::BackendType GetDefaultBackendType() { + #if defined(OS_WIN) + return dawn_native::BackendType::D3D12; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return dawn_native::BackendType::Vulkan; + #else + NOTREACHED(); diff --git a/www/iridium/files/patch-components_viz_host_host__display__client.cc b/www/iridium/files/patch-components_viz_host_host__display__client.cc new file mode 100644 index 000000000000..bdfec86f1ddf --- /dev/null +++ b/www/iridium/files/patch-components_viz_host_host__display__client.cc @@ -0,0 +1,11 @@ +--- components/viz/host/host_display_client.cc.orig 2020-02-03 21:52:45 UTC ++++ components/viz/host/host_display_client.cc +@@ -56,7 +56,7 @@ void HostDisplayClient::CreateLayeredWindowUpdater( + } + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void HostDisplayClient::DidCompleteSwapWithNewSize(const gfx::Size& size) { + NOTIMPLEMENTED(); + } diff --git a/www/iridium/files/patch-components_viz_host_host__display__client.h b/www/iridium/files/patch-components_viz_host_host__display__client.h new file mode 100644 index 000000000000..4b57c1bf5f23 --- /dev/null +++ b/www/iridium/files/patch-components_viz_host_host__display__client.h @@ -0,0 +1,11 @@ +--- components/viz/host/host_display_client.h.orig 2020-02-03 21:52:45 UTC ++++ components/viz/host/host_display_client.h +@@ -43,7 +43,7 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom + mojo::PendingReceiver<mojom::LayeredWindowUpdater> receiver) override; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void DidCompleteSwapWithNewSize(const gfx::Size& size) override; + #endif + diff --git a/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__device__dawn.cc b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__device__dawn.cc new file mode 100644 index 000000000000..7b27a7dd14d1 --- /dev/null +++ b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__device__dawn.cc @@ -0,0 +1,11 @@ +--- components/viz/service/display_embedder/skia_output_device_dawn.cc.orig 2020-02-26 13:15:08 UTC ++++ components/viz/service/display_embedder/skia_output_device_dawn.cc +@@ -10,7 +10,7 @@ + + #if defined(OS_WIN) + #include <dawn_native/D3D12Backend.h> +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #include <dawn_native/VulkanBackend.h> + #endif + diff --git a/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc new file mode 100644 index 000000000000..a3cbc1921992 --- /dev/null +++ b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -0,0 +1,11 @@ +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2020-03-17 09:50:06 UTC ++++ components/viz/service/display_embedder/skia_output_surface_impl.cc +@@ -224,7 +224,7 @@ void SkiaOutputSurfaceImpl::Reshape(const gfx::Size& s + if (characterization_.isValid()) { + // TODO(vasilyt): We temporary keep old code for linux to not interferee + // with M81. Remove this after. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + sk_sp<SkColorSpace> sk_color_space = color_space.ToSkColorSpace(); + if (!SkColorSpace::Equals(characterization_.colorSpace(), + sk_color_space.get())) { diff --git a/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.cc b/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.cc new file mode 100644 index 000000000000..a31cdeada8fc --- /dev/null +++ b/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.cc @@ -0,0 +1,20 @@ +--- components/viz/service/display_embedder/software_output_surface.cc.orig 2020-02-03 21:53:31 UTC ++++ components/viz/service/display_embedder/software_output_surface.cc +@@ -118,7 +118,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: + base::TimeTicks now = base::TimeTicks::Now(); + base::TimeDelta interval_to_next_refresh = + now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + if (needs_swap_size_notifications_) + client_->DidSwapWithSize(pixel_size); + #endif +@@ -147,7 +147,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla + return gfx::OVERLAY_TRANSFORM_NONE; + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void SoftwareOutputSurface::SetNeedsSwapSizeNotifications( + bool needs_swap_size_notifications) { + needs_swap_size_notifications_ = needs_swap_size_notifications; diff --git a/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.h b/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.h new file mode 100644 index 000000000000..78a386e1b26f --- /dev/null +++ b/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.h @@ -0,0 +1,20 @@ +--- components/viz/service/display_embedder/software_output_surface.h.orig 2020-03-16 18:40:31 UTC ++++ components/viz/service/display_embedder/software_output_surface.h +@@ -50,7 +50,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi + UpdateVSyncParametersCallback callback) override; + void SetDisplayTransformHint(gfx::OverlayTransform transform) override {} + gfx::OverlayTransform GetDisplayTransform() override; +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void SetNeedsSwapSizeNotifications( + bool needs_swap_size_notifications) override; + #endif +@@ -72,7 +72,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi + std::queue<std::vector<ui::LatencyInfo>> stored_latency_info_; + ui::LatencyTracker latency_tracker_; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + bool needs_swap_size_notifications_ = false; + #endif + diff --git a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc new file mode 100644 index 000000000000..f52c82d287af --- /dev/null +++ b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -0,0 +1,20 @@ +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2020-03-16 18:40:31 UTC ++++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc +@@ -49,7 +49,7 @@ RootCompositorFrameSinkImpl::Create( + output_surface->SetNeedsSwapSizeNotifications( + params->send_swap_size_notifications); + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // For X11, we need notify client about swap completion after resizing, so the + // client can use it for synchronize with X11 WM. + output_surface->SetNeedsSwapSizeNotifications(true); +@@ -418,7 +418,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw + #if defined(OS_ANDROID) + if (display_client_) + display_client_->DidCompleteSwapWithSize(pixel_size); +-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + if (display_client_ && pixel_size != last_swap_pixel_size_) { + last_swap_pixel_size_ = pixel_size; + display_client_->DidCompleteSwapWithNewSize(last_swap_pixel_size_); diff --git a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h new file mode 100644 index 000000000000..0cd42362caa3 --- /dev/null +++ b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h @@ -0,0 +1,11 @@ +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2020-03-16 18:40:31 UTC ++++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h +@@ -149,7 +149,7 @@ class RootCompositorFrameSinkImpl : public mojom::Comp + base::TimeDelta preferred_frame_interval_ = + FrameRateDecider::UnspecifiedFrameInterval(); + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + gfx::Size last_swap_pixel_size_; + #endif + diff --git a/www/iridium/files/patch-components_viz_test_fake__output__surface.cc b/www/iridium/files/patch-components_viz_test_fake__output__surface.cc new file mode 100644 index 000000000000..59a258fd3b15 --- /dev/null +++ b/www/iridium/files/patch-components_viz_test_fake__output__surface.cc @@ -0,0 +1,11 @@ +--- components/viz/test/fake_output_surface.cc.orig 2020-04-06 07:59:49 UTC ++++ components/viz/test/fake_output_surface.cc +@@ -114,7 +114,7 @@ gfx::OverlayTransform FakeOutputSurface::GetDisplayTra + : gfx::OVERLAY_TRANSFORM_NONE; + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void FakeOutputSurface::SetNeedsSwapSizeNotifications( + bool needs_swap_size_notifications) {} + #endif diff --git a/www/iridium/files/patch-components_viz_test_fake__output__surface.h b/www/iridium/files/patch-components_viz_test_fake__output__surface.h new file mode 100644 index 000000000000..5da27a2de0cd --- /dev/null +++ b/www/iridium/files/patch-components_viz_test_fake__output__surface.h @@ -0,0 +1,11 @@ +--- components/viz/test/fake_output_surface.h.orig 2020-04-06 08:00:10 UTC ++++ components/viz/test/fake_output_surface.h +@@ -84,7 +84,7 @@ class FakeOutputSurface : public OutputSurface { + UpdateVSyncParametersCallback callback) override; + void SetDisplayTransformHint(gfx::OverlayTransform transform) override; + gfx::OverlayTransform GetDisplayTransform() override; +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void SetNeedsSwapSizeNotifications( + bool needs_swap_size_notifications) override; + #endif diff --git a/www/iridium/files/patch-components_viz_test_mock__display__client.h b/www/iridium/files/patch-components_viz_test_mock__display__client.h new file mode 100644 index 000000000000..43940cf13781 --- /dev/null +++ b/www/iridium/files/patch-components_viz_test_mock__display__client.h @@ -0,0 +1,11 @@ +--- components/viz/test/mock_display_client.h.orig 2020-04-06 08:00:42 UTC ++++ components/viz/test/mock_display_client.h +@@ -35,7 +35,7 @@ class MockDisplayClient : public mojom::DisplayClient + MOCK_METHOD1(OnContextCreationResult, void(gpu::ContextResult)); + MOCK_METHOD1(SetPreferredRefreshRate, void(float refresh_rate)); + #endif +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + MOCK_METHOD1(DidCompleteSwapWithNewSize, void(const gfx::Size&)); + #endif + diff --git a/www/iridium/files/patch-content_app_content__main__runner__impl.cc b/www/iridium/files/patch-content_app_content__main__runner__impl.cc index 323eabff6bbf..dc4a030d4d3f 100644 --- a/www/iridium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/iridium/files/patch-content_app_content__main__runner__impl.cc @@ -1,6 +1,6 @@ ---- content/app/content_main_runner_impl.cc.orig 2019-03-11 22:00:57 UTC +--- content/app/content_main_runner_impl.cc.orig 2020-03-16 18:40:31 UTC +++ content/app/content_main_runner_impl.cc -@@ -93,17 +93,17 @@ +@@ -101,17 +101,17 @@ #include "base/posix/global_descriptors.h" #include "content/public/common/content_descriptors.h" @@ -21,7 +21,7 @@ #include "base/native_library.h" #include "base/rand_util.h" #include "services/service_manager/zygote/common/common_sandbox_support_linux.h" -@@ -124,7 +124,7 @@ +@@ -132,7 +132,7 @@ #include "content/public/common/content_client.h" #endif @@ -30,7 +30,7 @@ #if !defined(CHROME_MULTIPLE_DLL_BROWSER) #include "content/child/field_trial.h" -@@ -309,7 +309,7 @@ void InitializeZygoteSandboxForBrowserProcess( +@@ -298,7 +298,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -39,7 +39,7 @@ #if BUILDFLAG(ENABLE_PLUGINS) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -406,7 +406,7 @@ void PreSandboxInit() { +@@ -395,7 +395,7 @@ void PreSandboxInit() { } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) @@ -48,7 +48,7 @@ } // namespace -@@ -464,7 +464,7 @@ int RunZygote(ContentMainDelegate* delegate) { +@@ -462,7 +462,7 @@ int RunZygote(ContentMainDelegate* delegate) { delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -57,7 +57,7 @@ PreSandboxInit(); #endif -@@ -637,11 +637,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai +@@ -622,11 +622,11 @@ int ContentMainRunnerImpl::Initialize(const ContentMai base::GlobalDescriptors::kBaseDescriptor); #endif // !OS_ANDROID diff --git a/www/iridium/files/patch-content_browser_BUILD.gn b/www/iridium/files/patch-content_browser_BUILD.gn deleted file mode 100644 index 58c52636ecb3..000000000000 --- a/www/iridium/files/patch-content_browser_BUILD.gn +++ /dev/null @@ -1,14 +0,0 @@ ---- content/browser/BUILD.gn.orig 2019-03-11 22:00:57 UTC -+++ content/browser/BUILD.gn -@@ -1939,11 +1939,6 @@ jumbo_source_set("browser") { - "tracing/cros_tracing_agent.h", - ] - deps += [ "//chromeos/resources" ] -- } else { -- sources += [ -- "memory/memory_monitor_linux.cc", -- "memory/memory_monitor_linux.h", -- ] - } - - if (is_chromeos || is_android || is_chromecast) { diff --git a/www/iridium/files/patch-content_browser_browser__main__loop.cc b/www/iridium/files/patch-content_browser_browser__main__loop.cc index 7fa5cc6e1e36..d390038358d3 100644 --- a/www/iridium/files/patch-content_browser_browser__main__loop.cc +++ b/www/iridium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2019-03-11 22:00:57 UTC +--- content/browser/browser_main_loop.cc.orig 2020-03-16 18:40:31 UTC +++ content/browser/browser_main_loop.cc -@@ -250,6 +250,13 @@ +@@ -242,6 +242,13 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif @@ -14,7 +14,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -585,6 +592,11 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -613,6 +620,11 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); @@ -26,21 +26,21 @@ #endif #if defined(USE_X11) -@@ -629,7 +641,7 @@ int BrowserMainLoop::EarlyInitialization() { - #endif // defined(OS_ANDROID) || defined(OS_CHROMEOS) +@@ -658,7 +670,7 @@ int BrowserMainLoop::EarlyInitialization() { + } + #endif // !defined(OS_MACOSX) - #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_ANDROID) // We use quite a few file descriptors for our IPC as well as disk the disk // cache,and the default limit on the Mac is low (256), so bump it up. - -@@ -639,7 +651,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -668,7 +680,7 @@ int BrowserMainLoop::EarlyInitialization() { + // users can easily hit this limit with many open tabs. Bump up the limit to // an arbitrarily high number. See https://crbug.com/539567 base::IncreaseFdLimitTo(8192); - #endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || -- // defined(OS_ANDROID) -+ // defined(OS_ANDROID) || defined(OS_BSD) +-#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || ++#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || + // defined(OS_ANDROID) #if defined(OS_WIN) - net::EnsureWinsockInit(); diff --git a/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc index 88c85393e63a..49d1b92ec5ea 100644 --- a/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc +++ b/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc @@ -1,4 +1,4 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2019-03-11 22:00:57 UTC +--- content/browser/child_process_launcher_helper_linux.cc.orig 2020-02-03 21:52:45 UTC +++ content/browser/child_process_launcher_helper_linux.cc @@ -17,7 +17,9 @@ #include "content/public/common/sandboxed_process_launcher_delegate.h" @@ -10,7 +10,7 @@ #include "services/service_manager/zygote/host/zygote_communication_linux.h" #include "services/service_manager/zygote/host/zygote_host_impl_linux.h" -@@ -69,6 +71,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -68,6 +70,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr int* launch_result) { *is_synchronous_launch = true; @@ -18,7 +18,7 @@ service_manager::ZygoteHandle zygote_handle = base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) ? nullptr -@@ -82,7 +85,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -81,7 +84,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr GetProcessType()); *launch_result = LAUNCH_RESULT_SUCCESS; @@ -26,7 +26,7 @@ if (handle) { // This is just a starting score for a renderer or extension (the // only types of processes that will be started this way). It will -@@ -93,13 +95,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -92,13 +94,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr service_manager::ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore( handle, kLowestRendererOomScore); } @@ -41,7 +41,7 @@ Process process; process.process = base::LaunchProcess(*command_line(), options); -@@ -117,10 +119,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper +@@ -116,10 +118,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper const ChildProcessLauncherHelper::Process& process, bool known_dead) { ChildProcessTerminationInfo info; @@ -56,7 +56,7 @@ info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(), &info.exit_code); } else { -@@ -144,13 +150,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer +@@ -143,13 +149,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer DCHECK(CurrentlyOnProcessLauncherTaskRunner()); process.process.Terminate(service_manager::RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. diff --git a/www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc b/www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc new file mode 100644 index 000000000000..3751c782527d --- /dev/null +++ b/www/iridium/files/patch-content_browser_devtools_protocol_system__info__handler.cc @@ -0,0 +1,11 @@ +--- content/browser/devtools/protocol/system_info_handler.cc.orig 2019-12-16 21:51:26 UTC ++++ content/browser/devtools/protocol/system_info_handler.cc +@@ -48,7 +48,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS + // Give the GPU process a few seconds to provide GPU info. + // Linux Debug builds need more time -- see Issue 796437. + // Windows builds need more time -- see Issue 873112 and 1004472. +-#if (defined(OS_LINUX) && !defined(NDEBUG)) ++#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(NDEBUG)) + const int kGPUInfoWatchdogTimeoutMs = 20000; + #elif defined(OS_WIN) + const int kGPUInfoWatchdogTimeoutMs = 30000; diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc new file mode 100644 index 000000000000..78851da5e325 --- /dev/null +++ b/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -0,0 +1,11 @@ +--- content/browser/gpu/gpu_process_host.cc.orig 2020-03-16 18:40:31 UTC ++++ content/browser/gpu/gpu_process_host.cc +@@ -1086,7 +1086,7 @@ bool GpuProcessHost::LaunchGpuProcess() { + std::unique_ptr<base::CommandLine> cmd_line = + std::make_unique<base::CommandLine>(base::CommandLine::NO_PROGRAM); + #else +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + int child_flags = gpu_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF + : ChildProcessHost::CHILD_NORMAL; + #elif defined(OS_MACOSX) diff --git a/www/iridium/files/patch-content_browser_media_media__internals.cc b/www/iridium/files/patch-content_browser_media_media__internals.cc index b4f44f36bf1a..1e117219d0e9 100644 --- a/www/iridium/files/patch-content_browser_media_media__internals.cc +++ b/www/iridium/files/patch-content_browser_media_media__internals.cc @@ -1,11 +1,11 @@ ---- content/browser/media/media_internals.cc.orig 2019-03-11 22:00:57 UTC +--- content/browser/media/media_internals.cc.orig 2020-03-16 18:40:31 UTC +++ content/browser/media/media_internals.cc -@@ -763,7 +763,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit +@@ -531,7 +531,7 @@ void MediaInternals::UpdateVideoCaptureDeviceCapabilit + device_dict->SetString("id", descriptor.device_id); device_dict->SetString("name", descriptor.GetNameAndModel()); device_dict->Set("formats", std::move(format_list)); - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_ANDROID) -+ defined(OS_ANDROID) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) || \ + defined(OS_ANDROID) device_dict->SetString("captureApi", descriptor.GetCaptureApiTypeString()); #endif - video_capture_capabilities_cached_data_.Append(std::move(device_dict)); diff --git a/www/iridium/files/patch-content_browser_memory_memory__monitor.cc b/www/iridium/files/patch-content_browser_memory_memory__monitor.cc deleted file mode 100644 index 816260ba1561..000000000000 --- a/www/iridium/files/patch-content_browser_memory_memory__monitor.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/browser/memory/memory_monitor.cc.orig 2019-03-11 22:00:57 UTC -+++ content/browser/memory/memory_monitor.cc -@@ -22,7 +22,7 @@ void MemoryMonitorDelegate::GetSystemMemoryInfo( - base::GetSystemMemoryInfo(mem_info); - } - --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) || defined(OS_BSD) - // TODO(bashi,bcwhite): Remove when memory monitor for mac is available. - std::unique_ptr<MemoryMonitor> CreateMemoryMonitor() { - NOTREACHED(); diff --git a/www/iridium/files/patch-content_browser_ppapi__plugin__process__host.cc b/www/iridium/files/patch-content_browser_ppapi__plugin__process__host.cc new file mode 100644 index 000000000000..dd7271ca2db7 --- /dev/null +++ b/www/iridium/files/patch-content_browser_ppapi__plugin__process__host.cc @@ -0,0 +1,11 @@ +--- content/browser/ppapi_plugin_process_host.cc.orig 2020-02-03 21:53:31 UTC ++++ content/browser/ppapi_plugin_process_host.cc +@@ -365,7 +365,7 @@ bool PpapiPluginProcessHost::Init(const PepperPluginIn + base::CommandLine::StringType plugin_launcher = + browser_command_line.GetSwitchValueNative(switches::kPpapiPluginLauncher); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + int flags = plugin_launcher.empty() ? ChildProcessHost::CHILD_ALLOW_SELF : + ChildProcessHost::CHILD_NORMAL; + #elif defined(OS_MACOSX) diff --git a/www/iridium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc b/www/iridium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc new file mode 100644 index 000000000000..41c5edc15175 --- /dev/null +++ b/www/iridium/files/patch-content_browser_ppapi__plugin__process__host__receiver__bindings.cc @@ -0,0 +1,20 @@ +--- content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig 2019-12-17 19:34:30 UTC ++++ content/browser/ppapi_plugin_process_host_receiver_bindings.cc +@@ -8,7 +8,7 @@ + + #include "build/build_config.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck + #include "content/browser/font_service.h" // nogncheck + #endif +@@ -17,7 +17,7 @@ namespace content { + + void PpapiPluginProcessHost::BindHostReceiver( + mojo::GenericPendingReceiver receiver) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) + ConnectToFontService(std::move(font_receiver)); + #endif diff --git a/www/iridium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc b/www/iridium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc index 4dbe486d9251..3d6112bc698b 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_input_input__device__change__observer.cc @@ -1,4 +1,4 @@ ---- content/browser/renderer_host/input/input_device_change_observer.cc.orig 2019-03-11 22:00:58 UTC +--- content/browser/renderer_host/input/input_device_change_observer.cc.orig 2019-09-09 21:55:16 UTC +++ content/browser/renderer_host/input/input_device_change_observer.cc @@ -10,7 +10,7 @@ @@ -6,7 +6,7 @@ #include "ui/events/devices/input_device_observer_win.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - #include "ui/events/devices/input_device_manager.h" + #include "ui/events/devices/device_data_manager.h" #elif defined(OS_ANDROID) #include "ui/events/devices/input_device_observer_android.h" @@ -22,7 +22,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R @@ -15,7 +15,7 @@ ui::InputDeviceObserverWin::GetInstance()->AddObserver(this); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - ui::InputDeviceManager::GetInstance()->AddObserver(this); + ui::DeviceDataManager::GetInstance()->AddObserver(this); #elif defined(OS_ANDROID) ui::InputDeviceObserverAndroid::GetInstance()->AddObserver(this); @@ -32,7 +32,7 @@ InputDeviceChangeObserver::InputDeviceChangeObserver(R @@ -24,6 +24,6 @@ ui::InputDeviceObserverWin::GetInstance()->RemoveObserver(this); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - ui::InputDeviceManager::GetInstance()->RemoveObserver(this); + ui::DeviceDataManager::GetInstance()->RemoveObserver(this); #elif defined(OS_ANDROID) ui::InputDeviceObserverAndroid::GetInstance()->RemoveObserver(this); diff --git a/www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc b/www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc new file mode 100644 index 000000000000..7e10ee7c69a9 --- /dev/null +++ b/www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc @@ -0,0 +1,20 @@ +--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2020-03-16 18:40:31 UTC ++++ content/browser/renderer_host/pepper/pepper_file_io_host.cc +@@ -433,7 +433,7 @@ void PepperFileIOHost::OnLocalFileOpened( + ppapi::host::ReplyMessageContext reply_context, + const base::FilePath& path, + base::File::Error error_code) { +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + // Quarantining a file before its contents are available is only supported on + // Windows and Linux. + if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) { +@@ -454,7 +454,7 @@ void PepperFileIOHost::OnLocalFileOpened( + #endif + } + +-#if defined(OS_WIN) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + void PepperFileIOHost::OnLocalFileQuarantined( + ppapi::host::ReplyMessageContext reply_context, + const base::FilePath& path, diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc index b2144f7f4b7a..91932a38a5e5 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_message_filter.cc.orig 2019-03-11 22:00:58 UTC +--- content/browser/renderer_host/render_message_filter.cc.orig 2019-12-16 21:50:47 UTC +++ content/browser/renderer_host/render_message_filter.cc -@@ -71,7 +71,7 @@ +@@ -70,7 +70,7 @@ #if defined(OS_MACOSX) #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" #endif @@ -9,7 +9,7 @@ #include "base/linux_util.h" #include "base/threading/platform_thread.h" #endif -@@ -151,7 +151,7 @@ void RenderMessageFilter::CreateFullscreenWidget( +@@ -149,7 +149,7 @@ void RenderMessageFilter::CreateFullscreenWidget( std::move(callback).Run(route_id); } @@ -18,7 +18,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThread( base::PlatformThreadId ns_tid, base::ThreadPriority priority) { -@@ -172,7 +172,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea +@@ -170,7 +170,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea } #endif diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h b/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h index fd3e611cc264..f50e2f2912d6 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h +++ b/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h @@ -1,7 +1,7 @@ ---- content/browser/renderer_host/render_message_filter.h.orig 2019-03-11 22:00:58 UTC +--- content/browser/renderer_host/render_message_filter.h.orig 2019-12-16 21:50:47 UTC +++ content/browser/renderer_host/render_message_filter.h @@ -87,14 +87,14 @@ class CONTENT_EXPORT RenderMessageFilter - mojom::WidgetPtr widget, + mojo::PendingRemote<mojom::Widget> widget, CreateFullscreenWidgetCallback callback) override; void HasGpuProcess(HasGpuProcessCallback callback) override; -#if defined(OS_LINUX) diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc new file mode 100644 index 000000000000..f27d90720f9b --- /dev/null +++ b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -0,0 +1,47 @@ +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2020-03-16 18:40:31 UTC ++++ content/browser/renderer_host/render_process_host_impl.cc +@@ -241,7 +241,7 @@ + #include "content/browser/gpu/gpu_data_manager_impl.h" + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <sys/resource.h> + #include <sys/time.h> + +@@ -1176,7 +1176,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = + // to indicate failure and std::numeric_limits<size_t>::max() to indicate + // unlimited. + size_t GetPlatformProcessLimit() { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + struct rlimit limit; + if (getrlimit(RLIMIT_NPROC, &limit) != 0) + return kUnknownPlatformProcessLimit; +@@ -1187,7 +1187,7 @@ size_t GetPlatformProcessLimit() { + #else + // TODO(https://crbug.com/104689): Implement on other platforms. + return kUnknownPlatformProcessLimit; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + } + #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) + +@@ -1256,7 +1256,7 @@ class RenderProcessHostImpl::IOThreadHostImpl + return; + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { + ConnectToFontService(std::move(font_receiver)); + return; +@@ -1651,7 +1651,7 @@ bool RenderProcessHostImpl::Init() { + renderer_prefix = + browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + int flags = renderer_prefix.empty() ? ChildProcessHost::CHILD_ALLOW_SELF + : ChildProcessHost::CHILD_NORMAL; + #elif defined(OS_MACOSX) diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h index 4d41e5f1077e..616427da0032 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2019-03-11 22:00:58 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2020-03-16 18:40:31 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -407,10 +407,10 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -458,10 +458,10 @@ class CONTENT_EXPORT RenderProcessHostImpl is_for_guests_only_ = is_for_guests_only; } @@ -11,5 +11,5 @@ -#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) +#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) - RendererAudioOutputStreamFactoryContext* - GetRendererAudioOutputStreamFactoryContext() override; + // Called when a video capture stream or an audio stream is added or removed + // and used to determine if the process should be backgrounded or not. diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc index ea644916e3f7..06332b50ef27 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_view_host_impl.cc.orig 2019-03-11 22:00:58 UTC +--- content/browser/renderer_host/render_view_host_impl.cc.orig 2020-03-16 18:40:31 UTC +++ content/browser/renderer_host/render_view_host_impl.cc -@@ -161,7 +161,7 @@ void GetPlatformSpecificPrefs(RendererPreferences* pre +@@ -206,7 +206,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs( display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL); prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips = display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL); diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 50efe3a52519..99de1314b9ec 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2019-03-11 22:00:58 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2020-03-16 18:40:31 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -121,7 +121,7 @@ +@@ -115,7 +115,7 @@ #include "content/browser/accessibility/browser_accessibility_auralinux.h" #endif @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -2192,7 +2192,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2171,7 +2171,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -18,7 +18,7 @@ return NeedsInputGrab(); #endif return false; -@@ -2390,7 +2390,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2340,7 +2340,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc index 0317c81068ea..7321b9e2f949 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2019-03-11 22:00:58 UTC +--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2020-02-03 21:53:31 UTC +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc -@@ -608,7 +608,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand +@@ -611,7 +611,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand if (event->type() == ui::ET_MOUSE_EXITED) { if (mouse_locked || selection_popup) return false; diff --git a/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc b/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc new file mode 100644 index 000000000000..68b512d069c4 --- /dev/null +++ b/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor.cc @@ -0,0 +1,11 @@ +--- content/browser/scheduler/responsiveness/jank_monitor.cc.orig 2020-02-03 21:53:31 UTC ++++ content/browser/scheduler/responsiveness/jank_monitor.cc +@@ -321,7 +321,7 @@ void JankMonitor::ThreadExecutionState::DidRunTaskOrEv + // in context menus, among others). Simply ignore the mismatches for now. + // See https://crbug.com/929813 for the details of why the mismatch + // happens. +-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE) ++#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + task_execution_metadata_.clear(); + #endif + return; diff --git a/www/iridium/files/patch-content_browser_scheduler_responsiveness_watcher.cc b/www/iridium/files/patch-content_browser_scheduler_responsiveness_watcher.cc new file mode 100644 index 000000000000..ebeeac2a51c1 --- /dev/null +++ b/www/iridium/files/patch-content_browser_scheduler_responsiveness_watcher.cc @@ -0,0 +1,20 @@ +--- content/browser/scheduler/responsiveness/watcher.cc.orig 2020-02-03 21:52:46 UTC ++++ content/browser/scheduler/responsiveness/watcher.cc +@@ -101,7 +101,7 @@ void Watcher::DidRunTask(const base::PendingTask* task + // in context menus, among others). Simply ignore the mismatches for now. + // See https://crbug.com/929813 for the details of why the mismatch + // happens. +-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE) ++#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + return currently_running_metadata_ui_.clear(); + #endif + DCHECK_LE(*mismatched_task_identifiers, 1); +@@ -170,7 +170,7 @@ void Watcher::DidRunEventOnUIThread(const void* opaque + mismatched_event_identifiers_ui_ += 1; + // See comment in DidRunTask() for why |currently_running_metadata_ui_| may + // be reset. +-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) && defined(USE_OZONE) ++#if !defined(OS_CHROMEOS) && (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_OZONE) + return currently_running_metadata_ui_.clear(); + #endif + DCHECK_LE(mismatched_event_identifiers_ui_, 1); diff --git a/www/iridium/files/patch-content_browser_service__manager_service__manager__context.cc b/www/iridium/files/patch-content_browser_service__manager_service__manager__context.cc deleted file mode 100644 index dbb845ce1377..000000000000 --- a/www/iridium/files/patch-content_browser_service__manager_service__manager__context.cc +++ /dev/null @@ -1,35 +0,0 @@ ---- content/browser/service_manager/service_manager_context.cc.orig 2019-03-11 22:00:58 UTC -+++ content/browser/service_manager/service_manager_context.cc -@@ -99,7 +99,7 @@ - #include "jni/ContentNfcDelegate_jni.h" - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "components/services/font/font_service_app.h" - #include "components/services/font/public/interfaces/constants.mojom.h" - #endif -@@ -378,12 +378,12 @@ void CreateInProcessAudioService( - BrowserMainLoop::GetAudioManager(), std::move(request))); - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - std::unique_ptr<service_manager::Service> CreateFontService( - service_manager::mojom::ServiceRequest request) { - return std::make_unique<font_service::FontServiceApp>(std::move(request)); - } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - std::unique_ptr<service_manager::Service> CreateResourceCoordinatorService( - service_manager::mojom::ServiceRequest request) { -@@ -618,7 +618,7 @@ ServiceManagerContext::ServiceManagerContext( - base::BindRepeating(&CreateVideoCaptureService)); - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - RegisterInProcessService( - packaged_services_connection_.get(), font_service::mojom::kServiceName, - base::CreateSequencedTaskRunnerWithTraits( diff --git a/www/iridium/files/patch-content_browser_storage__partition__impl.cc b/www/iridium/files/patch-content_browser_storage__partition__impl.cc deleted file mode 100644 index a086392dfa90..000000000000 --- a/www/iridium/files/patch-content_browser_storage__partition__impl.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/browser/storage_partition_impl.cc.orig 2019-03-17 17:48:03 UTC -+++ content/browser/storage_partition_impl.cc -@@ -768,7 +768,7 @@ net::URLRequestContextGetter* StoragePartitionImpl::Ge - // TODO(jam): enable for all, still used on WebView. - // See copy of this ifdef in: - // StoragePartitionImplMap::Get --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - if (base::FeatureList::IsEnabled(network::features::kNetworkService)) - NOTREACHED(); - #endif diff --git a/www/iridium/files/patch-content_browser_storage__partition__impl__map.cc b/www/iridium/files/patch-content_browser_storage__partition__impl__map.cc deleted file mode 100644 index 977fdd529673..000000000000 --- a/www/iridium/files/patch-content_browser_storage__partition__impl__map.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/browser/storage_partition_impl_map.cc.orig 2019-03-17 17:40:34 UTC -+++ content/browser/storage_partition_impl_map.cc -@@ -425,7 +425,7 @@ StoragePartitionImpl* StoragePartitionImplMap::Get( - bool create_request_context = true; - if (base::FeatureList::IsEnabled(network::features::kNetworkService)) { - // These ifdefs should match StoragePartitionImpl::GetURLRequestContext. --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - create_request_context = false; - #elif defined(OS_ANDROID) - create_request_context = diff --git a/www/iridium/files/patch-content_browser_utility__process__host.cc b/www/iridium/files/patch-content_browser_utility__process__host.cc new file mode 100644 index 000000000000..8360a7efdc5e --- /dev/null +++ b/www/iridium/files/patch-content_browser_utility__process__host.cc @@ -0,0 +1,11 @@ +--- content/browser/utility_process_host.cc.orig 2020-03-16 18:40:32 UTC ++++ content/browser/utility_process_host.cc +@@ -210,7 +210,7 @@ UtilityProcessHost::UtilityProcessHost() + + UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client) + : sandbox_type_(service_manager::SandboxType::kUtility), +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + child_flags_(ChildProcessHost::CHILD_ALLOW_SELF), + #else + child_flags_(ChildProcessHost::CHILD_NORMAL), diff --git a/www/iridium/files/patch-content_browser_utility__process__host__receiver__bindings.cc b/www/iridium/files/patch-content_browser_utility__process__host__receiver__bindings.cc new file mode 100644 index 000000000000..a69a1ccfe8b3 --- /dev/null +++ b/www/iridium/files/patch-content_browser_utility__process__host__receiver__bindings.cc @@ -0,0 +1,20 @@ +--- content/browser/utility_process_host_receiver_bindings.cc.orig 2020-02-26 13:18:37 UTC ++++ content/browser/utility_process_host_receiver_bindings.cc +@@ -8,7 +8,7 @@ + + #include "build/build_config.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck + #include "content/browser/font_service.h" // nogncheck + #endif +@@ -17,7 +17,7 @@ namespace content { + + void UtilityProcessHost::BindHostReceiver( + mojo::GenericPendingReceiver receiver) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { + ConnectToFontService(std::move(font_receiver)); + return; diff --git a/www/iridium/files/patch-content_browser_v8__snapshot__files.cc b/www/iridium/files/patch-content_browser_v8__snapshot__files.cc new file mode 100644 index 000000000000..957c743c222c --- /dev/null +++ b/www/iridium/files/patch-content_browser_v8__snapshot__files.cc @@ -0,0 +1,11 @@ +--- content/browser/v8_snapshot_files.cc.orig 2020-02-24 18:39:15 UTC ++++ content/browser/v8_snapshot_files.cc +@@ -10,7 +10,7 @@ + namespace content { + + std::map<std::string, base::FilePath> GetV8SnapshotFilesToPreload() { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #if defined(USE_V8_CONTEXT_SNAPSHOT) + return {{kV8ContextSnapshotDataDescriptor, + base::FilePath(FILE_PATH_LITERAL("v8_context_snapshot.bin"))}}; diff --git a/www/iridium/files/patch-content_browser_webui_shared__resources__data__source.cc b/www/iridium/files/patch-content_browser_webui_shared__resources__data__source.cc index 6ba8db73abcd..cb181bd0c0b3 100644 --- a/www/iridium/files/patch-content_browser_webui_shared__resources__data__source.cc +++ b/www/iridium/files/patch-content_browser_webui_shared__resources__data__source.cc @@ -1,12 +1,15 @@ ---- content/browser/webui/shared_resources_data_source.cc.orig 2019-03-11 22:00:58 UTC +--- content/browser/webui/shared_resources_data_source.cc.orig 2020-03-16 18:39:50 UTC +++ content/browser/webui/shared_resources_data_source.cc -@@ -72,9 +72,9 @@ const std::map<int, std::string> CreateMojoResourceIdT - return std::map<int, std::string> { - {IDR_MOJO_MOJO_BINDINGS_JS, "js/mojo_bindings.js"}, - {IDR_MOJO_MOJO_BINDINGS_LITE_JS, "js/mojo_bindings_lite.js"}, +@@ -131,12 +131,12 @@ const std::map<int, std::string> CreateMojoResourceIdT + "mojo/mojo/public/mojom/base/text_direction.mojom.html"}, + {IDR_MOJO_TEXT_DIRECTION_MOJOM_LITE_JS, + "mojo/mojo/public/mojom/base/text_direction.mojom-lite.js"}, -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - {IDR_MOJO_TIME_MOJOM_JS, "js/time.mojom.js"}, + {IDR_MOJO_TIME_MOJOM_HTML, + "mojo/mojo/public/mojom/base/time.mojom.html"}, + {IDR_MOJO_TIME_MOJOM_LITE_JS, + "mojo/mojo/public/mojom/base/time.mojom-lite.js"}, -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) }; diff --git a/www/iridium/files/patch-content_common_BUILD.gn b/www/iridium/files/patch-content_common_BUILD.gn index 030ecf86ce76..3d0913b5242b 100644 --- a/www/iridium/files/patch-content_common_BUILD.gn +++ b/www/iridium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2019-03-11 22:00:58 UTC +--- content/common/BUILD.gn.orig 2020-03-16 18:40:32 UTC +++ content/common/BUILD.gn -@@ -382,6 +382,12 @@ source_set("common") { +@@ -356,6 +356,12 @@ source_set("common") { libs += [ "android" ] } diff --git a/www/iridium/files/patch-content_common_user__agent.cc b/www/iridium/files/patch-content_common_user__agent.cc index 002892b99d10..d842b3145b5d 100644 --- a/www/iridium/files/patch-content_common_user__agent.cc +++ b/www/iridium/files/patch-content_common_user__agent.cc @@ -1,8 +1,8 @@ ---- content/common/user_agent.cc.orig 2019-03-11 22:00:58 UTC +--- content/common/user_agent.cc.orig 2020-03-16 18:40:32 UTC +++ content/common/user_agent.cc -@@ -131,6 +131,14 @@ std::string BuildOSCpuInfo(bool include_android_build_ +@@ -140,6 +140,14 @@ std::string BuildOSCpuInfo(bool include_android_build_ #endif - ); // NOLINT + ); +#if defined(OS_BSD) +#if defined(__x86_64__) diff --git a/www/iridium/files/patch-content_gpu_BUILD.gn b/www/iridium/files/patch-content_gpu_BUILD.gn index ec8cd90795ce..538b4bc2f7bc 100644 --- a/www/iridium/files/patch-content_gpu_BUILD.gn +++ b/www/iridium/files/patch-content_gpu_BUILD.gn @@ -1,6 +1,6 @@ ---- content/gpu/BUILD.gn.orig 2019-03-11 22:00:58 UTC +--- content/gpu/BUILD.gn.orig 2020-03-16 18:40:32 UTC +++ content/gpu/BUILD.gn -@@ -133,7 +133,7 @@ target(link_target_type, "gpu_sources") { +@@ -128,7 +128,7 @@ target(link_target_type, "gpu_sources") { # Use DRI on desktop Linux builds. if (current_cpu != "s390x" && current_cpu != "ppc64" && is_desktop_linux && diff --git a/www/iridium/files/patch-content_gpu_gpu__main.cc b/www/iridium/files/patch-content_gpu_gpu__main.cc index aba058e673bb..ba08acddf473 100644 --- a/www/iridium/files/patch-content_gpu_gpu__main.cc +++ b/www/iridium/files/patch-content_gpu_gpu__main.cc @@ -1,7 +1,7 @@ ---- content/gpu/gpu_main.cc.orig 2019-03-11 22:00:58 UTC +--- content/gpu/gpu_main.cc.orig 2020-03-16 18:40:32 UTC +++ content/gpu/gpu_main.cc -@@ -78,7 +78,7 @@ - #include "ui/gfx/x/x11_switches.h" // nogncheck +@@ -84,7 +84,7 @@ + #include "ui/gfx/x/x11_switches.h" // nogncheck #endif -#if defined(OS_LINUX) @@ -9,7 +9,7 @@ #include "content/gpu/gpu_sandbox_hook_linux.h" #include "content/public/common/sandbox_init.h" #include "services/service_manager/sandbox/linux/sandbox_linux.h" -@@ -111,7 +111,7 @@ namespace content { +@@ -109,7 +109,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -172,7 +172,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -177,7 +177,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { @@ -27,7 +27,16 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -365,7 +365,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -301,7 +301,7 @@ int GpuMain(const MainFunctionParams& parameters) { + main_thread_task_executor = + std::make_unique<base::SingleThreadTaskExecutor>( + gpu_preferences.message_pump_type); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #error "Unsupported Linux platform." + #elif defined(OS_MACOSX) + // Cross-process CoreAnimation requires a CFRunLoop to function at all, and +@@ -442,7 +442,7 @@ int GpuMain(const MainFunctionParams& parameters) { namespace { @@ -36,7 +45,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -400,7 +400,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -479,7 +479,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo return res; } diff --git a/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc b/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc index 108731c88ab0..55ec485ae8ec 100644 --- a/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc +++ b/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2019-03-11 22:00:58 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2020-03-16 18:39:50 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc -@@ -95,8 +95,9 @@ static const char kLibV4lEncPluginPath[] = +@@ -97,8 +97,9 @@ static const char kLibV4lEncPluginPath[] = "/usr/lib/libv4l/plugins/libv4l-encplugin.so"; #endif @@ -11,7 +11,7 @@ void AddV4L2GpuWhitelist( std::vector<BrokerFilePermission>* permissions, const service_manager::SandboxSeccompBPF::Options& options) { -@@ -277,8 +278,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp +@@ -333,8 +334,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp AddStandardGpuWhiteList(&permissions); return permissions; } @@ -22,7 +22,7 @@ // Preload the Mali library. if (UseChromecastSandboxWhitelist()) { for (const char* path : kWhitelistedChromecastPaths) { -@@ -293,6 +296,7 @@ void LoadArmGpuLibraries() { +@@ -349,6 +352,7 @@ void LoadArmGpuLibraries() { // Preload the Tegra V4L2 (video decode acceleration) library. dlopen(kLibTegraPath, dlopen_flag); } @@ -30,7 +30,7 @@ } bool LoadAmdGpuLibraries() { -@@ -348,6 +352,7 @@ bool LoadLibrariesForGpu( +@@ -404,6 +408,7 @@ bool LoadLibrariesForGpu( return true; } @@ -38,7 +38,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU( const service_manager::SandboxLinux::Options& options) { sandbox::syscall_broker::BrokerCommandSet command_set; -@@ -368,13 +373,17 @@ bool BrokerProcessPreSandboxHook( +@@ -425,13 +430,17 @@ bool BrokerProcessPreSandboxHook( service_manager::SetProcessTitleFromCommandLine(nullptr); return true; } diff --git a/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc index 0860cc595a92..8708f1d34421 100644 --- a/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc +++ b/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc @@ -1,34 +1,25 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2019-03-11 22:00:58 UTC +--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2020-02-03 21:52:46 UTC +++ content/ppapi_plugin/ppapi_blink_platform_impl.cc -@@ -20,7 +20,7 @@ +@@ -19,7 +19,7 @@ #if defined(OS_MACOSX) #include "content/child/child_process_sandbox_support_impl_mac.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "content/child/child_process_sandbox_support_impl_linux.h" + #include "mojo/public/cpp/bindings/pending_remote.h" #endif - @@ -34,7 +34,7 @@ typedef struct CGFont* CGFontRef; namespace content { PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - font_loader_ = - sk_make_sp<font_service::FontLoader>(ChildThread::Get()->GetConnector()); - SkFontConfigInterface::SetGlobal(font_loader_); -@@ -49,7 +49,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() { - } - - void PpapiBlinkPlatformImpl::Shutdown() { --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - // SandboxSupport contains a map of OutOfProcessFont objects, which hold - // WebStrings and WebVectors, which become invalidated when blink is shut - // down. Hence, we need to clear that map now, just before blink::shutdown() -@@ -59,7 +59,7 @@ void PpapiBlinkPlatformImpl::Shutdown() { - } + mojo::PendingRemote<font_service::mojom::FontService> font_service; + ChildThread::Get()->BindHostReceiver( + font_service.InitWithNewPipeAndPassReceiver()); +@@ -52,7 +52,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() { + void PpapiBlinkPlatformImpl::Shutdown() {} blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() { -#if defined(OS_LINUX) || defined(OS_MACOSX) diff --git a/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h index c2bd54f54ced..d246feb0e6c4 100644 --- a/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h +++ b/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h @@ -1,4 +1,4 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2019-03-11 22:00:58 UTC +--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2019-10-21 19:06:32 UTC +++ content/ppapi_plugin/ppapi_blink_platform_impl.h @@ -13,7 +13,7 @@ #include "build/build_config.h" @@ -9,8 +9,8 @@ #include "components/services/font/public/cpp/font_loader.h" #include "third_party/skia/include/core/SkRefCnt.h" #endif -@@ -42,11 +42,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp - bool sync_dir) override; +@@ -36,11 +36,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp + blink::WebThemeEngine* ThemeEngine() override; private: -#if defined(OS_LINUX) || defined(OS_MACOSX) diff --git a/www/iridium/files/patch-content_public_app_content__main__delegate.cc b/www/iridium/files/patch-content_public_app_content__main__delegate.cc new file mode 100644 index 000000000000..22a460c346ac --- /dev/null +++ b/www/iridium/files/patch-content_public_app_content__main__delegate.cc @@ -0,0 +1,18 @@ +--- content/public/app/content_main_delegate.cc.orig 2020-03-16 18:40:32 UTC ++++ content/public/app/content_main_delegate.cc +@@ -39,13 +39,13 @@ bool ContentMainDelegate::DelaySandboxInitialization( + return false; + } + +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + + void ContentMainDelegate::ZygoteStarting( + std::vector<std::unique_ptr<service_manager::ZygoteForkDelegate>>* + delegates) {} + +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + int ContentMainDelegate::TerminateForFatalInitializationError() { + CHECK(false); diff --git a/www/iridium/files/patch-content_public_app_content__main__delegate.h b/www/iridium/files/patch-content_public_app_content__main__delegate.h new file mode 100644 index 000000000000..06f339f70e30 --- /dev/null +++ b/www/iridium/files/patch-content_public_app_content__main__delegate.h @@ -0,0 +1,20 @@ +--- content/public/app/content_main_delegate.h.orig 2020-03-16 18:40:32 UTC ++++ content/public/app/content_main_delegate.h +@@ -72,7 +72,7 @@ class CONTENT_EXPORT ContentMainDelegate { + // want it at all. + virtual bool DelaySandboxInitialization(const std::string& process_type); + +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + // Tells the embedder that the zygote process is starting, and allows it to + // specify one or more zygote delegates if it wishes by storing them in + // |*delegates|. +@@ -82,7 +82,7 @@ class CONTENT_EXPORT ContentMainDelegate { + + // Called every time the zygote process forks. + virtual void ZygoteForked() {} +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // Fatal errors during initialization are reported by this function, so that + // the embedder can implement graceful exit by displaying some message and diff --git a/www/iridium/files/patch-content_public_app_content__packaged__services__manifest.cc b/www/iridium/files/patch-content_public_app_content__packaged__services__manifest.cc deleted file mode 100644 index 0a187e7f641b..000000000000 --- a/www/iridium/files/patch-content_public_app_content__packaged__services__manifest.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- content/public/app/content_packaged_services_manifest.cc.orig 2019-03-11 22:00:58 UTC -+++ content/public/app/content_packaged_services_manifest.cc -@@ -23,7 +23,7 @@ - #include "services/video_capture/manifest.h" - #include "services/viz/manifest.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "components/services/font/manifest.h" - #endif - -@@ -67,7 +67,7 @@ const service_manager::Manifest& GetContentPackagedSer - .PackageService(tracing::GetManifest()) - .PackageService(video_capture::GetManifest()) - .PackageService(viz::GetManifest()) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - .PackageService(font_service::GetManifest()) - #endif - #if defined(OS_CHROMEOS) diff --git a/www/iridium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc b/www/iridium/files/patch-content_public_app_v8__snapshot__overlay__manifest.cc deleted file mode 100644 index a0d8aa7568ae..000000000000 --- a/www/iridium/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-05 00:49:17 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/iridium/files/patch-content_public_common_child__process__host.h b/www/iridium/files/patch-content_public_common_child__process__host.h index be119b0b033f..bf91f4c4d0d2 100644 --- a/www/iridium/files/patch-content_public_common_child__process__host.h +++ b/www/iridium/files/patch-content_public_common_child__process__host.h @@ -1,6 +1,6 @@ ---- content/public/common/child_process_host.h.orig 2019-03-11 22:00:58 UTC +--- content/public/common/child_process_host.h.orig 2020-02-03 21:52:46 UTC +++ content/public/common/child_process_host.h -@@ -47,7 +47,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se +@@ -80,7 +80,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se // No special behavior requested. CHILD_NORMAL = 0, @@ -9,12 +9,3 @@ // Indicates that the child execed after forking may be execced from // /proc/self/exe rather than using the "real" app path. This prevents // autoupdate from confusing us if it changes the file out from under us. -@@ -56,7 +56,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Se - // gdb). In this case, you'd use GetChildPath to get the real executable - // file name, and then prepend the GDB command to the command line. - CHILD_ALLOW_SELF = 1 << 0, --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - }; - - // Returns the pathname to be used for a child process. If a subprocess diff --git a/www/iridium/files/patch-content_public_common_common__param__traits__macros.h b/www/iridium/files/patch-content_public_common_common__param__traits__macros.h index 190748e6447c..3fa7b395b5ef 100644 --- a/www/iridium/files/patch-content_public_common_common__param__traits__macros.h +++ b/www/iridium/files/patch-content_public_common_common__param__traits__macros.h @@ -1,9 +1,9 @@ ---- content/public/common/common_param_traits_macros.h.orig 2019-03-11 22:00:58 UTC +--- content/public/common/common_param_traits_macros.h.orig 2020-03-16 18:40:32 UTC +++ content/public/common/common_param_traits_macros.h -@@ -325,7 +325,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences) +@@ -326,7 +326,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen + IPC_STRUCT_TRAITS_MEMBER(accept_languages) IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page) IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed) - IPC_STRUCT_TRAITS_MEMBER(network_contry_iso) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) IPC_STRUCT_TRAITS_MEMBER(system_font_family_name) diff --git a/www/iridium/files/patch-content_public_common_content__features.cc b/www/iridium/files/patch-content_public_common_content__features.cc index 2e966d3decbc..ebaa5f3fdb2a 100644 --- a/www/iridium/files/patch-content_public_common_content__features.cc +++ b/www/iridium/files/patch-content_public_common_content__features.cc @@ -1,11 +1,29 @@ ---- content/public/common/content_features.cc.orig 2019-04-05 00:49:17 UTC +--- content/public/common/content_features.cc.orig 2020-03-16 18:40:32 UTC +++ content/public/common/content_features.cc -@@ -493,7 +493,7 @@ const base::Feature kWebAssemblyThreads{"WebAssemblyTh - base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -48,7 +48,7 @@ const base::Feature kAudioServiceLaunchOnStartup{ + const base::Feature kAudioServiceOutOfProcess{ + "AudioServiceOutOfProcess", + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT +@@ -693,7 +693,7 @@ const base::Feature kWebAssemblyThreads { + }; // Enable WebAssembly trap handler. --#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(ARCH_CPU_X86_64) +-#if (defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)) && \ ++#if (defined(OS_BSD) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)) && \ + defined(ARCH_CPU_X86_64) const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -723,7 +723,7 @@ const base::Feature kWebAuth{"WebAuthentication", + // https://w3c.github.io/webauthn + const base::Feature kWebAuthCable { + "WebAuthenticationCable", +-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) ++#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD) + base::FEATURE_DISABLED_BY_DEFAULT #else + base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/iridium/files/patch-content_public_common_content__switches.cc b/www/iridium/files/patch-content_public_common_content__switches.cc index 48cac09ce79d..4f1ae111a366 100644 --- a/www/iridium/files/patch-content_public_common_content__switches.cc +++ b/www/iridium/files/patch-content_public_common_content__switches.cc @@ -1,8 +1,8 @@ ---- content/public/common/content_switches.cc.orig 2019-03-11 22:00:58 UTC +--- content/public/common/content_switches.cc.orig 2020-03-16 18:40:32 UTC +++ content/public/common/content_switches.cc -@@ -968,7 +968,7 @@ const char kDisableAudioSupportForDesktopShare[] = - const char kDisablePanelFitting[] = "disable-panel-fitting"; - #endif +@@ -997,7 +997,7 @@ const char kEnableAggressiveDOMStorageFlushing[] = + // Enable indication that browser is controlled by automation. + const char kEnableAutomation[] = "enable-automation"; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) diff --git a/www/iridium/files/patch-content_public_common_content__switches.h b/www/iridium/files/patch-content_public_common_content__switches.h index 4ef3b25a854a..1a705f45ae7f 100644 --- a/www/iridium/files/patch-content_public_common_content__switches.h +++ b/www/iridium/files/patch-content_public_common_content__switches.h @@ -1,7 +1,7 @@ ---- content/public/common/content_switches.h.orig 2019-03-11 22:00:58 UTC +--- content/public/common/content_switches.h.orig 2020-03-16 18:40:32 UTC +++ content/public/common/content_switches.h -@@ -270,7 +270,7 @@ CONTENT_EXPORT extern const char kEnableOSKOverscroll[ - CONTENT_EXPORT extern const char kDisablePanelFitting[]; +@@ -278,7 +278,7 @@ CONTENT_EXPORT extern const char kRemoteDebuggingSocke + CONTENT_EXPORT extern const char kRendererWaitForJavaDebugger[]; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) diff --git a/www/iridium/files/patch-content_public_common_renderer__preferences.h b/www/iridium/files/patch-content_public_common_renderer__preferences.h deleted file mode 100644 index 06c9495f2b6d..000000000000 --- a/www/iridium/files/patch-content_public_common_renderer__preferences.h +++ /dev/null @@ -1,11 +0,0 @@ ---- content/public/common/renderer_preferences.h.orig 2019-03-11 22:00:58 UTC -+++ content/public/common/renderer_preferences.h -@@ -120,7 +120,7 @@ struct CONTENT_EXPORT RendererPreferences { - // Country iso of the mobile network for content detection purpose. - std::string network_contry_iso; - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - std::string system_font_family_name; - #endif - diff --git a/www/iridium/files/patch-content_public_test_browser__test__base.cc b/www/iridium/files/patch-content_public_test_browser__test__base.cc index 1c04e6682c14..dd60982ba019 100644 --- a/www/iridium/files/patch-content_public_test_browser__test__base.cc +++ b/www/iridium/files/patch-content_public_test_browser__test__base.cc @@ -1,6 +1,15 @@ ---- content/public/test/browser_test_base.cc.orig 2019-03-11 22:00:58 UTC +--- content/public/test/browser_test_base.cc.orig 2020-04-03 04:11:32 UTC +++ content/public/test/browser_test_base.cc -@@ -62,6 +62,10 @@ +@@ -71,7 +71,7 @@ + #include "ui/gl/gl_implementation.h" + #include "ui/gl/gl_switches.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "ui/platform_window/common/platform_window_defaults.h" // nogncheck + #endif + +@@ -98,6 +98,10 @@ #include "ui/views/test/event_generator_delegate_mac.h" #endif @@ -11,3 +20,12 @@ #if defined(OS_POSIX) #include "base/process/process_handle.h" #endif +@@ -184,7 +188,7 @@ BrowserTestBase::BrowserTestBase() + "a new browser test suite that runs on Android, please add it to " + "//build/android/pylib/gtest/gtest_test_instance.py."; + g_instance_already_created = true; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + ui::test::EnableTestConfigForPlatformWindows(); + #endif + diff --git a/www/iridium/files/patch-content_public_test_content__browser__test.cc b/www/iridium/files/patch-content_public_test_content__browser__test.cc new file mode 100644 index 000000000000..cc6012d2f89e --- /dev/null +++ b/www/iridium/files/patch-content_public_test_content__browser__test.cc @@ -0,0 +1,29 @@ +--- content/public/test/content_browser_test.cc.orig 2020-04-06 08:25:58 UTC ++++ content/public/test/content_browser_test.cc +@@ -26,7 +26,7 @@ + #include "base/mac/foundation_util.h" + #endif + +-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) ++#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD) + #include "ui/base/ime/init/input_method_initializer.h" + #endif + +@@ -83,7 +83,7 @@ void ContentBrowserTest::SetUp() { + #endif + + // LinuxInputMethodContextFactory has to be initialized. +-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) ++#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD) + ui::InitializeInputMethodForTesting(); + #endif + +@@ -96,7 +96,7 @@ void ContentBrowserTest::TearDown() { + BrowserTestBase::TearDown(); + + // LinuxInputMethodContextFactory has to be shutdown. +-#if !defined(OS_CHROMEOS) && defined(OS_LINUX) ++#if (!defined(OS_CHROMEOS) && defined(OS_LINUX)) || defined(OS_BSD) + ui::ShutdownInputMethodForTesting(); + #endif + } diff --git a/www/iridium/files/patch-content_public_test_mock__render__thread.cc b/www/iridium/files/patch-content_public_test_mock__render__thread.cc index 3837fbd79ecf..5b12d835bc18 100644 --- a/www/iridium/files/patch-content_public_test_mock__render__thread.cc +++ b/www/iridium/files/patch-content_public_test_mock__render__thread.cc @@ -1,6 +1,6 @@ ---- content/public/test/mock_render_thread.cc.orig 2019-03-17 17:24:56 UTC +--- content/public/test/mock_render_thread.cc.orig 2019-12-16 21:51:26 UTC +++ content/public/test/mock_render_thread.cc -@@ -69,7 +69,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend +@@ -73,7 +73,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend std::move(callback).Run(false); } diff --git a/www/iridium/files/patch-content_renderer_media_audio_audio__device__factory.cc b/www/iridium/files/patch-content_renderer_media_audio_audio__device__factory.cc index 42d0c2ee4eee..c1a03f802347 100644 --- a/www/iridium/files/patch-content_renderer_media_audio_audio__device__factory.cc +++ b/www/iridium/files/patch-content_renderer_media_audio_audio__device__factory.cc @@ -1,11 +1,11 @@ ---- content/renderer/media/audio/audio_device_factory.cc.orig 2019-03-11 22:00:58 UTC +--- content/renderer/media/audio/audio_device_factory.cc.orig 2019-06-04 18:55:23 UTC +++ content/renderer/media/audio/audio_device_factory.cc -@@ -33,7 +33,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul - +@@ -35,7 +35,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul namespace { --#if defined(OS_WIN) || defined(OS_MACOSX) || \ -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) || \ - (defined(OS_LINUX) && !defined(OS_CHROMEOS)) + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) // Due to driver deadlock issues on Windows (http://crbug/422522) there is a // chance device authorization response is never received from the browser side. + // In this case we will time out, to avoid renderer hang forever waiting for diff --git a/www/iridium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc b/www/iridium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc deleted file mode 100644 index e8c4b3a167b7..000000000000 --- a/www/iridium/files/patch-content_renderer_media_stream_processed__local__audio__source.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- content/renderer/media/stream/processed_local_audio_source.cc.orig 2019-03-11 22:00:58 UTC -+++ content/renderer/media/stream/processed_local_audio_source.cc -@@ -35,7 +35,7 @@ void* const kProcessedLocalAudioSourceIdentifier = - const_cast<void**>(&kProcessedLocalAudioSourceIdentifier); - - bool ApmInAudioServiceEnabled() { --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - return base::FeatureList::IsEnabled(features::kWebRtcApmInAudioService); - #else - return false; -@@ -355,7 +355,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( - bool key_pressed) { - #if defined(OS_WIN) || defined(OS_MACOSX) - DCHECK_LE(volume, 1.0); --#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD) -+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - // We have a special situation on Linux where the microphone volume can be - // "higher than maximum". The input volume slider in the sound preference - // allows the user to set a scaling that is higher than 100%. It means that diff --git a/www/iridium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc b/www/iridium/files/patch-content_renderer_media_webrtc_webrtc__audio__renderer__unittest.cc deleted file mode 100644 index 179ab20533ae..000000000000 --- a/www/iridium/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-03-17 17:29:28 UTC -+++ content/renderer/media/webrtc/webrtc_audio_renderer_unittest.cc -@@ -203,7 +203,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/iridium/files/patch-content_renderer_render__process__impl.cc b/www/iridium/files/patch-content_renderer_render__process__impl.cc new file mode 100644 index 000000000000..c0badaab0886 --- /dev/null +++ b/www/iridium/files/patch-content_renderer_render__process__impl.cc @@ -0,0 +1,20 @@ +--- content/renderer/render_process_impl.cc.orig 2020-03-16 18:40:32 UTC ++++ content/renderer/render_process_impl.cc +@@ -43,7 +43,7 @@ + #if defined(OS_WIN) + #include "base/win/win_util.h" + #endif +-#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) + #include "v8/include/v8-wasm-trap-handler-posix.h" + #endif + namespace { +@@ -161,7 +161,7 @@ RenderProcessImpl::RenderProcessImpl() + + SetV8FlagIfNotFeature(features::kWebAssemblyTrapHandler, + "--no-wasm-trap-handler"); +-#if defined(OS_LINUX) && defined(ARCH_CPU_X86_64) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(ARCH_CPU_X86_64) + if (base::FeatureList::IsEnabled(features::kWebAssemblyTrapHandler)) { + base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); + if (!command_line->HasSwitch( diff --git a/www/iridium/files/patch-content_renderer_render__thread__impl.cc b/www/iridium/files/patch-content_renderer_render__thread__impl.cc index 950c2e011d7a..c231b5944895 100644 --- a/www/iridium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/iridium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2019-03-11 22:00:58 UTC +--- content/renderer/render_thread_impl.cc.orig 2020-03-16 18:40:32 UTC +++ content/renderer/render_thread_impl.cc -@@ -191,12 +191,21 @@ +@@ -172,12 +172,21 @@ #include "mojo/public/cpp/bindings/message_dumper.h" #endif @@ -22,7 +22,7 @@ using base::ThreadRestrictions; using blink::WebDocument; using blink::WebFrame; -@@ -926,7 +935,7 @@ void RenderThreadImpl::Init() { +@@ -731,7 +740,7 @@ void RenderThreadImpl::Init() { DCHECK(parsed_num_raster_threads) << string_value; DCHECK_GT(num_raster_threads, 0); @@ -31,21 +31,16 @@ categorized_worker_pool_->SetBackgroundingCallback( main_thread_scheduler_->DefaultTaskRunner(), base::BindOnce( -@@ -967,7 +976,7 @@ void RenderThreadImpl::Init() { - GetConnector()->BindInterface(mojom::kBrowserServiceName, - mojo::MakeRequest(&storage_partition_service_)); +@@ -754,7 +763,7 @@ void RenderThreadImpl::Init() { + base::DiscardableMemoryAllocator::SetInstance( + discardable_memory_allocator_.get()); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - render_message_filter()->SetThreadPriority( - ChildProcess::current()->io_thread_id(), base::ThreadPriority::DISPLAY); - #endif -@@ -1337,11 +1346,11 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: - gpu::kGpuFeatureStatusEnabled); - const bool enable_gpu_memory_buffers = - !is_gpu_compositing_disabled_ && --#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + if (base::FeatureList::IsEnabled( + blink::features::kBlinkCompositorUseDisplayThreadPriority)) { + render_message_filter()->SetThreadPriority( +@@ -1136,7 +1145,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames); #else cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames); diff --git a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc index ebd1a58d9253..716ffe45a392 100644 --- a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2019-03-11 22:00:58 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2020-03-16 18:40:32 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -109,7 +109,7 @@ +@@ -98,7 +98,7 @@ #if defined(OS_MACOSX) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,34 +9,25 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -202,7 +202,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( - ->Clone(); +@@ -173,7 +173,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( + if (RenderThreadImpl::current()) { + io_runner_ = RenderThreadImpl::current()->GetIOTaskRunner(); thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender(); - blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get())); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - font_loader_ = sk_make_sp<font_service::FontLoader>(connector_.get()); - SkFontConfigInterface::SetGlobal(font_loader_); + mojo::PendingRemote<font_service::mojom::FontService> font_service; + RenderThreadImpl::current()->BindHostReceiver( + font_service.InitWithNewPipeAndPassReceiver()); +@@ -183,7 +183,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif -@@ -211,7 +211,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( - connector_ = service_manager::Connector::Create(&request); } -#if defined(OS_LINUX) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - if (g_sandbox_enabled && sandboxEnabled()) { + if (sandboxEnabled()) { #if defined(OS_MACOSX) - sandbox_support_.reset(new WebSandboxSupportMac(connector_.get())); -@@ -239,7 +239,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl( - } - - void RendererBlinkPlatformImpl::Shutdown() { --#if defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - // SandboxSupport contains a map of OutOfProcessFont objects, which hold - // WebStrings and WebVectors, which become invalidated when blink is shut - // down. Hence, we need to clear that map now, just before blink::shutdown() -@@ -320,7 +320,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto + sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); +@@ -265,7 +265,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto void RendererBlinkPlatformImpl::SetDisplayThreadPriority( base::PlatformThreadId thread_id) { @@ -45,7 +36,7 @@ if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { render_thread->render_message_filter()->SetThreadPriority( thread_id, base::ThreadPriority::DISPLAY); -@@ -333,7 +333,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -278,7 +278,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop } blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h index 7c4e00966793..5aa4c9e85488 100644 --- a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,16 +1,16 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2019-03-11 22:00:58 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2020-02-03 21:53:31 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -29,7 +29,7 @@ +@@ -30,7 +30,7 @@ + #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" #include "third_party/blink/public/mojom/loader/code_cache.mojom.h" - #include "third_party/blink/public/platform/modules/webdatabase/web_database.mojom.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -263,7 +263,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi - std::unique_ptr<service_manager::Connector> connector_; +@@ -218,7 +218,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi + scoped_refptr<base::SingleThreadTaskRunner> io_runner_; -#if defined(OS_LINUX) || defined(OS_MACOSX) @@ -18,9 +18,9 @@ std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -298,7 +298,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi - blink::mojom::CodeCacheHostPtrInfo code_cache_host_info_; - scoped_refptr<blink::mojom::ThreadSafeCodeCacheHostPtr> code_cache_host_; +@@ -242,7 +242,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi + mojo::PendingRemote<blink::mojom::CodeCacheHost> code_cache_host_remote_; + mojo::SharedRemote<blink::mojom::CodeCacheHost> code_cache_host_; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/iridium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc b/www/iridium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc index 6ed0afba21b3..3c78e664138b 100644 --- a/www/iridium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc +++ b/www/iridium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc @@ -1,4 +1,4 @@ ---- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2019-03-11 22:00:58 UTC +--- content/renderer/renderer_main_platform_delegate_linux.cc.orig 2020-03-16 18:39:50 UTC +++ content/renderer/renderer_main_platform_delegate_linux.cc @@ -30,6 +30,7 @@ void RendererMainPlatformDelegate::PlatformUninitializ } @@ -6,7 +6,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { +#if !defined(OS_BSD) // The setuid sandbox is started in the zygote process: zygote_main_linux.cc - // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_suid_sandbox.md + // https://chromium.googlesource.com/chromium/src/+/master/docs/linux/suid_sandbox.md // @@ -65,7 +66,7 @@ bool RendererMainPlatformDelegate::EnableSandbox() { CHECK_EQ(errno, EPERM); diff --git a/www/iridium/files/patch-content_shell_BUILD.gn b/www/iridium/files/patch-content_shell_BUILD.gn index 82705d821d11..6a640a666c6a 100644 --- a/www/iridium/files/patch-content_shell_BUILD.gn +++ b/www/iridium/files/patch-content_shell_BUILD.gn @@ -1,11 +1,11 @@ ---- content/shell/BUILD.gn.orig 2019-04-05 00:49:17 UTC +--- content/shell/BUILD.gn.orig 2020-03-16 18:40:32 UTC +++ content/shell/BUILD.gn -@@ -942,7 +942,7 @@ group("content_shell_crash_test") { +@@ -932,7 +932,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } -- if (is_posix && !is_android) { -+ if (is_posix && !is_android && !is_bsd) { +- if (is_posix) { ++ if (is_posix && !is_bsd) { data_deps += [ - "//third_party/breakpad:dump_syms($host_toolchain)", - "//third_party/breakpad:minidump_stackwalk($host_toolchain)", + "//third_party/breakpad:dump_syms", + "//third_party/breakpad:minidump_stackwalk", diff --git a/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc b/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc new file mode 100644 index 000000000000..9e3e50211c22 --- /dev/null +++ b/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc @@ -0,0 +1,20 @@ +--- content/shell/app/shell_main_delegate.cc.orig 2020-03-16 18:40:32 UTC ++++ content/shell/app/shell_main_delegate.cc +@@ -306,7 +306,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit + } + + void ShellMainDelegate::PreSandboxStartup() { +-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + // Create an instance of the CPU class to parse /proc/cpuinfo and cache + // cpu_brand info. + base::CPU cpu_info; +@@ -325,7 +325,7 @@ void ShellMainDelegate::PreSandboxStartup() { + // Reporting for sub-processes will be initialized in ZygoteForked. + if (process_type != service_manager::switches::kZygoteProcess) { + crash_reporter::InitializeCrashpad(process_type.empty(), process_type); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + crash_reporter::SetFirstChanceExceptionHandler( + v8::TryHandleWebAssemblyTrapPosix); + #endif diff --git a/www/iridium/files/patch-content_shell_browser_shell__browser__context.cc b/www/iridium/files/patch-content_shell_browser_shell__browser__context.cc index 2be54e0a8040..d9388fc9f1d2 100644 --- a/www/iridium/files/patch-content_shell_browser_shell__browser__context.cc +++ b/www/iridium/files/patch-content_shell_browser_shell__browser__context.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/shell_browser_context.cc.orig 2019-03-11 22:00:58 UTC +--- content/shell/browser/shell_browser_context.cc.orig 2019-10-21 19:06:33 UTC +++ content/shell/browser/shell_browser_context.cc -@@ -28,7 +28,7 @@ +@@ -32,7 +32,7 @@ #if defined(OS_WIN) #include "base/base_paths_win.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) #include "base/base_paths_mac.h" -@@ -103,7 +103,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { +@@ -107,7 +107,7 @@ void ShellBrowserContext::InitWhileIOAllowed() { #if defined(OS_WIN) CHECK(base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path_)); path_ = path_.Append(std::wstring(L"content_shell")); diff --git a/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc index 5176c7191552..dc97f7778f08 100644 --- a/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,15 +1,15 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2019-03-11 22:00:58 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2019-12-16 21:51:26 UTC +++ content/shell/browser/shell_browser_main_parts.cc -@@ -48,7 +48,7 @@ +@@ -47,7 +47,7 @@ #if defined(USE_AURA) && defined(USE_X11) #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck #endif -#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) -+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) - #include "ui/base/ime/input_method_initializer.h" ++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) + #include "ui/base/ime/init/input_method_initializer.h" #endif #if defined(OS_CHROMEOS) -@@ -126,7 +126,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() { +@@ -123,7 +123,7 @@ int ShellBrowserMainParts::PreEarlyInitialization() { #if defined(USE_X11) ui::SetDefaultX11ErrorHandlers(); #endif diff --git a/www/iridium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc b/www/iridium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc new file mode 100644 index 000000000000..09235357330e --- /dev/null +++ b/www/iridium/files/patch-content_shell_browser_web__test_web__test__browser__context.cc @@ -0,0 +1,11 @@ +--- content/shell/browser/web_test/web_test_browser_context.cc.orig 2020-02-03 21:52:46 UTC ++++ content/shell/browser/web_test/web_test_browser_context.cc +@@ -27,7 +27,7 @@ + + #if defined(OS_WIN) + #include "base/base_paths_win.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #include "base/nix/xdg_util.h" + #elif defined(OS_MACOSX) + #include "base/base_paths_mac.h" diff --git a/www/iridium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc b/www/iridium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc new file mode 100644 index 000000000000..7aa29e2df609 --- /dev/null +++ b/www/iridium/files/patch-content_shell_browser_web__test_web__test__browser__main__parts.cc @@ -0,0 +1,11 @@ +--- content/shell/browser/web_test/web_test_browser_main_parts.cc.orig 2019-09-09 21:55:17 UTC ++++ content/shell/browser/web_test/web_test_browser_main_parts.cc +@@ -36,7 +36,7 @@ + #if defined(USE_AURA) && defined(USE_X11) + #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck + #endif +-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) ++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) + #include "ui/base/ime/init/input_method_initializer.h" + #endif + diff --git a/www/iridium/files/patch-content_shell_test__runner_test__runner.cc b/www/iridium/files/patch-content_shell_test__runner_test__runner.cc index ee4c1426d550..c2e390ce3a41 100644 --- a/www/iridium/files/patch-content_shell_test__runner_test__runner.cc +++ b/www/iridium/files/patch-content_shell_test__runner_test__runner.cc @@ -1,29 +1,29 @@ ---- content/shell/test_runner/test_runner.cc.orig 2019-03-17 17:19:52 UTC +--- content/shell/test_runner/test_runner.cc.orig 2020-03-16 18:40:32 UTC +++ content/shell/test_runner/test_runner.cc -@@ -64,7 +64,7 @@ +@@ -62,7 +62,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/skia_util.h" --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) #include "third_party/blink/public/platform/web_font_render_style.h" #endif -@@ -1542,7 +1542,7 @@ void TestRunner::Reset() { +@@ -1532,7 +1532,7 @@ void TestRunner::Reset() { drag_image_.reset(); blink::WebSecurityPolicy::ClearOriginAccessList(); --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) blink::WebFontRenderStyle::SetSubpixelPositioning(false); #endif -@@ -2091,7 +2091,7 @@ void TestRunner::AddOriginAccessAllowListEntry( +@@ -2111,7 +2111,7 @@ void TestRunner::AddOriginAccessAllowListEntry( } void TestRunner::SetTextSubpixelPositioning(bool value) { --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) // Since FontConfig doesn't provide a variable to control subpixel // positioning, we'll fall back to setting it globally for all fonts. blink::WebFontRenderStyle::SetSubpixelPositioning(value); diff --git a/www/iridium/files/patch-content_test_content__test__suite.cc b/www/iridium/files/patch-content_test_content__test__suite.cc index 230f8ca92226..de8be8785a7f 100644 --- a/www/iridium/files/patch-content_test_content__test__suite.cc +++ b/www/iridium/files/patch-content_test_content__test__suite.cc @@ -1,6 +1,6 @@ ---- content/test/content_test_suite.cc.orig 2019-03-11 22:00:58 UTC +--- content/test/content_test_suite.cc.orig 2019-12-16 21:50:48 UTC +++ content/test/content_test_suite.cc -@@ -85,6 +85,7 @@ void ContentTestSuite::Initialize() { +@@ -84,6 +84,7 @@ void ContentTestSuite::Initialize() { // to initialize GL, so don't do it here. base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); bool is_child_process = command_line->HasSwitch(switches::kTestChildProcess); @@ -8,7 +8,7 @@ if (!is_child_process) { gl::GLSurfaceTestSupport::InitializeNoExtensionsOneOff(); auto* gpu_feature_info = gpu::GetTestGpuThreadHolder()->GetGpuFeatureInfo(); -@@ -92,6 +93,7 @@ void ContentTestSuite::Initialize() { +@@ -91,6 +92,7 @@ void ContentTestSuite::Initialize() { gpu_feature_info->disabled_extensions); gl::init::InitializeExtensionSettingsOneOffPlatform(); } diff --git a/www/iridium/files/patch-content_utility_BUILD.gn b/www/iridium/files/patch-content_utility_BUILD.gn new file mode 100644 index 000000000000..6c7ec5a20c2c --- /dev/null +++ b/www/iridium/files/patch-content_utility_BUILD.gn @@ -0,0 +1,11 @@ +--- content/utility/BUILD.gn.orig 2020-03-18 12:50:25 UTC ++++ content/utility/BUILD.gn +@@ -78,7 +78,7 @@ jumbo_source_set("utility") { + deps += [ "//services/proxy_resolver:lib" ] + } + +- if (is_linux) { ++ if (is_linux && !is_bsd) { + deps += [ "//content/utility/soda:soda_sandbox_hook" ] + } + } diff --git a/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc b/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc index 8463a3b71752..37e61a50af20 100644 --- a/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc +++ b/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc @@ -1,6 +1,6 @@ ---- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2019-03-11 22:00:58 UTC +--- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2019-12-16 21:50:48 UTC +++ content/utility/utility_blink_platform_with_sandbox_support_impl.cc -@@ -8,7 +8,7 @@ +@@ -9,7 +9,7 @@ #if defined(OS_MACOSX) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -10,15 +10,15 @@ #endif @@ -17,7 +17,7 @@ namespace content { + UtilityBlinkPlatformWithSandboxSupportImpl:: - UtilityBlinkPlatformWithSandboxSupportImpl( - service_manager::Connector* connector) { + UtilityBlinkPlatformWithSandboxSupportImpl() { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - font_loader_ = sk_make_sp<font_service::FontLoader>(connector); - SkFontConfigInterface::SetGlobal(font_loader_); - sandbox_support_ = std::make_unique<WebSandboxSupportLinux>(font_loader_); -@@ -31,7 +31,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl:: + mojo::PendingRemote<font_service::mojom::FontService> font_service; + UtilityThread::Get()->BindHostReceiver( + font_service.InitWithNewPipeAndPassReceiver()); +@@ -34,7 +34,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl:: blink::WebSandboxSupport* UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() { diff --git a/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h b/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h index d82659424108..23f525c1b117 100644 --- a/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h +++ b/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h @@ -1,4 +1,4 @@ ---- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2019-03-11 22:00:58 UTC +--- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2019-12-16 21:50:48 UTC +++ content/utility/utility_blink_platform_with_sandbox_support_impl.h @@ -11,7 +11,7 @@ #include "build/build_config.h" @@ -9,7 +9,7 @@ #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -39,10 +39,10 @@ class UtilityBlinkPlatformWithSandboxSupportImpl : pub +@@ -33,10 +33,10 @@ class UtilityBlinkPlatformWithSandboxSupportImpl : pub blink::WebSandboxSupport* GetSandboxSupport() override; private: diff --git a/www/iridium/files/patch-device_bluetooth_BUILD.gn b/www/iridium/files/patch-device_bluetooth_BUILD.gn index 4db9a662777c..222316adc8f5 100644 --- a/www/iridium/files/patch-device_bluetooth_BUILD.gn +++ b/www/iridium/files/patch-device_bluetooth_BUILD.gn @@ -1,6 +1,6 @@ ---- device/bluetooth/BUILD.gn.orig 2019-03-11 22:00:58 UTC +--- device/bluetooth/BUILD.gn.orig 2020-03-16 18:39:51 UTC +++ device/bluetooth/BUILD.gn -@@ -277,7 +277,7 @@ component("bluetooth") { +@@ -275,7 +275,7 @@ component("bluetooth") { ] } diff --git a/www/iridium/files/patch-device_gamepad_gamepad__provider.cc b/www/iridium/files/patch-device_gamepad_gamepad__provider.cc index 336b1eec540d..7c9a18a60c34 100644 --- a/www/iridium/files/patch-device_gamepad_gamepad__provider.cc +++ b/www/iridium/files/patch-device_gamepad_gamepad__provider.cc @@ -1,11 +1,11 @@ ---- device/gamepad/gamepad_provider.cc.orig 2019-03-11 22:00:58 UTC +--- device/gamepad/gamepad_provider.cc.orig 2020-03-16 18:39:51 UTC +++ device/gamepad/gamepad_provider.cc -@@ -164,7 +164,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep - monitor->AddDevicesChangedObserver(this); +@@ -147,7 +147,7 @@ void GamepadProvider::Initialize(std::unique_ptr<Gamep - polling_thread_.reset(new base::Thread("Gamepad polling thread")); + if (!polling_thread_) + polling_thread_.reset(new base::Thread("Gamepad polling thread")); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // On Linux, the data fetcher needs to watch file descriptors, so the message // loop needs to be a libevent loop. - const base::MessageLoop::Type kMessageLoopType = base::MessageLoop::TYPE_IO; + const base::MessagePumpType kMessageLoopType = base::MessagePumpType::IO; diff --git a/www/iridium/files/patch-device_gamepad_hid__writer__linux.cc b/www/iridium/files/patch-device_gamepad_hid__writer__linux.cc new file mode 100644 index 000000000000..f962ad16a8f5 --- /dev/null +++ b/www/iridium/files/patch-device_gamepad_hid__writer__linux.cc @@ -0,0 +1,11 @@ +--- device/gamepad/hid_writer_linux.cc.orig 2019-10-31 07:37:06 UTC ++++ device/gamepad/hid_writer_linux.cc +@@ -4,6 +4,8 @@ + + #include "device/gamepad/hid_writer_linux.h" + ++#include <unistd.h> ++ + #include "base/posix/eintr_wrapper.h" + + namespace device { diff --git a/www/iridium/files/patch-device_usb_BUILD.gn b/www/iridium/files/patch-device_usb_BUILD.gn deleted file mode 100644 index 2d5a3b0a8dcc..000000000000 --- a/www/iridium/files/patch-device_usb_BUILD.gn +++ /dev/null @@ -1,21 +0,0 @@ ---- device/usb/BUILD.gn.orig 2019-03-11 22:00:58 UTC -+++ device/usb/BUILD.gn -@@ -112,10 +112,17 @@ static_library("usb") { - ] - } - -- if (is_android || is_chromeos || is_linux) { -+ if (is_android || is_chromeos || (is_linux && !is_bsd)) { - sources += [ - "usb_device_handle_usbfs.cc", - "usb_device_handle_usbfs.h", -+ ] -+ } -+ -+ if (is_bsd) { -+ sources -= [ -+ "usb_device_linux.cc", -+ "usb_device_linux.h", - ] - } - diff --git a/www/iridium/files/patch-device_usb_usb__context.cc b/www/iridium/files/patch-device_usb_usb__context.cc deleted file mode 100644 index dd97946fb79e..000000000000 --- a/www/iridium/files/patch-device_usb_usb__context.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- device/usb/usb_context.cc.orig 2019-03-11 22:00:58 UTC -+++ device/usb/usb_context.cc -@@ -58,7 +58,9 @@ void UsbContext::UsbEventHandler::Run() { - - void UsbContext::UsbEventHandler::Stop() { - base::subtle::Release_Store(&running_, 0); -+#if !defined(OS_FREEBSD) // XXX(rene) not available in base version - libusb_interrupt_handle_event(context_); -+#endif - } - - UsbContext::UsbContext(PlatformUsbContext context) : context_(context) { diff --git a/www/iridium/files/patch-device_usb_usb__error.cc b/www/iridium/files/patch-device_usb_usb__error.cc deleted file mode 100644 index a23797cfef2c..000000000000 --- a/www/iridium/files/patch-device_usb_usb__error.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- device/usb/usb_error.cc.orig 2019-03-11 22:00:58 UTC -+++ device/usb/usb_error.cc -@@ -9,7 +9,7 @@ - namespace device { - - std::string ConvertPlatformUsbErrorToString(int errcode) { -- return libusb_strerror(static_cast<libusb_error>(errcode)); -+ return ""; - } - - } // namespace device diff --git a/www/iridium/files/patch-device_usb_usb__service__impl.cc b/www/iridium/files/patch-device_usb_usb__service__impl.cc deleted file mode 100644 index 33d177ba9e2b..000000000000 --- a/www/iridium/files/patch-device_usb_usb__service__impl.cc +++ /dev/null @@ -1,45 +0,0 @@ ---- device/usb/usb_service_impl.cc.orig 2019-03-11 22:00:58 UTC -+++ device/usb/usb_service_impl.cc -@@ -231,8 +231,10 @@ UsbServiceImpl::UsbServiceImpl() - } - - UsbServiceImpl::~UsbServiceImpl() { -+#if !defined(OS_FREEBSD) - if (hotplug_enabled_) - libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_); -+#endif // !defined(OS_FREEBSD) - } - - void UsbServiceImpl::GetDevices(const GetDevicesCallback& callback) { -@@ -287,6 +289,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon - - context_ = std::move(context); - -+#if !defined(OS_FREEBSD) - int rv = libusb_hotplug_register_callback( - context_->context(), - static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | -@@ -299,6 +302,7 @@ void UsbServiceImpl::OnUsbContext(scoped_refptr<UsbCon - - // This will call any enumeration callbacks queued while initializing. - RefreshDevices(); -+#endif // !defined(OS_FREEBSD) - - #if defined(OS_WIN) - DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces(); -@@ -495,6 +499,7 @@ void UsbServiceImpl::RemoveDevice(scoped_refptr<UsbDev - device->OnDisconnect(); - } - -+#if !defined(OS_FREEBSD) - // static - int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context, - libusb_device* device_raw, -@@ -528,6 +533,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb - - return 0; - } -+#endif // !defined(OS_FREEBSD) - - void UsbServiceImpl::OnPlatformDeviceAdded( - ScopedLibusbDeviceRef platform_device) { diff --git a/www/iridium/files/patch-device_usb_usb__service__impl.h b/www/iridium/files/patch-device_usb_usb__service__impl.h deleted file mode 100644 index b9bdde03159d..000000000000 --- a/www/iridium/files/patch-device_usb_usb__service__impl.h +++ /dev/null @@ -1,26 +0,0 @@ ---- device/usb/usb_service_impl.h.orig 2019-03-11 22:00:58 UTC -+++ device/usb/usb_service_impl.h -@@ -73,11 +73,13 @@ class UsbServiceImpl : - scoped_refptr<UsbDeviceImpl> device); - void RemoveDevice(scoped_refptr<UsbDeviceImpl> device); - -+#if !defined(OS_FREEBSD) - // Handle hotplug events from libusb. - static int LIBUSB_CALL HotplugCallback(libusb_context* context, - libusb_device* device, - libusb_hotplug_event event, - void* user_data); -+#endif - // These functions release a reference to the provided platform device. - void OnPlatformDeviceAdded(ScopedLibusbDeviceRef platform_device); - void OnPlatformDeviceRemoved(ScopedLibusbDeviceRef platform_device); -@@ -97,7 +99,9 @@ class UsbServiceImpl : - // connected instead of only when a full enumeration is requested. - // TODO(reillyg): Support this on all platforms. crbug.com/411715 - bool hotplug_enabled_ = false; -+#if !defined(OS_FREEBSD) - libusb_hotplug_callback_handle hotplug_handle_; -+#endif - - // Enumeration callbacks are queued until an enumeration completes. - bool enumeration_ready_ = false; diff --git a/www/iridium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc b/www/iridium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc index 3f13f43d7e15..697ace21a29a 100644 --- a/www/iridium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc +++ b/www/iridium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig 2019-10-21 19:06:34 UTC +++ extensions/browser/api/declarative_webrequest/webrequest_action.cc -@@ -28,7 +28,11 @@ +@@ -27,7 +27,11 @@ #include "extensions/common/extension.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/http/http_util.h" @@ -10,5 +10,5 @@ #include "third_party/re2/src/re2/re2.h" +#endif - using content::ResourceRequestInfo; using extension_web_request_api_helpers::EventResponseDelta; + diff --git a/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc index 4bba15cb75e5..7ded2d7c1140 100644 --- a/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,6 +1,6 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2020-02-03 21:52:46 UTC +++ extensions/browser/api/messaging/message_service.cc -@@ -58,7 +58,7 @@ namespace { +@@ -61,7 +61,7 @@ namespace { const char kReceivingEndDoesntExistError[] = "Could not establish connection. Receiving end does not exist."; @@ -9,16 +9,16 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -318,7 +318,7 @@ void MessageService::OpenChannelToNativeApp( - if (!source) +@@ -391,7 +391,7 @@ void MessageService::OpenChannelToNativeApp( + if (!opener_port->IsValidPort()) return; -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - content::WebContents* web_contents = - content::WebContents::FromRenderFrameHost(source); - ExtensionWebContentsObserver* extension_web_contents_observer = -@@ -378,12 +378,12 @@ void MessageService::OpenChannelToNativeApp( + bool has_permission = extension->permissions_data()->HasAPIPermission( + APIPermission::kNativeMessaging); + if (!has_permission) { +@@ -441,11 +441,11 @@ void MessageService::OpenChannelToNativeApp( channel->opener->IncrementLazyKeepaliveCount(); AddChannel(std::move(channel), receiver_port_id); @@ -26,10 +26,9 @@ +#else // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)) const char kNativeMessagingNotSupportedError[] = "Native Messaging is not supported on this platform."; - DispatchOnDisconnect( - source, receiver_port_id, kNativeMessagingNotSupportedError); + opener_port->DispatchOnDisconnect(kNativeMessagingNotSupportedError); -#endif // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)) +#endif // !(defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)) } - void MessageService::OpenChannelToTab(int source_process_id, + void MessageService::OpenChannelToTab(const ChannelEndpoint& source, diff --git a/www/iridium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc b/www/iridium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc index 402789d2414e..d640fe45fcf4 100644 --- a/www/iridium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc +++ b/www/iridium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc @@ -1,9 +1,9 @@ ---- extensions/browser/browser_context_keyed_service_factories.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2020-02-03 21:52:46 UTC +++ extensions/browser/browser_context_keyed_service_factories.cc -@@ -85,7 +85,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() - #if defined(OS_CHROMEOS) - NetworkingConfigServiceFactory::GetInstance(); - #endif +@@ -71,7 +71,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() + HidDeviceManager::GetFactoryInstance(); + IdleManagerFactory::GetInstance(); + ManagementAPI::GetFactoryInstance(); -#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) +#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD) NetworkingPrivateEventRouterFactory::GetInstance(); diff --git a/www/iridium/files/patch-extensions_common_api___permission__features.json b/www/iridium/files/patch-extensions_common_api___permission__features.json index fd4fc87e9fbf..554abd741ba8 100644 --- a/www/iridium/files/patch-extensions_common_api___permission__features.json +++ b/www/iridium/files/patch-extensions_common_api___permission__features.json @@ -1,4 +1,4 @@ ---- extensions/common/api/_permission_features.json.orig 2019-03-11 22:00:58 UTC +--- extensions/common/api/_permission_features.json.orig 2020-02-03 21:53:31 UTC +++ extensions/common/api/_permission_features.json @@ -135,7 +135,7 @@ { @@ -9,7 +9,7 @@ "whitelist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -470,7 +470,7 @@ +@@ -468,7 +468,7 @@ }, { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], @@ -18,7 +18,7 @@ "whitelist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -501,7 +501,7 @@ +@@ -499,7 +499,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], diff --git a/www/iridium/files/patch-extensions_common_api_runtime.json b/www/iridium/files/patch-extensions_common_api_runtime.json index 89dbadf1bc55..9d5dea52dcbc 100644 --- a/www/iridium/files/patch-extensions_common_api_runtime.json +++ b/www/iridium/files/patch-extensions_common_api_runtime.json @@ -1,6 +1,6 @@ ---- extensions/common/api/runtime.json.orig 2019-03-11 22:00:58 UTC +--- extensions/common/api/runtime.json.orig 2020-02-03 21:53:31 UTC +++ extensions/common/api/runtime.json -@@ -66,7 +66,7 @@ +@@ -68,7 +68,7 @@ "id": "PlatformOs", "type": "string", "description": "The operating system chrome is running on.", diff --git a/www/iridium/files/patch-extensions_common_feature__switch.cc b/www/iridium/files/patch-extensions_common_feature__switch.cc index c59bf0a971d5..9cac45bedcb2 100644 --- a/www/iridium/files/patch-extensions_common_feature__switch.cc +++ b/www/iridium/files/patch-extensions_common_feature__switch.cc @@ -1,14 +1,16 @@ ---- extensions/common/feature_switch.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/common/feature_switch.cc.orig 2019-10-21 19:06:34 UTC +++ extensions/common/feature_switch.cc -@@ -44,11 +44,7 @@ class CommonSwitches { +@@ -42,11 +42,11 @@ class CommonSwitches { FeatureSwitch::DEFAULT_ENABLED), load_media_router_component_extension( kLoadMediaRouterComponentExtensionFlag, --#if defined(GOOGLE_CHROME_BUILD) +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) ++#if BUILDFLAG(GOOGLE_CHROME_BRANDING) || defined(OS_BSD) FeatureSwitch::DEFAULT_ENABLED) --#else -- FeatureSwitch::DEFAULT_DISABLED) --#endif // defined(GOOGLE_CHROME_BUILD) + #else + FeatureSwitch::DEFAULT_DISABLED) +-#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) ++#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) || defined(OS_BSD) { } diff --git a/www/iridium/files/patch-extensions_common_features_feature.cc b/www/iridium/files/patch-extensions_common_features_feature.cc index a2cd4e35c041..e97794f406b1 100644 --- a/www/iridium/files/patch-extensions_common_features_feature.cc +++ b/www/iridium/files/patch-extensions_common_features_feature.cc @@ -1,11 +1,11 @@ ---- extensions/common/features/feature.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/common/features/feature.cc.orig 2019-07-24 18:58:27 UTC +++ extensions/common/features/feature.cc -@@ -26,6 +26,8 @@ Feature::Platform Feature::GetCurrentPlatform() { +@@ -20,7 +20,7 @@ namespace extensions { + Feature::Platform Feature::GetCurrentPlatform() { + #if defined(OS_CHROMEOS) + return CHROMEOS_PLATFORM; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + return LINUX_PLATFORM; + #elif defined(OS_MACOSX) return MACOSX_PLATFORM; - #elif defined(OS_WIN) - return WIN_PLATFORM; -+#elif defined(OS_BSD) -+ return LINUX_PLATFORM; - #else - return UNSPECIFIED_PLATFORM; - #endif diff --git a/www/iridium/files/patch-extensions_common_image__util.cc b/www/iridium/files/patch-extensions_common_image__util.cc index 246421809d22..7048ea59ebd3 100644 --- a/www/iridium/files/patch-extensions_common_image__util.cc +++ b/www/iridium/files/patch-extensions_common_image__util.cc @@ -1,4 +1,4 @@ ---- extensions/common/image_util.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/common/image_util.cc.orig 2020-02-03 21:52:47 UTC +++ extensions/common/image_util.cc @@ -18,7 +18,11 @@ #include "base/strings/stringprintf.h" diff --git a/www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc b/www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc index 8d14f11a8934..196003fc999d 100644 --- a/www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc +++ b/www/iridium/files/patch-extensions_shell_app_shell__main__delegate.cc @@ -1,4 +1,4 @@ ---- extensions/shell/app/shell_main_delegate.cc.orig 2019-03-11 22:00:58 UTC +--- extensions/shell/app/shell_main_delegate.cc.orig 2019-09-09 21:55:17 UTC +++ extensions/shell/app/shell_main_delegate.cc @@ -38,7 +38,7 @@ @@ -9,15 +9,6 @@ #include "base/nix/xdg_util.h" #elif defined(OS_MACOSX) #include "base/base_paths_mac.h" -@@ -52,7 +52,7 @@ - - namespace { - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - extensions::ShellCrashReporterClient* GetCrashReporterClient() { - static base::NoDestructor<extensions::ShellCrashReporterClient> instance; - return instance.get(); @@ -70,7 +70,7 @@ base::FilePath GetDataPath() { return cmd_line->GetSwitchValuePath(switches::kContentShellDataPath); diff --git a/www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc new file mode 100644 index 000000000000..194f3950299b --- /dev/null +++ b/www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc @@ -0,0 +1,11 @@ +--- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2019-09-16 09:48:37 UTC ++++ extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc +@@ -45,7 +45,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin + bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) { + #if defined(OS_CHROMEOS) + info->os = api::runtime::PLATFORM_OS_CROS; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + info->os = api::runtime::PLATFORM_OS_LINUX; + #endif + return true; diff --git a/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc b/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc new file mode 100644 index 000000000000..7333dad7d6bf --- /dev/null +++ b/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.cc @@ -0,0 +1,20 @@ +--- extensions/shell/browser/shell_extensions_api_client.cc.orig 2019-09-09 21:55:17 UTC ++++ extensions/shell/browser/shell_extensions_api_client.cc +@@ -16,7 +16,7 @@ + #include "extensions/shell/browser/shell_virtual_keyboard_delegate.h" + #include "extensions/shell/browser/shell_web_view_guest_delegate.h" + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #include "extensions/shell/browser/api/file_system/shell_file_system_delegate.h" + #endif + +@@ -52,7 +52,7 @@ ShellExtensionsAPIClient::CreateDisplayInfoProvider() + return std::make_unique<ShellDisplayInfoProvider>(); + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + FileSystemDelegate* ShellExtensionsAPIClient::GetFileSystemDelegate() { + if (!file_system_delegate_) + file_system_delegate_ = std::make_unique<ShellFileSystemDelegate>(); diff --git a/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h b/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h new file mode 100644 index 000000000000..31f01db1d1d5 --- /dev/null +++ b/www/iridium/files/patch-extensions_shell_browser_shell__extensions__api__client.h @@ -0,0 +1,19 @@ +--- extensions/shell/browser/shell_extensions_api_client.h.orig 2019-09-09 21:55:17 UTC ++++ extensions/shell/browser/shell_extensions_api_client.h +@@ -32,14 +32,14 @@ class ShellExtensionsAPIClient : public ExtensionsAPIC + content::BrowserContext* browser_context) const override; + std::unique_ptr<DisplayInfoProvider> CreateDisplayInfoProvider() + const override; +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + FileSystemDelegate* GetFileSystemDelegate() override; + #endif + MessagingDelegate* GetMessagingDelegate() override; + FeedbackPrivateDelegate* GetFeedbackPrivateDelegate() override; + + private: +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + std::unique_ptr<FileSystemDelegate> file_system_delegate_; + #endif + std::unique_ptr<MessagingDelegate> messaging_delegate_; diff --git a/www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc b/www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc new file mode 100644 index 000000000000..7a7e1a0192c2 --- /dev/null +++ b/www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc @@ -0,0 +1,53 @@ +--- google_apis/gcm/engine/heartbeat_manager.cc.orig 2020-03-16 18:39:51 UTC ++++ google_apis/gcm/engine/heartbeat_manager.cc +@@ -31,13 +31,13 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30; + // Minimum time spent sleeping before we force a new heartbeat. + const int kMinSuspendTimeMs = 1000 * 10; // 10 seconds. + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // The period at which to check if the heartbeat time has passed. Used to + // protect against platforms where the timer is delayed by the system being + // suspended. Only needed on linux because the other OSes provide a standard + // way to be notified of system suspend and resume events. + const int kHeartbeatMissedCheckMs = 1000 * 60 * 5; // 5 minutes. +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + + } // namespace + +@@ -191,7 +191,7 @@ void HeartbeatManager::RestartTimer() { + base::BindRepeating(&HeartbeatManager::OnHeartbeatTriggered, + weak_ptr_factory_.GetWeakPtr())); + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // Windows, Mac, Android, iOS, and Chrome OS all provide a way to be notified + // when the system is suspending or resuming. The only one that does not is + // Linux so we need to poll to check for missed heartbeats. +@@ -200,7 +200,7 @@ void HeartbeatManager::RestartTimer() { + base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat, + weak_ptr_factory_.GetWeakPtr()), + base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs)); +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + } + + void HeartbeatManager::CheckForMissedHeartbeat() { +@@ -216,14 +216,14 @@ void HeartbeatManager::CheckForMissedHeartbeat() { + return; + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // Otherwise check again later. + io_task_runner_->PostDelayedTask( + FROM_HERE, + base::BindOnce(&HeartbeatManager::CheckForMissedHeartbeat, + weak_ptr_factory_.GetWeakPtr()), + base::TimeDelta::FromMilliseconds(kHeartbeatMissedCheckMs)); +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif // (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + } + + void HeartbeatManager::UpdateHeartbeatInterval() { diff --git a/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc index a79056f2f9cf..3756044745e9 100644 --- a/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc +++ b/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc @@ -1,11 +1,20 @@ ---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2019-03-11 22:00:59 UTC +--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2020-03-16 18:40:32 UTC +++ gpu/command_buffer/common/gpu_memory_buffer_support.cc -@@ -89,7 +89,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf +@@ -50,7 +50,7 @@ bool IsImageSizeValidForGpuMemoryBufferFormat(const gf uint32_t GetPlatformSpecificTextureTarget() { #if defined(OS_MACOSX) return GL_TEXTURE_RECTANGLE_ARB; -#elif defined(OS_ANDROID) || defined(OS_LINUX) +#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) return GL_TEXTURE_EXTERNAL_OES; - #elif defined(OS_WIN) + #elif defined(OS_WIN) || defined(OS_FUCHSIA) return GL_TEXTURE_2D; +@@ -72,7 +72,7 @@ GPU_EXPORT uint32_t GetBufferTextureTarget(gfx::Buffer + + GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextureTarget( + gfx::BufferFormat format) { +-#if defined(USE_OZONE) || defined(OS_LINUX) ++#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_BSD) + // Always use GL_TEXTURE_2D as the target for RGB textures. + // https://crbug.com/916728 + if (format == gfx::BufferFormat::R_8 || format == gfx::BufferFormat::RG_88 || diff --git a/www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc b/www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc new file mode 100644 index 000000000000..04701c95d5c1 --- /dev/null +++ b/www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc @@ -0,0 +1,100 @@ +--- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2020-03-16 18:40:32 UTC ++++ gpu/command_buffer/service/external_vk_image_backing.cc +@@ -27,7 +27,7 @@ + #include "ui/gl/buildflags.h" + #include "ui/gl/gl_context.h" + +-#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN) + #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h" + #endif + +@@ -35,7 +35,7 @@ + #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h" + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586 + #endif + +@@ -630,7 +630,7 @@ std::unique_ptr<SharedImageRepresentationDawn> + ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager, + MemoryTypeTracker* tracker, + WGPUDevice wgpuDevice) { +-#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN) + if (!wgpu_format_) { + DLOG(ERROR) << "Format not supported for Dawn"; + return nullptr; +@@ -653,14 +653,14 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager + return std::make_unique<ExternalVkImageDawnRepresentation>( + manager, this, tracker, wgpuDevice, wgpu_format_.value(), memory_fd, + image_info.fAlloc.fSize, memory_type_index_.value()); +-#else // !defined(OS_LINUX) || !BUILDFLAG(USE_DAWN) ++#else // (!defined(OS_LINUX) && !defined(OS_BSD)) || !BUILDFLAG(USE_DAWN) + NOTIMPLEMENTED_LOG_ONCE(); + return nullptr; + #endif + } + + GLuint ExternalVkImageBacking::ProduceGLTextureInternal() { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + GrVkImageInfo image_info; + bool result = backend_texture_.getVkImageInfo(&image_info); + DCHECK(result); +@@ -710,7 +710,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna + #elif defined(OS_FUCHSIA) + NOTIMPLEMENTED_LOG_ONCE(); + return 0; +-#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA) ++#else // !defined(OS_LINUX) && !defined(OS_BSD) && !defined(OS_FUCHSIA) + #error Unsupported OS + #endif + } +@@ -724,7 +724,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa + return nullptr; + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (!texture_) { + GLuint texture_service_id = ProduceGLTextureInternal(); + if (!texture_service_id) +@@ -755,7 +755,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa + #elif defined(OS_FUCHSIA) + NOTIMPLEMENTED_LOG_ONCE(); + return nullptr; +-#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA) ++#else // !defined(OS_LINUX) && !defined(OS_BSD) && !defined(OS_FUCHSIA) + #error Unsupported OS + #endif + } +@@ -770,7 +770,7 @@ ExternalVkImageBacking::ProduceGLTexturePassthrough( + return nullptr; + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (!texture_passthrough_) { + GLuint texture_service_id = ProduceGLTextureInternal(); + if (!texture_service_id) +@@ -790,7 +790,7 @@ ExternalVkImageBacking::ProduceGLTexturePassthrough( + #elif defined(OS_FUCHSIA) + NOTIMPLEMENTED_LOG_ONCE(); + return nullptr; +-#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA) ++#else // !defined(OS_LINUX) && !defined(OS_BSD) && !defined(OS_FUCHSIA) + #error Unsupported OS + #endif + } +@@ -808,7 +808,7 @@ ExternalVkImageBacking::ProduceSkia( + tracker); + } + +-#ifdef OS_LINUX ++#if defined(OS_LINUX) || defined(OS_BSD) + int ExternalVkImageBacking::GetMemoryFd(const GrVkImageInfo& image_info) { + VkMemoryGetFdInfoKHR get_fd_info; + get_fd_info.sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR; diff --git a/www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h b/www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h new file mode 100644 index 000000000000..38283056309d --- /dev/null +++ b/www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__backing.h @@ -0,0 +1,11 @@ +--- gpu/command_buffer/service/external_vk_image_backing.h.orig 2020-03-16 18:40:32 UTC ++++ gpu/command_buffer/service/external_vk_image_backing.h +@@ -132,7 +132,7 @@ class ExternalVkImageBacking final : public ClearTrack + base::Optional<WGPUTextureFormat> wgpu_format, + base::Optional<uint32_t> memory_type_index); + +-#ifdef OS_LINUX ++#if defined(OS_LINUX) || defined(OS_BSD) + // Extract file descriptor from image + int GetMemoryFd(const GrVkImageInfo& image_info); + #endif diff --git a/www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc b/www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc new file mode 100644 index 000000000000..b94f6df0650f --- /dev/null +++ b/www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__gl__representation.cc @@ -0,0 +1,20 @@ +--- gpu/command_buffer/service/external_vk_image_gl_representation.cc.orig 2020-02-03 21:53:31 UTC ++++ gpu/command_buffer/service/external_vk_image_gl_representation.cc +@@ -179,7 +179,7 @@ GLuint ExternalVkImageGLRepresentationShared::ImportVk + #if defined(OS_FUCHSIA) + NOTIMPLEMENTED_LOG_ONCE(); + return 0; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + if (handle.vk_handle_type() != + VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) { + DLOG(ERROR) << "Importing semaphore handle of unexpected type:" +@@ -194,7 +194,7 @@ GLuint ExternalVkImageGLRepresentationShared::ImportVk + fd.release()); + + return gl_semaphore; +-#else // !defined(OS_FUCHSIA) && !defined(OS_LINUX) ++#else // !defined(OS_FUCHSIA) && !defined(OS_LINUX) && !defined(OS_BSD) + #error Unsupported OS + #endif + } diff --git a/www/iridium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc b/www/iridium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc index c3f6ef47ef25..efb8db3c0dc3 100644 --- a/www/iridium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc +++ b/www/iridium/files/patch-gpu_command__buffer_tests_gl__copy__texture__CHROMIUM__unittest.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig 2019-03-17 17:07:44 UTC +--- gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc.orig 2020-03-16 18:39:51 UTC +++ gpu/command_buffer/tests/gl_copy_texture_CHROMIUM_unittest.cc -@@ -562,7 +562,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText +@@ -642,7 +642,7 @@ class GLCopyTextureCHROMIUMES3Test : public GLCopyText bool ShouldSkipNorm16() const { DCHECK(!ShouldSkipTest()); diff --git a/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc b/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc index 3b7af1803ca1..9867201456bf 100644 --- a/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc +++ b/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc @@ -1,7 +1,7 @@ ---- gpu/command_buffer/tests/gl_test_utils.cc.orig 2019-03-17 17:06:00 UTC +--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2020-03-16 18:39:51 UTC +++ gpu/command_buffer/tests/gl_test_utils.cc -@@ -22,7 +22,7 @@ - #include "ui/gfx/geometry/size.h" +@@ -23,7 +23,7 @@ + #include "ui/gl/gl_version_info.h" #include "ui/gl/init/gl_factory.h" -#if defined(OS_LINUX) @@ -9,7 +9,7 @@ #include "ui/gl/gl_image_native_pixmap.h" #endif -@@ -425,7 +425,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { +@@ -445,7 +445,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { window_system_binding_info_ = gl::GLWindowSystemBindingInfo(); } diff --git a/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.h b/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.h index 067b9a1fb1b8..2a43e73c2793 100644 --- a/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.h +++ b/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.h @@ -1,6 +1,6 @@ ---- gpu/command_buffer/tests/gl_test_utils.h.orig 2019-03-17 17:06:38 UTC +--- gpu/command_buffer/tests/gl_test_utils.h.orig 2019-10-21 19:06:35 UTC +++ gpu/command_buffer/tests/gl_test_utils.h -@@ -112,7 +112,7 @@ class GpuCommandBufferTestEGL { +@@ -120,7 +120,7 @@ class GpuCommandBufferTestEGL { return gfx::HasExtension(gl_extensions_, extension); } diff --git a/www/iridium/files/patch-gpu_config_gpu__control__list.cc b/www/iridium/files/patch-gpu_config_gpu__control__list.cc index fbf362282dab..e666e762ba6a 100644 --- a/www/iridium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/iridium/files/patch-gpu_config_gpu__control__list.cc @@ -1,4 +1,4 @@ ---- gpu/config/gpu_control_list.cc.orig 2019-03-11 22:00:59 UTC +--- gpu/config/gpu_control_list.cc.orig 2020-02-03 21:52:47 UTC +++ gpu/config/gpu_control_list.cc @@ -16,7 +16,11 @@ #include "base/values.h" @@ -21,7 +21,7 @@ return kGLTypeGL; #elif defined(OS_MACOSX) return kGLTypeGL; -@@ -699,7 +703,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -713,7 +717,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif defined(OS_FUCHSIA) return kOsFuchsia; diff --git a/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc b/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc index a930facd388a..d06bde69aa2d 100644 --- a/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc +++ b/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc @@ -1,15 +1,24 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2019-03-11 22:00:59 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2020-03-16 18:40:32 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.cc -@@ -12,7 +12,7 @@ +@@ -14,7 +14,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h" #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #include "ui/gfx/client_native_pixmap_factory.h" #include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h" -@@ -37,7 +37,7 @@ namespace gpu { + #endif +@@ -24,7 +24,7 @@ + #include "ui/ozone/public/ozone_platform.h" + #endif + +-#if defined(USE_OZONE) || defined(OS_LINUX) ++#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_BSD) + #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" + #endif + +@@ -42,7 +42,7 @@ namespace gpu { GpuMemoryBufferSupport::GpuMemoryBufferSupport() { #if defined(USE_OZONE) client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone(); @@ -18,30 +27,21 @@ client_native_pixmap_factory_.reset( gfx::CreateClientNativePixmapFactoryDmabuf()); #endif -@@ -51,7 +51,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() +@@ -56,7 +56,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType() return gfx::IO_SURFACE_BUFFER; #elif defined(OS_ANDROID) return gfx::ANDROID_HARDWARE_BUFFER; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) +-#elif defined(OS_LINUX) || defined(USE_OZONE) ++#elif defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD) return gfx::NATIVE_PIXMAP; #elif defined(OS_WIN) return gfx::DXGI_SHARED_HANDLE; -@@ -109,7 +109,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo - #elif defined(USE_OZONE) - return ui::OzonePlatform::EnsureInstance()->IsNativePixmapConfigSupported( - format, usage); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - return false; // TODO(julian.isorce): Add linux support. - #elif defined(OS_WIN) - switch (usage) { -@@ -166,7 +166,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH +@@ -181,7 +181,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH return GpuMemoryBufferImplIOSurface::CreateFromHandle( std::move(handle), size, format, usage, std::move(callback)); #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(USE_OZONE) || defined(OS_BSD) case gfx::NATIVE_PIXMAP: return GpuMemoryBufferImplNativePixmap::CreateFromHandle( client_native_pixmap_factory(), std::move(handle), size, format, diff --git a/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h b/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h index b65940f54b45..dc652a126740 100644 --- a/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h +++ b/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h @@ -1,4 +1,4 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2019-03-11 22:00:59 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2019-12-16 21:50:48 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.h @@ -16,7 +16,7 @@ #include "ui/gfx/geometry/size.h" @@ -18,7 +18,7 @@ gfx::ClientNativePixmapFactory* client_native_pixmap_factory() { return client_native_pixmap_factory_.get(); } -@@ -61,7 +61,7 @@ class GPU_EXPORT GpuMemoryBufferSupport { +@@ -62,7 +62,7 @@ class GPU_EXPORT GpuMemoryBufferSupport { GpuMemoryBufferImpl::DestructionCallback callback); private: diff --git a/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc b/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc index a3ae793cbba2..2dff9b7c455a 100644 --- a/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,25 +1,43 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2019-03-11 22:00:59 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2020-03-16 18:40:32 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -87,7 +87,7 @@ void InitializeDirectCompositionOverlaySupport(GPUInfo +@@ -109,7 +109,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in + #endif } - #endif // defined(OS_WIN) --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST)) || defined(OS_BSD) +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) bool CanAccessNvidiaDeviceFile() { bool res = true; - base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::WILL_BLOCK); -@@ -129,7 +129,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - // crash during feature collection. - gpu::SetKeysForCrashLogging(gpu_info_); + base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, +@@ -120,7 +120,7 @@ bool CanAccessNvidiaDeviceFile() { + } + return res; + } +-#endif // OS_LINUX && !OS_CHROMEOS && !BUILDFLAG(IS_CHROMECAST) ++#endif // (OS_LINUX && !OS_CHROMEOS && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD) + + class GpuWatchdogInit { + public: +@@ -170,7 +170,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + gpu_info_.subpixel_font_rendering = true; + #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -199,7 +199,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - sandbox_helper_->PreSandboxStartup(); +@@ -221,7 +221,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + delayed_watchdog_enable = true; + #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // PreSandbox is mainly for resource handling and not related to the GPU + // driver, it doesn't need the GPU watchdog. The loadLibrary may take long + // time that killing and restarting the GPU process will not help. +@@ -266,7 +266,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + } bool attempted_startsandbox = false; -#if defined(OS_LINUX) @@ -27,3 +45,92 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. +@@ -275,7 +275,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + watchdog_thread_.get(), &gpu_info_, gpu_preferences_); + attempted_startsandbox = true; + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) && !defined(OS_BSD) + + base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); + +@@ -299,14 +299,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + } + if (gl_initialized && use_swiftshader && + gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " + << "on Linux"; + return false; + #else + gl::init::ShutdownGL(true); + gl_initialized = false; +-#endif // OS_LINUX ++#endif // OS_LINUX || OS_BSD + } + + if (!gl_initialized) { +@@ -332,7 +332,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + } + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) && !defined(OS_BSD) + // The ContentSandboxHelper is currently the only one implementation of + // gpu::GpuSandboxHelper and it has no dependency. Except on Linux where + // VaapiWrapper checks the GL implementation to determine which display +@@ -370,7 +370,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + command_line, gpu_feature_info_, + gpu_preferences_.disable_software_rasterizer, false); + if (use_swiftshader) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " + << "on Linux"; + return false; +@@ -384,7 +384,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + << "failed"; + return false; + } +-#endif // OS_LINUX ++#endif // OS_LINUX || OS_BSD + } + } else { // use_swiftshader == true + switch (gpu_preferences_.use_vulkan) { +@@ -440,7 +440,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + + InitializePlatformOverlaySettings(&gpu_info_); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Driver may create a compatibility profile context when collect graphics + // information on Linux platform. Try to collect graphics information + // based on core profile context after disabling platform extensions. +@@ -459,7 +459,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + return false; + } + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + if (use_swiftshader) { + AdjustInfoToSwiftShader(); +@@ -637,7 +637,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c + + InitializePlatformOverlaySettings(&gpu_info_); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Driver may create a compatibility profile context when collect graphics + // information on Linux platform. Try to collect graphics information + // based on core profile context after disabling platform extensions. +@@ -657,7 +657,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c + } + } + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + if (use_swiftshader) { + AdjustInfoToSwiftShader(); diff --git a/www/iridium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc b/www/iridium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc index 774599403f09..af39329a6e9d 100644 --- a/www/iridium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc +++ b/www/iridium/files/patch-gpu_ipc_service_gpu__memory__buffer__factory.cc @@ -1,20 +1,20 @@ ---- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2019-03-11 22:00:59 UTC +--- gpu/ipc/service/gpu_memory_buffer_factory.cc.orig 2019-07-24 18:58:27 UTC +++ gpu/ipc/service/gpu_memory_buffer_factory.cc @@ -12,7 +12,7 @@ #include "gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h" #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) #include "gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h" #endif -@@ -33,7 +33,7 @@ GpuMemoryBufferFactory::CreateNativeType() { - return base::WrapUnique(new GpuMemoryBufferFactoryIOSurface); +@@ -34,7 +34,7 @@ GpuMemoryBufferFactory::CreateNativeType( + return std::make_unique<GpuMemoryBufferFactoryIOSurface>(); #elif defined(OS_ANDROID) - return base::WrapUnique(new GpuMemoryBufferFactoryAndroidHardwareBuffer); --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - return base::WrapUnique(new GpuMemoryBufferFactoryNativePixmap); + return std::make_unique<GpuMemoryBufferFactoryAndroidHardwareBuffer>(); +-#elif defined(OS_LINUX) || defined(OS_FUCHSIA) ++#elif defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) + return std::make_unique<GpuMemoryBufferFactoryNativePixmap>( + vulkan_context_provider); #elif defined(OS_WIN) - return base::WrapUnique(new GpuMemoryBufferFactoryDXGI); diff --git a/www/iridium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc b/www/iridium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc index c030d54a8b8a..bcadfa7d9e7b 100644 --- a/www/iridium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc +++ b/www/iridium/files/patch-gpu_ipc_service_gpu__watchdog__thread.cc @@ -1,73 +1,56 @@ ---- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-03-11 22:00:59 UTC +--- gpu/ipc/service/gpu_watchdog_thread.cc.orig 2020-03-16 18:40:32 UTC +++ gpu/ipc/service/gpu_watchdog_thread.cc -@@ -51,8 +51,10 @@ const int kGpuTimeout = 10000; - #endif +@@ -63,7 +63,7 @@ void GpuWatchdogTimeoutHistogram(GpuWatchdogTimeoutEve + base::UmaHistogramEnumeration("GPU.WatchdogThread.V1.Timeout", timeout_event); + } - #if defined(USE_X11) -+#if !defined(OS_BSD) +-#if defined(USE_X11) ++#if defined(USE_X11) && !defined(OS_BSD) const base::FilePath::CharType kTtyFilePath[] = FILE_PATH_LITERAL("/sys/class/tty/tty0/active"); -+#endif - const unsigned char text[20] = "check"; #endif - -@@ -75,8 +77,10 @@ GpuWatchdogThread::GpuWatchdogThread() - display_(nullptr), - window_(0), - atom_(x11::None), -+#if !defined(OS_BSD) - host_tty_(-1), +@@ -81,7 +81,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() + arm_cpu_time_(), #endif -+#endif - weak_factory_(this) { - base::subtle::NoBarrier_Store(&awaiting_acknowledge_, false); - -@@ -91,7 +95,9 @@ GpuWatchdogThread::GpuWatchdogThread() + suspension_counter_(this) +-#if defined(USE_X11) ++#if defined(USE_X11) && !defined(OS_BSD) + , + host_tty_(-1) + #endif +@@ -103,7 +103,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() + DCHECK(result); #endif - #if defined(USE_X11) -+#if !defined(OS_BSD) +-#if defined(USE_X11) ++#if defined(USE_X11) && !defined(OS_BSD) tty_file_ = base::OpenFile(base::FilePath(kTtyFilePath), "r"); -+#endif - SetupXServer(); - #endif - base::MessageLoopCurrent::Get()->AddTaskObserver(&task_observer_); -@@ -238,8 +244,10 @@ GpuWatchdogThread::~GpuWatchdogThread() { - power_monitor->RemoveObserver(this); + UpdateActiveTTY(); + host_tty_ = active_tty_; +@@ -251,7 +251,7 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() { + + base::PowerMonitor::RemoveObserver(this); - #if defined(USE_X11) -+#if !defined(OS_BSD) +-#if defined(USE_X11) ++#if defined(USE_X11) && !defined(OS_BSD) if (tty_file_) fclose(tty_file_); -+#endif - if (display_) { - DCHECK(window_); - XDestroyWindow(display_, window_); -@@ -463,7 +471,7 @@ void GpuWatchdogThread::DeliberatelyTerminateToRecover + #endif +@@ -434,7 +434,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR return; #endif -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) // Don't crash if we're not on the TTY of our host X11 server. - int active_tty = GetActiveTTY(); - if (host_tty_ != -1 && active_tty != -1 && host_tty_ != active_tty) { -@@ -526,7 +534,9 @@ void GpuWatchdogThread::SetupXServer() { - CopyFromParent, InputOutput, CopyFromParent, 0, nullptr); - atom_ = XInternAtom(display_, "CHECK", x11::False); - } -+#if !defined(OS_BSD) - host_tty_ = GetActiveTTY(); -+#endif - } - - void GpuWatchdogThread::SetupXChangeProp() { -@@ -627,7 +637,7 @@ base::ThreadTicks GpuWatchdogThread::GetWatchedThreadT + UpdateActiveTTY(); + if (host_tty_ != -1 && active_tty_ != -1 && host_tty_ != active_tty_) { +@@ -609,7 +609,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT } #endif -#if defined(USE_X11) +#if defined(USE_X11) && !defined(OS_BSD) - int GpuWatchdogThread::GetActiveTTY() const { - char tty_string[8] = {0}; - if (tty_file_ && !fseek(tty_file_, 0, SEEK_SET) && + void GpuWatchdogThreadImplV1::UpdateActiveTTY() { + last_active_tty_ = active_tty_; + diff --git a/www/iridium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h b/www/iridium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h index ea9edd7d8ce0..e81e9e60d43d 100644 --- a/www/iridium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h +++ b/www/iridium/files/patch-gpu_ipc_service_gpu__watchdog__thread.h @@ -1,13 +1,20 @@ ---- gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-03-11 22:00:59 UTC +--- gpu/ipc/service/gpu_watchdog_thread.h.orig 2020-03-16 18:40:32 UTC +++ gpu/ipc/service/gpu_watchdog_thread.h -@@ -191,8 +191,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi - XDisplay* display_; - gfx::AcceleratedWidget window_; - XAtom atom_; -+#if !defined(OS_BSD) - FILE* tty_file_; - int host_tty_; -+#endif +@@ -207,7 +207,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 + base::ThreadTicks GetWatchedThreadTime(); + #endif + +-#if defined(USE_X11) ++#if defined(USE_X11) && !defined(OS_BSD) + void UpdateActiveTTY(); #endif - base::RepeatingClosure alternative_terminate_for_testing_; +@@ -265,7 +265,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 + // whether GpuWatchdogThreadEvent::kGpuWatchdogStart has been recorded. + bool is_watchdog_start_histogram_recorded = false; + +-#if defined(USE_X11) ++#if defined(USE_X11) && !defined(OS_BSD) + FILE* tty_file_; + int host_tty_; + int active_tty_ = -1; diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc new file mode 100644 index 000000000000..a6794bea5437 --- /dev/null +++ b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc @@ -0,0 +1,32 @@ +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2020-03-16 18:40:32 UTC ++++ gpu/vulkan/vulkan_function_pointers.cc +@@ -782,7 +782,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer + } + #endif // defined(OS_ANDROID) + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + if (gfx::HasExtension(enabled_extensions, + VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME)) { + vkGetSemaphoreFdKHRFn = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>( +@@ -801,9 +801,9 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer + return false; + } + } +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (gfx::HasExtension(enabled_extensions, + VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME)) { + vkGetMemoryFdKHRFn = reinterpret_cast<PFN_vkGetMemoryFdKHR>( +@@ -823,7 +823,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer + return false; + } + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_FUCHSIA) + if (gfx::HasExtension(enabled_extensions, diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h new file mode 100644 index 000000000000..5684a3f44924 --- /dev/null +++ b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -0,0 +1,45 @@ +--- gpu/vulkan/vulkan_function_pointers.h.orig 2020-03-16 18:40:32 UTC ++++ gpu/vulkan/vulkan_function_pointers.h +@@ -180,15 +180,15 @@ struct VulkanFunctionPointers { + vkGetAndroidHardwareBufferPropertiesANDROIDFn = nullptr; + #endif // defined(OS_ANDROID) + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHRFn = nullptr; + PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHRFn = nullptr; +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + PFN_vkGetMemoryFdKHR vkGetMemoryFdKHRFn = nullptr; + PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHRFn = nullptr; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_FUCHSIA) + PFN_vkImportSemaphoreZirconHandleFUCHSIA +@@ -378,18 +378,18 @@ struct VulkanFunctionPointers { + ->vkGetAndroidHardwareBufferPropertiesANDROIDFn + #endif // defined(OS_ANDROID) + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + #define vkGetSemaphoreFdKHR \ + gpu::GetVulkanFunctionPointers()->vkGetSemaphoreFdKHRFn + #define vkImportSemaphoreFdKHR \ + gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHRFn +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #define vkGetMemoryFdKHR gpu::GetVulkanFunctionPointers()->vkGetMemoryFdKHRFn + #define vkGetMemoryFdPropertiesKHR \ + gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHRFn +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + #if defined(OS_FUCHSIA) + #define vkImportSemaphoreZirconHandleFUCHSIA \ diff --git a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc index a3629cd7838e..86931c284dea 100644 --- a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc +++ b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_content_browser_client.cc.orig 2019-03-11 22:00:59 UTC +--- headless/lib/browser/headless_content_browser_client.cc.orig 2020-03-16 18:39:51 UTC +++ headless/lib/browser/headless_content_browser_client.cc -@@ -187,7 +187,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet +@@ -157,7 +157,7 @@ HeadlessContentBrowserClient::GetGeneratedCodeCacheSet return content::GeneratedCodeCacheSettings(true, 0, context->GetPath()); } @@ -9,7 +9,7 @@ void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -198,7 +198,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped +@@ -168,7 +168,7 @@ void HeadlessContentBrowserClient::GetAdditionalMapped mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd); #endif // defined(HEADLESS_USE_BREAKPAD) } @@ -18,3 +18,12 @@ void HeadlessContentBrowserClient::AppendExtraCommandLineSwitches( base::CommandLine* command_line, +@@ -231,7 +231,7 @@ void HeadlessContentBrowserClient::AppendExtraCommandL + process_type, child_process_id); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Processes may only query perf_event_open with the BPF sandbox disabled. + if (old_command_line.HasSwitch(::switches::kEnableThreadInstructionCount) && + old_command_line.HasSwitch(service_manager::switches::kNoSandbox)) { diff --git a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h index 6cd14cc0bb2b..f29e51b1a4f7 100644 --- a/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h +++ b/www/iridium/files/patch-headless_lib_browser_headless__content__browser__client.h @@ -1,7 +1,7 @@ ---- headless/lib/browser/headless_content_browser_client.h.orig 2019-03-11 22:00:59 UTC +--- headless/lib/browser/headless_content_browser_client.h.orig 2020-03-16 18:39:51 UTC +++ headless/lib/browser/headless_content_browser_client.h -@@ -34,7 +34,7 @@ class HeadlessContentBrowserClient : public content::C - ::storage::OptionalQuotaSettingsCallback callback) override; +@@ -29,7 +29,7 @@ class HeadlessContentBrowserClient : public content::C + override; content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings( content::BrowserContext* context) override; -#if defined(OS_POSIX) && !defined(OS_MACOSX) diff --git a/www/iridium/files/patch-headless_lib_browser_headless__request__context__manager.cc b/www/iridium/files/patch-headless_lib_browser_headless__request__context__manager.cc index 3756e7a3a33b..dbae7f502c62 100644 --- a/www/iridium/files/patch-headless_lib_browser_headless__request__context__manager.cc +++ b/www/iridium/files/patch-headless_lib_browser_headless__request__context__manager.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_request_context_manager.cc.orig 2019-03-11 22:00:59 UTC +--- headless/lib/browser/headless_request_context_manager.cc.orig 2019-12-16 21:51:26 UTC +++ headless/lib/browser/headless_request_context_manager.cc -@@ -35,7 +35,7 @@ namespace headless { +@@ -26,7 +26,7 @@ namespace headless { namespace { @@ -9,7 +9,7 @@ static char kProductName[] = "HeadlessChrome"; #endif -@@ -81,7 +81,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic +@@ -56,7 +56,7 @@ net::NetworkTrafficAnnotationTag GetProxyConfigTraffic return traffic_annotation; } @@ -18,21 +18,12 @@ ::network::mojom::CryptConfigPtr BuildCryptConfigOnce( const base::FilePath& user_data_path) { static bool done_once = false; -@@ -290,7 +290,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM - proxy_config_monitor_ = - std::make_unique<HeadlessProxyConfigMonitor>(proxy_monitor_task_runner); +@@ -197,7 +197,7 @@ HeadlessRequestContextManager::HeadlessRequestContextM + proxy_config_monitor_ = std::make_unique<HeadlessProxyConfigMonitor>( + base::ThreadTaskRunnerHandle::Get()); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - crypt_config_ = BuildCryptConfigOnce(user_data_path_); - if (network_service_enabled_ && crypt_config_) - content::GetNetworkService()->SetCryptConfig(std::move(crypt_config_)); -@@ -366,7 +366,7 @@ void HeadlessRequestContextManager::InitializeOnIO() { - std::move(protocol_handler.second)); - } - protocol_handlers_.clear(); --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - if (crypt_config_) { - content::GetNetworkServiceImpl()->SetCryptConfig( - std::move(crypt_config_)); + auto crypt_config = BuildCryptConfigOnce(user_data_path_); + if (crypt_config) + content::GetNetworkService()->SetCryptConfig(std::move(crypt_config)); diff --git a/www/iridium/files/patch-headless_lib_browser_headless__request__context__manager.h b/www/iridium/files/patch-headless_lib_browser_headless__request__context__manager.h deleted file mode 100644 index 7780cfd2173f..000000000000 --- a/www/iridium/files/patch-headless_lib_browser_headless__request__context__manager.h +++ /dev/null @@ -1,11 +0,0 @@ ---- headless/lib/browser/headless_request_context_manager.h.orig 2019-03-17 18:56:16 UTC -+++ headless/lib/browser/headless_request_context_manager.h -@@ -69,7 +69,7 @@ class HeadlessRequestContextManager { - std::unique_ptr<HeadlessProxyConfigMonitor> proxy_config_monitor_; - bool is_system_context_; - --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) - ::network::mojom::CryptConfigPtr crypt_config_; - #endif - diff --git a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc new file mode 100644 index 000000000000..b6d23a82eac8 --- /dev/null +++ b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -0,0 +1,20 @@ +--- headless/lib/headless_content_main_delegate.cc.orig 2020-03-16 18:39:51 UTC ++++ headless/lib/headless_content_main_delegate.cc +@@ -405,7 +405,7 @@ int HeadlessContentMainDelegate::RunProcess( + } + #endif // !defined(CHROME_MULTIPLE_DLL_CHILD) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + void SIGTERMProfilingShutdown(int signal) { + content::Profiling::Stop(); + struct sigaction sigact; +@@ -440,7 +440,7 @@ void HeadlessContentMainDelegate::ZygoteForked() { + breakpad::InitCrashReporter(process_type); + #endif + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // static + HeadlessContentMainDelegate* HeadlessContentMainDelegate::GetInstance() { diff --git a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.h b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.h new file mode 100644 index 000000000000..ea587103f60e --- /dev/null +++ b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.h @@ -0,0 +1,11 @@ +--- headless/lib/headless_content_main_delegate.h.orig 2020-03-16 18:39:51 UTC ++++ headless/lib/headless_content_main_delegate.h +@@ -60,7 +60,7 @@ class HEADLESS_EXPORT HeadlessContentMainDelegate + + HeadlessBrowserImpl* browser() const { return browser_.get(); } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + void ZygoteForked() override; + #endif + diff --git a/www/iridium/files/patch-ipc_ipc__channel.h b/www/iridium/files/patch-ipc_ipc__channel.h index a2b1f9794ef0..81baee2eca8d 100644 --- a/www/iridium/files/patch-ipc_ipc__channel.h +++ b/www/iridium/files/patch-ipc_ipc__channel.h @@ -1,6 +1,6 @@ ---- ipc/ipc_channel.h.orig 2019-03-11 22:00:59 UTC +--- ipc/ipc_channel.h.orig 2020-02-03 21:53:32 UTC +++ ipc/ipc_channel.h -@@ -244,7 +244,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { +@@ -282,7 +282,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif diff --git a/www/iridium/files/patch-ipc_ipc__channel__common.cc b/www/iridium/files/patch-ipc_ipc__channel__common.cc index e483961a2640..9a59e5cfaff6 100644 --- a/www/iridium/files/patch-ipc_ipc__channel__common.cc +++ b/www/iridium/files/patch-ipc_ipc__channel__common.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_channel_common.cc.orig 2019-03-11 22:00:59 UTC +--- ipc/ipc_channel_common.cc.orig 2020-02-03 21:52:47 UTC +++ ipc/ipc_channel_common.cc -@@ -9,7 +9,7 @@ +@@ -10,7 +10,7 @@ namespace IPC { @@ -9,3 +9,12 @@ namespace { int g_global_pid = 0; +@@ -26,7 +26,7 @@ int Channel::GetGlobalPid() { + return g_global_pid; + } + +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // static + std::unique_ptr<Channel> Channel::CreateClient( diff --git a/www/iridium/files/patch-ipc_ipc__channel__mojo.cc b/www/iridium/files/patch-ipc_ipc__channel__mojo.cc index 3a90d60689d4..54e779282f74 100644 --- a/www/iridium/files/patch-ipc_ipc__channel__mojo.cc +++ b/www/iridium/files/patch-ipc_ipc__channel__mojo.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_channel_mojo.cc.orig 2019-03-11 22:00:59 UTC +--- ipc/ipc_channel_mojo.cc.orig 2020-02-03 21:52:47 UTC +++ ipc/ipc_channel_mojo.cc -@@ -64,7 +64,7 @@ class MojoChannelFactory : public ChannelFactory { +@@ -74,10 +74,10 @@ class MojoChannelFactory : public ChannelFactory { }; base::ProcessId GetSelfPID() { @@ -8,4 +8,8 @@ +#if defined(OS_LINUX) || defined(OS_BSD) if (int global_pid = Channel::GetGlobalPid()) return global_pid; - #endif // OS_LINUX +-#endif // OS_LINUX ++#endif // OS_LINUX || OS_BSD + #if defined(OS_NACL) + return -1; + #else diff --git a/www/iridium/files/patch-ipc_ipc__message__utils.cc b/www/iridium/files/patch-ipc_ipc__message__utils.cc index ae32e31c76cd..00d57043fb58 100644 --- a/www/iridium/files/patch-ipc_ipc__message__utils.cc +++ b/www/iridium/files/patch-ipc_ipc__message__utils.cc @@ -1,11 +1,11 @@ ---- ipc/ipc_message_utils.cc.orig 2019-03-11 22:00:59 UTC +--- ipc/ipc_message_utils.cc.orig 2019-07-24 18:58:29 UTC +++ ipc/ipc_message_utils.cc -@@ -349,7 +349,7 @@ void ParamTraits<unsigned int>::Log(const param_type& +@@ -355,7 +355,7 @@ void ParamTraits<unsigned int>::Log(const param_type& + l->append(base::NumberToString(p)); } - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \ -- (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) -+ defined(OS_BSD) || (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ + (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) void ParamTraits<long>::Log(const param_type& p, std::string* l) { l->append(base::NumberToString(p)); - } diff --git a/www/iridium/files/patch-ipc_ipc__message__utils.h b/www/iridium/files/patch-ipc_ipc__message__utils.h index 1d0395498400..39fc150c1a08 100644 --- a/www/iridium/files/patch-ipc_ipc__message__utils.h +++ b/www/iridium/files/patch-ipc_ipc__message__utils.h @@ -1,11 +1,11 @@ ---- ipc/ipc_message_utils.h.orig 2019-03-11 22:00:59 UTC +--- ipc/ipc_message_utils.h.orig 2020-02-03 21:53:32 UTC +++ ipc/ipc_message_utils.h -@@ -204,7 +204,7 @@ struct ParamTraits<unsigned int> { +@@ -209,7 +209,7 @@ struct ParamTraits<unsigned int> { + // 3) Android 64 bit and Fuchsia also have int64_t typedef'd to long. // Since we want to support Android 32<>64 bit IPC, as long as we don't have // these traits for 32 bit ARM then that'll catch any errors. - #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \ -- (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) -+ defined(OS_BSD) || (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ + (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS)) template <> struct ParamTraits<long> { - typedef long param_type; diff --git a/www/iridium/files/patch-media_BUILD.gn b/www/iridium/files/patch-media_BUILD.gn index 8822df0e27d8..2e46acb021a0 100644 --- a/www/iridium/files/patch-media_BUILD.gn +++ b/www/iridium/files/patch-media_BUILD.gn @@ -1,6 +1,6 @@ ---- media/BUILD.gn.orig 2019-03-11 22:00:59 UTC +--- media/BUILD.gn.orig 2020-03-16 18:40:33 UTC +++ media/BUILD.gn -@@ -59,6 +59,9 @@ config("media_config") { +@@ -63,6 +63,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/iridium/files/patch-media_audio_BUILD.gn b/www/iridium/files/patch-media_audio_BUILD.gn index 73f9891f0b9a..a37b99f54c9c 100644 --- a/www/iridium/files/patch-media_audio_BUILD.gn +++ b/www/iridium/files/patch-media_audio_BUILD.gn @@ -1,7 +1,7 @@ ---- media/audio/BUILD.gn.orig 2019-03-11 22:00:59 UTC +--- media/audio/BUILD.gn.orig 2020-03-16 18:40:33 UTC +++ media/audio/BUILD.gn -@@ -242,8 +242,18 @@ source_set("audio") { - deps += [ "//media/base/android:media_jni_headers" ] +@@ -232,8 +232,18 @@ source_set("audio") { + ] } - if (is_linux) { diff --git a/www/iridium/files/patch-media_audio_alsa_audio__manager__alsa.cc b/www/iridium/files/patch-media_audio_alsa_audio__manager__alsa.cc index e51f3bbd480d..313dd1df12eb 100644 --- a/www/iridium/files/patch-media_audio_alsa_audio__manager__alsa.cc +++ b/www/iridium/files/patch-media_audio_alsa_audio__manager__alsa.cc @@ -1,4 +1,4 @@ ---- media/audio/alsa/audio_manager_alsa.cc.orig 2019-04-05 00:49:21 UTC +--- media/audio/alsa/audio_manager_alsa.cc.orig 2019-04-30 22:22:52 UTC +++ media/audio/alsa/audio_manager_alsa.cc @@ -92,7 +92,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType int card = -1; diff --git a/www/iridium/files/patch-media_audio_pulse_pulse.sigs b/www/iridium/files/patch-media_audio_pulse_pulse.sigs deleted file mode 100644 index 3d31bd187348..000000000000 --- a/www/iridium/files/patch-media_audio_pulse_pulse.sigs +++ /dev/null @@ -1,143 +0,0 @@ -gen/media/audio/pulse/pulse_stubs.cc:155:27: error: conflicting types for 'pa_context_get_state' -extern pa_context_state_t pa_context_get_state(pa_context* c) __attribute__((weak)); - ^ -../../../../../../../../../../usr/local/include/pulse/context.h:199:20: note: previous declaration is here -pa_context_state_t pa_context_get_state(const pa_context *c); - ^ -gen/media/audio/pulse/pulse_stubs.cc:156:21: error: conflicting types for 'pa_context_get_state' -pa_context_state_t pa_context_get_state(pa_context* c) { - ^ -../../../../../../../../../../usr/local/include/pulse/context.h:199:20: note: previous declaration is here -pa_context_state_t pa_context_get_state(const pa_context *c); - ^ -gen/media/audio/pulse/pulse_stubs.cc:171:29: error: conflicting types for 'pa_operation_get_state' -extern pa_operation_state_t pa_operation_get_state(pa_operation* o) __attribute__((weak)); - ^ -../../../../../../../../../../usr/local/include/pulse/operation.h:52:22: note: previous declaration is here -pa_operation_state_t pa_operation_get_state(const pa_operation *o); - ^ -gen/media/audio/pulse/pulse_stubs.cc:172:23: error: conflicting types for 'pa_operation_get_state' -pa_operation_state_t pa_operation_get_state(pa_operation* o) { - ^ -../../../../../../../../../../usr/local/include/pulse/operation.h:52:22: note: previous declaration is here -pa_operation_state_t pa_operation_get_state(const pa_operation *o); - ^ -gen/media/audio/pulse/pulse_stubs.cc:211:17: error: conflicting types for 'pa_stream_get_device_index' -extern uint32_t pa_stream_get_device_index(pa_stream* s) __attribute__((weak)); - ^ -../../../../../../../../../../usr/local/include/pulse/stream.h:366:10: note: previous declaration is here -uint32_t pa_stream_get_device_index(const pa_stream *s); - ^ -gen/media/audio/pulse/pulse_stubs.cc:212:11: error: conflicting types for 'pa_stream_get_device_index' -uint32_t pa_stream_get_device_index(pa_stream* s) { - ^ -../../../../../../../../../../usr/local/include/pulse/stream.h:366:10: note: previous declaration is here -uint32_t pa_stream_get_device_index(const pa_stream *s); - ^ -gen/media/audio/pulse/pulse_stubs.cc:219:26: error: conflicting types for 'pa_stream_get_state' -extern pa_stream_state_t pa_stream_get_state(pa_stream* p) __attribute__((weak)); - ^ -../../../../../../../../../../usr/local/include/pulse/stream.h:345:19: note: previous declaration is here -pa_stream_state_t pa_stream_get_state(const pa_stream *p); - ^ -gen/media/audio/pulse/pulse_stubs.cc:220:20: error: conflicting types for 'pa_stream_get_state' -pa_stream_state_t pa_stream_get_state(pa_stream* p) { - ^ -../../../../../../../../../../usr/local/include/pulse/stream.h:345:19: note: previous declaration is here -pa_stream_state_t pa_stream_get_state(const pa_stream *p); - ^ -gen/media/audio/pulse/pulse_stubs.cc:235:12: error: conflicting types for 'pa_proplist_contains' -extern int pa_proplist_contains(pa_proplist* p, const char* key) __attribute__((weak)); - ^ -../../../../../../../../../../usr/local/include/pulse/proplist.h:390:5: note: previous declaration is here -int pa_proplist_contains(const pa_proplist *p, const char *key); - ^ -gen/media/audio/pulse/pulse_stubs.cc:236:6: error: conflicting types for 'pa_proplist_contains' -int pa_proplist_contains(pa_proplist* p, const char* key) { - ^ -../../../../../../../../../../usr/local/include/pulse/proplist.h:390:5: note: previous declaration is here -int pa_proplist_contains(const pa_proplist *p, const char *key); - ^ -gen/media/audio/pulse/pulse_stubs.cc:243:20: error: conflicting types for 'pa_proplist_gets' -extern const char* pa_proplist_gets(pa_proplist* p, const char* key) __attribute__((weak)); - ^ -../../../../../../../../../../usr/local/include/pulse/proplist.h:314:13: note: previous declaration is here -const char *pa_proplist_gets(const pa_proplist *p, const char *key); - ^ -gen/media/audio/pulse/pulse_stubs.cc:244:14: error: conflicting types for 'pa_proplist_gets' -const char* pa_proplist_gets(pa_proplist* p, const char* key) { - ^ -../../../../../../../../../../usr/local/include/pulse/proplist.h:314:13: note: previous declaration is here -const char *pa_proplist_gets(const pa_proplist *p, const char *key); - ^ -gen/media/audio/pulse/pulse_stubs.cc:251:15: error: conflicting types for 'pa_stream_readable_size' -extern size_t pa_stream_readable_size(pa_stream *p) __attribute__((weak)); - ^ -../../../../../../../../../../usr/local/include/pulse/stream.h:574:8: note: previous declaration is here -size_t pa_stream_readable_size(const pa_stream *p); - ^ -gen/media/audio/pulse/pulse_stubs.cc:252:9: error: conflicting types for 'pa_stream_readable_size' -size_t pa_stream_readable_size(pa_stream *p) { - ^ -../../../../../../../../../../usr/local/include/pulse/stream.h:574:8: note: previous declaration is here -size_t pa_stream_readable_size(const pa_stream *p); - ^ -gen/media/audio/pulse/pulse_stubs.cc:279:12: error: conflicting types for 'pa_context_errno' -extern int pa_context_errno(pa_context *c) __attribute__((weak)); - ^ -../../../../../../../../../../usr/local/include/pulse/context.h:193:5: note: previous declaration is here -int pa_context_errno(const pa_context *c); - ^ -gen/media/audio/pulse/pulse_stubs.cc:280:6: error: conflicting types for 'pa_context_errno' -int pa_context_errno(pa_context *c) { - ^ -../../../../../../../../../../usr/local/include/pulse/context.h:193:5: note: previous declaration is here -int pa_context_errno(const pa_context *c); - ^ - ---- media/audio/pulse/pulse.sigs.orig 2019-03-19 08:52:48 UTC -+++ media/audio/pulse/pulse.sigs -@@ -24,11 +24,11 @@ pa_operation* pa_context_get_source_info_by_index(pa_c - pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata); - pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata); - pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata); --pa_context_state_t pa_context_get_state(pa_context* c); -+pa_context_state_t pa_context_get_state(const pa_context *c); - pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name); - pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata); - void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata); --pa_operation_state_t pa_operation_get_state(pa_operation* o); -+pa_operation_state_t pa_operation_get_state(const pa_operation* o); - void pa_context_unref(pa_context* c); - void pa_operation_unref(pa_operation* o); - int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes); -@@ -38,23 +38,23 @@ pa_operation* pa_stream_cork(pa_stream* s, int b, pa_s - int pa_stream_disconnect(pa_stream* s); - int pa_stream_drop(pa_stream *p); - pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata); --uint32_t pa_stream_get_device_index(pa_stream* s); -+uint32_t pa_stream_get_device_index(const pa_stream* s); - int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative); --pa_stream_state_t pa_stream_get_state(pa_stream* p); -+pa_stream_state_t pa_stream_get_state(const pa_stream* p); - pa_stream* pa_stream_new(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map * map); - pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p); - pa_proplist* pa_proplist_new(void); --int pa_proplist_contains(pa_proplist* p, const char* key); -+int pa_proplist_contains(const pa_proplist* p, const char* key); - void pa_proplist_free(pa_proplist* p); --const char* pa_proplist_gets(pa_proplist* p, const char* key); -+const char* pa_proplist_gets(const pa_proplist* p, const char* key); - int pa_proplist_sets(pa_proplist* p, const char* key, const char* value); --size_t pa_stream_readable_size(pa_stream *p); -+size_t pa_stream_readable_size(const pa_stream *p); - int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes); - void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata); - void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata); - int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek); - void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata); - void pa_stream_unref(pa_stream* s); --int pa_context_errno(pa_context *c); -+int pa_context_errno(const pa_context *c); - const char* pa_strerror(int error); - pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned channels, pa_volume_t v); diff --git a/www/iridium/files/patch-media_base_media__switches.cc b/www/iridium/files/patch-media_base_media__switches.cc new file mode 100644 index 000000000000..ed61b97adc9d --- /dev/null +++ b/www/iridium/files/patch-media_base_media__switches.cc @@ -0,0 +1,11 @@ +--- media/base/media_switches.cc.orig 2020-03-17 10:01:08 UTC ++++ media/base/media_switches.cc +@@ -331,7 +331,7 @@ const base::Feature kFallbackAfterDecodeError{"Fallbac + const base::Feature kGlobalMediaControls { + "GlobalMediaControls", + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/iridium/files/patch-media_base_scopedfd__helper.h b/www/iridium/files/patch-media_base_scopedfd__helper.h index 0652698c4d51..5b097ec108c3 100644 --- a/www/iridium/files/patch-media_base_scopedfd__helper.h +++ b/www/iridium/files/patch-media_base_scopedfd__helper.h @@ -1,14 +1,18 @@ ---- media/base/scopedfd_helper.h.orig 2019-03-11 22:00:59 UTC +--- media/base/scopedfd_helper.h.orig 2019-09-09 21:55:20 UTC +++ media/base/scopedfd_helper.h -@@ -14,14 +14,14 @@ namespace media { - // since the only current user is V4L2 we are limiting the scope to OS_LINUX so +@@ -11,17 +11,17 @@ + namespace media { + + // Theoretically, we can test on defined(OS_POSIX) || defined(OS_FUCHSIA), but +-// since the only current user is V4L2 we are limiting the scope to OS_LINUX so ++// since the only current user is V4L2 we are limiting the scope to OS_LINUX || OS_BSD so // the binary size does not inflate on non-using systems. Feel free to adapt // this and BUILD.gn as our needs evolve. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // Return a new vector containing duplicates of |fds|, or an empty vector in - // case of error. + // Return a new vector containing duplicates of |fds|, or PCHECKs in case of an + // error. MEDIA_EXPORT std::vector<base::ScopedFD> DuplicateFDs( const std::vector<base::ScopedFD>& fds); diff --git a/www/iridium/files/patch-media_base_video__frame.cc b/www/iridium/files/patch-media_base_video__frame.cc index 82b6712e42b1..430d0f3c5bb5 100644 --- a/www/iridium/files/patch-media_base_video__frame.cc +++ b/www/iridium/files/patch-media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- media/base/video_frame.cc.orig 2019-03-11 22:00:59 UTC +--- media/base/video_frame.cc.orig 2019-12-16 21:50:49 UTC +++ media/base/video_frame.cc -@@ -53,7 +53,7 @@ static std::string StorageTypeToString( +@@ -57,7 +57,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -68,7 +68,7 @@ static std::string StorageTypeToString( +@@ -74,7 +74,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,7 +18,25 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -461,7 +461,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva +@@ -257,7 +257,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo + return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and + // thus to have several VideoFrames share the same set of DMABUF FDs. + class VideoFrame::DmabufHolder +@@ -275,7 +275,7 @@ class VideoFrame::DmabufHolder + friend class base::RefCountedThreadSafe<DmabufHolder>; + ~DmabufHolder() = default; + }; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // static + bool VideoFrame::IsValidConfig(VideoPixelFormat format, +@@ -588,7 +588,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -27,17 +45,17 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -592,7 +592,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -724,7 +724,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // If there are any |dmabuf_fds_| plugged in, we should duplicate them. - if (frame->storage_type() == STORAGE_DMABUFS) { - wrapping_frame->dmabuf_fds_ = DuplicateFDs(frame->dmabuf_fds_); -@@ -917,7 +917,7 @@ size_t VideoFrame::shared_memory_offset() const { - return shared_memory_offset_; + DCHECK(frame->dmabuf_fds_); + // If there are any |dmabuf_fds_| plugged in, we should refer them too. + wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; +@@ -1050,7 +1050,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const + : mailbox_holders_[texture_index]; } -#if defined(OS_LINUX) @@ -45,3 +63,12 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); +@@ -1133,7 +1133,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, + storage_type_(storage_type), + visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), + natural_size_(natural_size), +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + dmabuf_fds_(base::MakeRefCounted<DmabufHolder>()), + #endif + timestamp_(timestamp), diff --git a/www/iridium/files/patch-media_base_video__frame.h b/www/iridium/files/patch-media_base_video__frame.h index 06c90939cc4e..d37ffac67837 100644 --- a/www/iridium/files/patch-media_base_video__frame.h +++ b/www/iridium/files/patch-media_base_video__frame.h @@ -1,16 +1,28 @@ ---- media/base/video_frame.h.orig 2019-03-11 22:00:59 UTC +--- media/base/video_frame.h.orig 2020-03-16 18:40:33 UTC +++ media/base/video_frame.h -@@ -71,7 +71,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -39,9 +39,9 @@ + #include "base/mac/scoped_cftyperef.h" + #endif // defined(OS_MACOSX) + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/files/scoped_file.h" +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + namespace gfx { + class GpuMemoryBuffer; +@@ -80,7 +80,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte STORAGE_UNOWNED_MEMORY = 2, // External, non owned data pointers. STORAGE_OWNED_MEMORY = 3, // VideoFrame has allocated its own data buffer. - STORAGE_SHMEM = 4, // Pixels are backed by Shared Memory. + STORAGE_SHMEM = 4, // Backed by unsafe (writable) shared memory. -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // TODO(mcasas): Consider turning this type into STORAGE_NATIVE // based on the idea of using this same enum value for both DMA // buffers on Linux and CVPixelBuffers on Mac (which currently use @@ -245,7 +245,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - uint8_t* a_data, + ReleaseMailboxCB mailbox_holder_release_cb, base::TimeDelta timestamp); -#if defined(OS_LINUX) @@ -18,21 +30,21 @@ // Wraps provided dmabufs // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will -@@ -430,7 +430,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - // Returns the offset into the shared memory where the frame data begins. - size_t shared_memory_offset() const; +@@ -480,7 +480,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // mailbox, the caller must wait for the included sync point. + const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Returns a vector containing the backing DmaBufs for this frame. The number // of returned DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the -@@ -624,7 +624,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - // memory. - size_t shared_memory_offset_; +@@ -662,7 +662,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. + std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) + class DmabufHolder; + // Dmabufs for the frame, used when storage is STORAGE_DMABUFS. Size is either - // equal or less than the number of planes of the frame. If it is less, then - // the memory area represented by the last FD contains the remaining planes. diff --git a/www/iridium/files/patch-media_capture_video_create__video__capture__device__factory.cc b/www/iridium/files/patch-media_capture_video_create__video__capture__device__factory.cc index f5b7886df52a..ab3b5a40d144 100644 --- a/www/iridium/files/patch-media_capture_video_create__video__capture__device__factory.cc +++ b/www/iridium/files/patch-media_capture_video_create__video__capture__device__factory.cc @@ -1,4 +1,4 @@ ---- media/capture/video/create_video_capture_device_factory.cc.orig 2019-03-11 22:00:59 UTC +--- media/capture/video/create_video_capture_device_factory.cc.orig 2019-10-21 19:06:36 UTC +++ media/capture/video/create_video_capture_device_factory.cc @@ -10,7 +10,7 @@ #include "media/capture/video/fake_video_capture_device_factory.h" @@ -8,8 +8,8 @@ +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) #include "media/capture/video/linux/video_capture_device_factory_linux.h" #elif defined(OS_CHROMEOS) - #include "media/capture/video/chromeos/public/cros_features.h" -@@ -33,7 +33,7 @@ namespace { + #include "media/capture/video/chromeos/camera_app_device_bridge_impl.h" +@@ -82,7 +82,7 @@ CreateChromeOSVideoCaptureDeviceFactory( std::unique_ptr<VideoCaptureDeviceFactory> CreatePlatformSpecificVideoCaptureDeviceFactory( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { @@ -17,4 +17,4 @@ +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) return std::make_unique<VideoCaptureDeviceFactoryLinux>(ui_task_runner); #elif defined(OS_CHROMEOS) - // On Chrome OS we have to support two use cases: + return CreateChromeOSVideoCaptureDeviceFactory(ui_task_runner, {}); diff --git a/www/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc index 96b1e260622c..76d95eebd304 100644 --- a/www/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc +++ b/www/iridium/files/patch-media_capture_video_fake__video__capture__device__factory.cc @@ -1,6 +1,6 @@ ---- media/capture/video/fake_video_capture_device_factory.cc.orig 2019-03-11 22:00:59 UTC +--- media/capture/video/fake_video_capture_device_factory.cc.orig 2019-12-16 21:50:49 UTC +++ media/capture/video/fake_video_capture_device_factory.cc -@@ -204,7 +204,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto +@@ -208,7 +208,7 @@ void FakeVideoCaptureDeviceFactory::GetDeviceDescripto for (const auto& entry : devices_config_) { device_descriptors->emplace_back( base::StringPrintf("fake_device_%d", entry_index), entry.device_id, diff --git a/www/iridium/files/patch-media_capture_video_file__video__capture__device__factory.cc b/www/iridium/files/patch-media_capture_video_file__video__capture__device__factory.cc index 6c18690423ac..b1cc42128fa5 100644 --- a/www/iridium/files/patch-media_capture_video_file__video__capture__device__factory.cc +++ b/www/iridium/files/patch-media_capture_video_file__video__capture__device__factory.cc @@ -1,6 +1,6 @@ ---- media/capture/video/file_video_capture_device_factory.cc.orig 2019-03-11 22:00:59 UTC +--- media/capture/video/file_video_capture_device_factory.cc.orig 2019-04-30 22:22:52 UTC +++ media/capture/video/file_video_capture_device_factory.cc -@@ -53,7 +53,7 @@ void FileVideoCaptureDeviceFactory::GetDeviceDescripto +@@ -54,7 +54,7 @@ void FileVideoCaptureDeviceFactory::GetDeviceDescripto #elif defined(OS_MACOSX) command_line_file_path.value(), kFileVideoCaptureDeviceName, VideoCaptureApi::MACOSX_AVFOUNDATION diff --git a/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc b/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc deleted file mode 100644 index a66828aad4da..000000000000 --- a/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__linux.cc +++ /dev/null @@ -1,32 +0,0 @@ ---- media/capture/video/linux/video_capture_device_factory_linux.cc.orig 2019-03-11 22:00:59 UTC -+++ media/capture/video/linux/video_capture_device_factory_linux.cc -@@ -259,6 +259,7 @@ bool VideoCaptureDeviceFactoryLinux::HasUsableFormats( - if (!(capabilities & V4L2_CAP_VIDEO_CAPTURE)) - return false; - -+#if !defined(OS_FREEBSD) - const std::vector<uint32_t>& usable_fourccs = - VideoCaptureDeviceLinux::GetListOfUsableFourCCs(false); - v4l2_fmtdesc fmtdesc = {}; -@@ -267,6 +268,7 @@ bool VideoCaptureDeviceFactoryLinux::HasUsableFormats( - if (base::ContainsValue(usable_fourccs, fmtdesc.pixelformat)) - return true; - } -+#endif - - DVLOG(1) << "No usable formats found"; - return false; -@@ -312,9 +314,13 @@ void VideoCaptureDeviceFactoryLinux::GetSupportedForma - v4l2_format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - for (; DoIoctl(fd, VIDIOC_ENUM_FMT, &v4l2_format) == 0; ++v4l2_format.index) { - VideoCaptureFormat supported_format; -+#if !defined(OS_FREEBSD) - supported_format.pixel_format = - VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat( - v4l2_format.pixelformat); -+#else -+ supported_format.pixel_format = PIXEL_FORMAT_UNKNOWN; -+#endif - - if (supported_format.pixel_format == PIXEL_FORMAT_UNKNOWN) - continue; diff --git a/www/iridium/files/patch-media_capture_video_linux_video__capture__device__linux.cc b/www/iridium/files/patch-media_capture_video_linux_video__capture__device__linux.cc deleted file mode 100644 index 8e96c973337d..000000000000 --- a/www/iridium/files/patch-media_capture_video_linux_video__capture__device__linux.cc +++ /dev/null @@ -1,60 +0,0 @@ ---- media/capture/video/linux/video_capture_device_linux.cc.orig 2019-03-11 22:00:59 UTC -+++ media/capture/video/linux/video_capture_device_linux.cc -@@ -37,6 +37,7 @@ int TranslatePowerLineFrequencyToV4L2(PowerLineFrequen - - } // namespace - -+#if !defined(OS_FREEBSD) - // Translates Video4Linux pixel formats to Chromium pixel formats. - // static - VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat( -@@ -50,6 +51,7 @@ std::vector<uint32_t> VideoCaptureDeviceLinux::GetList - bool favour_mjpeg) { - return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg); - } -+#endif // !defined(OS_FREEBSD) - - VideoCaptureDeviceLinux::VideoCaptureDeviceLinux( - scoped_refptr<V4L2CaptureDevice> v4l2, -@@ -68,6 +70,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDeviceLinux() { - void VideoCaptureDeviceLinux::AllocateAndStart( - const VideoCaptureParams& params, - std::unique_ptr<VideoCaptureDevice::Client> client) { -+#if !defined(OS_FREEBSD) - DCHECK(!capture_impl_); - if (v4l2_thread_.IsRunning()) - return; // Wrong state. -@@ -95,9 +98,11 @@ void VideoCaptureDeviceLinux::AllocateAndStart( - for (auto& request : photo_requests_queue_) - v4l2_thread_.task_runner()->PostTask(FROM_HERE, std::move(request)); - photo_requests_queue_.clear(); -+#endif // !defined(OS_FREEBSD) - } - - void VideoCaptureDeviceLinux::StopAndDeAllocate() { -+#if !defined(OS_FREEBSD) - if (!v4l2_thread_.IsRunning()) - return; // Wrong state. - v4l2_thread_.task_runner()->PostTask( -@@ -107,6 +112,7 @@ void VideoCaptureDeviceLinux::StopAndDeAllocate() { - v4l2_thread_.Stop(); - - capture_impl_ = nullptr; -+#endif // !defined(OS_FREEBSD) - } - - void VideoCaptureDeviceLinux::TakePhoto(TakePhotoCallback callback) { -@@ -149,11 +155,13 @@ void VideoCaptureDeviceLinux::SetPhotoOptions( - } - - void VideoCaptureDeviceLinux::SetRotation(int rotation) { -+#if !defined(OS_FREEBSD) - if (v4l2_thread_.IsRunning()) { - v4l2_thread_.task_runner()->PostTask( - FROM_HERE, base::BindOnce(&V4L2CaptureDelegate::SetRotation, - capture_impl_->GetWeakPtr(), rotation)); - } -+#endif // !defined(OS_FREEBSD) - } - - } // namespace media diff --git a/www/iridium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc b/www/iridium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc deleted file mode 100644 index 993aa99c09a6..000000000000 --- a/www/iridium/files/patch-media_capture_video_mock__gpu__memory__buffer__manager.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- media/capture/video/mock_gpu_memory_buffer_manager.cc.orig 2019-03-11 22:00:59 UTC -+++ media/capture/video/mock_gpu_memory_buffer_manager.cc -@@ -103,7 +103,7 @@ class FakeGpuMemoryBuffer : public gfx::GpuMemoryBuffe - gfx::GpuMemoryBufferHandle handle; - handle.type = gfx::NATIVE_PIXMAP; - handle.id = handle_.id; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - handle.native_pixmap_handle = - gfx::CloneHandleForIPC(handle_.native_pixmap_handle); - #endif diff --git a/www/iridium/files/patch-media_capture_video_shared__memory__handle__provider.cc b/www/iridium/files/patch-media_capture_video_shared__memory__handle__provider.cc deleted file mode 100644 index 68c6b71bdaa2..000000000000 --- a/www/iridium/files/patch-media_capture_video_shared__memory__handle__provider.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- media/capture/video/shared_memory_handle_provider.cc.orig 2019-03-11 22:00:59 UTC -+++ media/capture/video/shared_memory_handle_provider.cc -@@ -63,7 +63,7 @@ bool SharedMemoryHandleProvider::InitFromMojoHandle( - return true; - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - bool SharedMemoryHandleProvider::InitAsReadOnlyFromRawFileDescriptor( - mojo::ScopedHandle fd_handle, - uint32_t memory_size_in_bytes) { diff --git a/www/iridium/files/patch-media_capture_video_shared__memory__handle__provider.h b/www/iridium/files/patch-media_capture_video_shared__memory__handle__provider.h deleted file mode 100644 index 81bc00c85a6e..000000000000 --- a/www/iridium/files/patch-media_capture_video_shared__memory__handle__provider.h +++ /dev/null @@ -1,11 +0,0 @@ ---- media/capture/video/shared_memory_handle_provider.h.orig 2019-03-11 22:00:59 UTC -+++ media/capture/video/shared_memory_handle_provider.h -@@ -38,7 +38,7 @@ class CAPTURE_EXPORT SharedMemoryHandleProvider - - // This requires platforms where base::SharedMemoryHandle is backed by a - // file descriptor. --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - bool InitAsReadOnlyFromRawFileDescriptor(mojo::ScopedHandle fd_handle, - uint32_t memory_size_in_bytes); - #endif // defined(OS_LINUX) diff --git a/www/iridium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc b/www/iridium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc new file mode 100644 index 000000000000..7dcb8b174ae1 --- /dev/null +++ b/www/iridium/files/patch-media_capture_video_video__capture__buffer__pool__impl.cc @@ -0,0 +1,11 @@ +--- media/capture/video/video_capture_buffer_pool_impl.cc.orig 2019-12-16 21:50:49 UTC ++++ media/capture/video/video_capture_buffer_pool_impl.cc +@@ -59,7 +59,7 @@ VideoCaptureBufferPoolImpl::CreateSharedMemoryViaRawFi + int buffer_id) { + // This requires platforms where base::SharedMemoryHandle is backed by a + // file descriptor. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + base::AutoLock lock(lock_); + + VideoCaptureBufferTracker* tracker = GetTracker(buffer_id); diff --git a/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc b/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc index 3a8ed1872e71..b36124fab651 100644 --- a/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,11 +1,11 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2019-03-11 22:00:59 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2019-12-16 21:50:49 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -236,7 +236,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( +@@ -297,7 +297,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - origin_colorspace = libyuv::FOURCC_RAW; + fourcc_format = libyuv::FOURCC_RAW; #elif defined(OS_WIN) - origin_colorspace = libyuv::FOURCC_24BG; + fourcc_format = libyuv::FOURCC_24BG; diff --git a/www/iridium/files/patch-media_formats_mp2t_es__parser__adts.cc b/www/iridium/files/patch-media_formats_mp2t_es__parser__adts.cc index 32a7c440128e..a9a96b393d53 100644 --- a/www/iridium/files/patch-media_formats_mp2t_es__parser__adts.cc +++ b/www/iridium/files/patch-media_formats_mp2t_es__parser__adts.cc @@ -1,6 +1,6 @@ ---- media/formats/mp2t/es_parser_adts.cc.orig 2019-03-11 22:00:59 UTC +--- media/formats/mp2t/es_parser_adts.cc.orig 2019-04-30 22:22:52 UTC +++ media/formats/mp2t/es_parser_adts.cc -@@ -63,11 +63,11 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr +@@ -62,11 +62,11 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr const uint8_t* es; es_queue_->Peek(&es, &es_size); @@ -15,7 +15,7 @@ const uint8_t* cur_buf = &es[offset]; if (!isAdtsSyncWord(cur_buf)) continue; -@@ -107,7 +107,7 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr +@@ -106,7 +106,7 @@ bool EsParserAdts::LookForAdtsFrame(AdtsFrame* adts_fr return true; } diff --git a/www/iridium/files/patch-media_gpu_buffer__validation.cc b/www/iridium/files/patch-media_gpu_buffer__validation.cc new file mode 100644 index 000000000000..7f3005140bd8 --- /dev/null +++ b/www/iridium/files/patch-media_gpu_buffer__validation.cc @@ -0,0 +1,48 @@ +--- media/gpu/buffer_validation.cc.orig 2019-12-17 19:41:51 UTC ++++ media/gpu/buffer_validation.cc +@@ -12,15 +12,15 @@ + #include "ui/gfx/geometry/size.h" + #include "ui/gfx/gpu_memory_buffer.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <sys/types.h> + #include <unistd.h> +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + namespace media { + + bool GetFileSize(const int fd, size_t* size) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (fd < 0) { + VLOGF(1) << "Invalid file descriptor"; + return false; +@@ -46,7 +46,7 @@ bool GetFileSize(const int fd, size_t* size) { + #else + NOTIMPLEMENTED(); + return false; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + } + + bool VerifyGpuMemoryBufferHandle(media::VideoPixelFormat pixel_format, +@@ -56,7 +56,7 @@ bool VerifyGpuMemoryBufferHandle(media::VideoPixelForm + VLOGF(1) << "Unexpected GpuMemoryBufferType: " << gmb_handle.type; + return false; + } +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format); + if (num_planes != gmb_handle.native_pixmap_handle.planes.size() || + num_planes == 0) { +@@ -108,7 +108,7 @@ bool VerifyGpuMemoryBufferHandle(media::VideoPixelForm + #else + NOTIMPLEMENTED(); + return false; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + } + + } // namespace media diff --git a/www/iridium/files/patch-media_media__options.gni b/www/iridium/files/patch-media_media__options.gni index 0b0ff559b760..f2783c3581d2 100644 --- a/www/iridium/files/patch-media_media__options.gni +++ b/www/iridium/files/patch-media_media__options.gni @@ -1,6 +1,6 @@ ---- media/media_options.gni.orig 2019-03-11 22:00:59 UTC +--- media/media_options.gni.orig 2020-03-16 18:40:33 UTC +++ media/media_options.gni -@@ -100,6 +100,9 @@ declare_args() { +@@ -119,6 +119,9 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false diff --git a/www/iridium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc b/www/iridium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc new file mode 100644 index 000000000000..b208560a307d --- /dev/null +++ b/www/iridium/files/patch-media_mojo_clients_mojo__video__encode__accelerator.cc @@ -0,0 +1,11 @@ +--- media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2020-03-16 18:40:33 UTC ++++ media/mojo/clients/mojo_video_encode_accelerator.cc +@@ -132,7 +132,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr< + frame->layout().num_planes()); + DCHECK(vea_.is_bound()); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // TODO(crbug.com/1003197): Remove this once we stop supporting STORAGE_DMABUF + // in VideoEncodeAccelerator. + if (frame->storage_type() == VideoFrame::STORAGE_DMABUFS) { diff --git a/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc new file mode 100644 index 000000000000..46396d067968 --- /dev/null +++ b/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc @@ -0,0 +1,32 @@ +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2020-02-24 18:39:18 UTC ++++ media/mojo/mojom/video_frame_mojom_traits.cc +@@ -20,9 +20,9 @@ + #include "ui/gfx/mojom/buffer_types_mojom_traits.h" + #include "ui/gfx/mojom/color_space_mojom_traits.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "base/posix/eintr_wrapper.h" +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + namespace mojo { + +@@ -60,7 +60,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( + mojo_frame->PlaneOffset(media::VideoFrame::kVPlane))); + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) { + std::vector<mojo::ScopedHandle> dmabuf_fds; + +@@ -161,7 +161,7 @@ bool StructTraits<media::mojom::VideoFrameDataView, + shared_buffer_data.u_offset(), shared_buffer_data.v_offset(), + shared_buffer_data.y_stride(), shared_buffer_data.u_stride(), + shared_buffer_data.v_stride(), timestamp); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + } else if (data.is_dmabuf_data()) { + media::mojom::DmabufVideoFrameDataDataView dmabuf_data; + data.GetDmabufDataDataView(&dmabuf_data); diff --git a/www/iridium/files/patch-media_mojo_services_gpu__mojo__media__client.cc b/www/iridium/files/patch-media_mojo_services_gpu__mojo__media__client.cc index 79fa04f6ecd2..ea181aa1b1f3 100644 --- a/www/iridium/files/patch-media_mojo_services_gpu__mojo__media__client.cc +++ b/www/iridium/files/patch-media_mojo_services_gpu__mojo__media__client.cc @@ -1,20 +1,20 @@ ---- media/mojo/services/gpu_mojo_media_client.cc.orig 2019-03-17 21:51:56 UTC +--- media/mojo/services/gpu_mojo_media_client.cc.orig 2020-03-16 18:40:33 UTC +++ media/mojo/services/gpu_mojo_media_client.cc -@@ -55,7 +55,7 @@ namespace media { +@@ -64,7 +64,7 @@ namespace media { namespace { #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_MACOSX) || \ - defined(OS_WIN) || defined(OS_LINUX) + defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) gpu::CommandBufferStub* GetCommandBufferStub( + scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner, base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager, - base::UnguessableToken channel_token, -@@ -172,7 +172,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea - std::make_unique<VideoFrameFactoryImpl>(gpu_task_runner_, - std::move(get_stub_cb))); - #elif defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN) || \ -- defined(OS_LINUX) -+ defined(OS_LINUX) || defined(OS_BSD) - std::unique_ptr<VideoDecoder> vda_video_decoder = VdaVideoDecoder::Create( - task_runner, gpu_task_runner_, media_log->Clone(), target_color_space, - gpu_preferences_, gpu_workarounds_, +@@ -263,7 +263,7 @@ std::unique_ptr<VideoDecoder> GpuMojoMediaClient::Crea + command_buffer_id->route_id)); + } + +-#elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) ++#elif defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) + video_decoder = VdaVideoDecoder::Create( + task_runner, gpu_task_runner_, media_log->Clone(), target_color_space, + gpu_preferences_, gpu_workarounds_, diff --git a/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.cc b/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.cc new file mode 100644 index 000000000000..684c9adbd4b4 --- /dev/null +++ b/www/iridium/files/patch-media_video_fake__gpu__memory__buffer.cc @@ -0,0 +1,47 @@ +--- media/video/fake_gpu_memory_buffer.cc.orig 2019-12-17 19:43:52 UTC ++++ media/video/fake_gpu_memory_buffer.cc +@@ -6,7 +6,7 @@ + + #include "build/build_config.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <fcntl.h> + #include <sys/stat.h> + #include <sys/types.h> +@@ -44,7 +44,7 @@ class FakeGpuMemoryBufferImpl : public gpu::GpuMemoryB + + } // namespace + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + base::ScopedFD GetDummyFD() { + base::ScopedFD fd(open("/dev/zero", O_RDWR)); + DCHECK(fd.is_valid()); +@@ -67,7 +67,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si + // Set a dummy id since this is for testing only. + handle_.id = gfx::GpuMemoryBufferId(0); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Set a dummy fd since this is for testing only. + handle_.native_pixmap_handle.planes.push_back( + gfx::NativePixmapPlane(size_.width(), 0, y_plane_size, GetDummyFD())); +@@ -76,7 +76,7 @@ FakeGpuMemoryBuffer::FakeGpuMemoryBuffer(const gfx::Si + size_.width(), handle_.native_pixmap_handle.planes[0].size, + uv_plane_size, GetDummyFD())); + } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + } + + FakeGpuMemoryBuffer::~FakeGpuMemoryBuffer() = default; +@@ -135,7 +135,7 @@ gfx::GpuMemoryBufferHandle FakeGpuMemoryBuffer::CloneH + gfx::GpuMemoryBufferHandle handle; + handle.type = gfx::NATIVE_PIXMAP; + handle.id = handle_.id; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + handle.native_pixmap_handle = + gfx::CloneHandleForIPC(handle_.native_pixmap_handle); + #endif diff --git a/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index 3bf2559efd07..3941ed5af217 100644 --- a/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,6 +1,6 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2019-03-11 22:01:00 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2020-02-03 21:53:32 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -633,7 +633,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -572,7 +572,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); diff --git a/www/iridium/files/patch-media_webrtc_webrtc__switches.cc b/www/iridium/files/patch-media_webrtc_webrtc__switches.cc new file mode 100644 index 000000000000..68078dc67afd --- /dev/null +++ b/www/iridium/files/patch-media_webrtc_webrtc__switches.cc @@ -0,0 +1,11 @@ +--- media/webrtc/webrtc_switches.cc.orig 2020-02-03 21:52:48 UTC ++++ media/webrtc/webrtc_switches.cc +@@ -50,7 +50,7 @@ namespace media { + + bool IsWebRtcApmInAudioServiceEnabled() { + #if defined(OS_WIN) || defined(OS_MACOSX) || \ +- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + return base::FeatureList::IsEnabled(features::kWebRtcApmInAudioService) && + !base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kForceDisableWebRtcApmInAudioService); diff --git a/www/iridium/files/patch-mojo_public_c_system_thunks.cc b/www/iridium/files/patch-mojo_public_c_system_thunks.cc index 826608045fde..dec03d588689 100644 --- a/www/iridium/files/patch-mojo_public_c_system_thunks.cc +++ b/www/iridium/files/patch-mojo_public_c_system_thunks.cc @@ -1,6 +1,6 @@ ---- mojo/public/c/system/thunks.cc.orig 2019-03-11 22:01:00 UTC +--- mojo/public/c/system/thunks.cc.orig 2020-02-03 21:52:48 UTC +++ mojo/public/c/system/thunks.cc -@@ -16,7 +16,7 @@ +@@ -15,7 +15,7 @@ #include "build/build_config.h" #include "mojo/public/c/system/core.h" @@ -9,16 +9,7 @@ #include "base/environment.h" #include "base/files/file_path.h" #include "base/optional.h" -@@ -28,7 +28,7 @@ namespace { - - typedef void (*MojoGetSystemThunksFunction)(MojoSystemThunks* thunks); - --#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - PROTECTED_MEMORY_SECTION - base::ProtectedMemory<MojoGetSystemThunksFunction> g_get_thunks; - #endif -@@ -65,7 +65,7 @@ namespace mojo { +@@ -58,7 +58,7 @@ namespace mojo { class CoreLibraryInitializer { public: CoreLibraryInitializer(const MojoInitializeOptions* options) { @@ -27,7 +18,7 @@ bool application_provided_path = false; base::Optional<base::FilePath> library_path; if (options && options->struct_size >= sizeof(*options) && -@@ -84,7 +84,7 @@ class CoreLibraryInitializer { +@@ -77,7 +77,7 @@ class CoreLibraryInitializer { if (!library_path) { // Default to looking for the library in the current working directory. @@ -36,7 +27,18 @@ const base::FilePath::CharType kDefaultLibraryPathValue[] = FILE_PATH_LITERAL("./libmojo_core.so"); #elif defined(OS_WIN) -@@ -147,7 +147,7 @@ class CoreLibraryInitializer { +@@ -127,16 +127,16 @@ class CoreLibraryInitializer { + + CHECK_GT(g_thunks.size, 0u) + << "Invalid mojo_core library: " << library_path->value(); +-#else // defined(OS_CHROMEOS) || defined(OS_LINUX) ++#else // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + NOTREACHED() + << "Dynamic mojo_core loading is not supported on this platform."; +-#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) ++#endif // defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + } + ~CoreLibraryInitializer() = default; private: diff --git a/www/iridium/files/patch-mojo_public_js_mojo__bindings__resources.grd b/www/iridium/files/patch-mojo_public_js_mojo__bindings__resources.grd index 57f963ace1bb..b0970950923b 100644 --- a/www/iridium/files/patch-mojo_public_js_mojo__bindings__resources.grd +++ b/www/iridium/files/patch-mojo_public_js_mojo__bindings__resources.grd @@ -1,11 +1,11 @@ ---- mojo/public/js/mojo_bindings_resources.grd.orig 2019-03-11 22:01:00 UTC +--- mojo/public/js/mojo_bindings_resources.grd.orig 2020-03-16 18:39:53 UTC +++ mojo/public/js/mojo_bindings_resources.grd -@@ -23,7 +23,7 @@ +@@ -70,7 +70,7 @@ use_base_dir="false" type="BINDATA" compress="gzip" /> - <if expr="is_win or is_macosx or is_linux"> + <if expr="is_win or is_macosx or is_posix"> - <include name="IDR_MOJO_TIME_MOJOM_JS" - file="${root_gen_dir}/mojo/public/mojom/base/time.mojom.js" + <include name="IDR_MOJO_TIME_MOJOM_HTML" + file="${root_gen_dir}/mojo/public/mojom/base/time.mojom.html" use_base_dir="false" diff --git a/www/iridium/files/patch-net_BUILD.gn b/www/iridium/files/patch-net_BUILD.gn index 9df4ab0f017b..2696770beb1c 100644 --- a/www/iridium/files/patch-net_BUILD.gn +++ b/www/iridium/files/patch-net_BUILD.gn @@ -1,6 +1,6 @@ ---- net/BUILD.gn.orig 2019-03-11 22:01:00 UTC +--- net/BUILD.gn.orig 2020-03-16 18:40:33 UTC +++ net/BUILD.gn -@@ -97,7 +97,7 @@ net_configs = [ +@@ -103,7 +103,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,7 +9,33 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1900,7 +1900,7 @@ component("net") { +@@ -1247,6 +1247,16 @@ component("net") { + ] + } + ++ if (is_bsd) { ++ sources -= [ ++ "base/address_tracker_linux.cc", ++ "base/address_tracker_linux.h", ++ "base/network_change_notifier_linux.cc", ++ "base/network_change_notifier_linux.h", ++ "base/network_interfaces_linux.cc" ++ ] ++ } ++ + if (is_mac) { + sources += [ + "base/network_notification_thread_mac.cc", +@@ -1373,7 +1383,7 @@ component("net") { + } + } + +- if (is_android || is_chromeos) { ++ if (is_android || is_chromeos || is_bsd) { + sources += [ + "base/network_change_notifier_posix.cc", + "base/network_change_notifier_posix.h", +@@ -1406,7 +1416,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux and Android. @@ -18,20 +44,3 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -1993,6 +1993,16 @@ component("net") { - ] - - sources -= [ "disk_cache/blockfile/file_posix.cc" ] -+ } -+ -+ if (is_bsd) { -+ sources -= [ -+ "base/address_tracker_linux.cc", -+ "base/address_tracker_linux.h", -+ "base/network_change_notifier_linux.cc", -+ "base/network_change_notifier_linux.h", -+ "base/network_interfaces_linux.cc", -+ ] - } - - if (is_ios || is_mac) { diff --git a/www/iridium/files/patch-net_base_address__tracker__linux.cc b/www/iridium/files/patch-net_base_address__tracker__linux.cc index c15cb0bfe598..01047dcf1d20 100644 --- a/www/iridium/files/patch-net_base_address__tracker__linux.cc +++ b/www/iridium/files/patch-net_base_address__tracker__linux.cc @@ -1,331 +1,59 @@ ---- net/base/address_tracker_linux.cc.orig 2019-03-11 22:01:00 UTC +--- net/base/address_tracker_linux.cc.orig 2020-03-03 18:53:55 UTC +++ net/base/address_tracker_linux.cc -@@ -21,96 +21,10 @@ - namespace net { - namespace internal { +@@ -5,7 +5,9 @@ + #include "net/base/address_tracker_linux.h" --namespace { -- --// Some kernel functions such as wireless_send_event and rtnetlink_ifinfo_prep --// may send spurious messages over rtnetlink. RTM_NEWLINK messages where --// ifi_change == 0 and rta_type == IFLA_WIRELESS should be ignored. --bool IgnoreWirelessChange(const struct nlmsghdr* header, -- const struct ifinfomsg* msg) { -- size_t length = IFLA_PAYLOAD(header); -- for (const struct rtattr* attr = IFLA_RTA(msg); RTA_OK(attr, length); -- attr = RTA_NEXT(attr, length)) { -- if (attr->rta_type == IFLA_WIRELESS && msg->ifi_change == 0) -- return true; -- } -- return false; --} -- --// Retrieves address from NETLINK address message. --// Sets |really_deprecated| for IPv6 addresses with preferred lifetimes of 0. --bool GetAddress(const struct nlmsghdr* header, -- IPAddress* out, -- bool* really_deprecated) { -- if (really_deprecated) -- *really_deprecated = false; -- const struct ifaddrmsg* msg = -- reinterpret_cast<struct ifaddrmsg*>(NLMSG_DATA(header)); -- size_t address_length = 0; -- switch (msg->ifa_family) { -- case AF_INET: -- address_length = IPAddress::kIPv4AddressSize; -- break; -- case AF_INET6: -- address_length = IPAddress::kIPv6AddressSize; -- break; -- default: -- // Unknown family. -- return false; -- } -- // Use IFA_ADDRESS unless IFA_LOCAL is present. This behavior here is based on -- // getaddrinfo in glibc (check_pf.c). Judging from kernel implementation of -- // NETLINK, IPv4 addresses have only the IFA_ADDRESS attribute, while IPv6 -- // have the IFA_LOCAL attribute. -- uint8_t* address = NULL; -- uint8_t* local = NULL; -- size_t length = IFA_PAYLOAD(header); -- for (const struct rtattr* attr = -- reinterpret_cast<const struct rtattr*>(IFA_RTA(msg)); -- RTA_OK(attr, length); -- attr = RTA_NEXT(attr, length)) { -- switch (attr->rta_type) { -- case IFA_ADDRESS: -- DCHECK_GE(RTA_PAYLOAD(attr), address_length); -- address = reinterpret_cast<uint8_t*>(RTA_DATA(attr)); -- break; -- case IFA_LOCAL: -- DCHECK_GE(RTA_PAYLOAD(attr), address_length); -- local = reinterpret_cast<uint8_t*>(RTA_DATA(attr)); -- break; -- case IFA_CACHEINFO: { -- const struct ifa_cacheinfo *cache_info = -- reinterpret_cast<const struct ifa_cacheinfo*>(RTA_DATA(attr)); -- if (really_deprecated) -- *really_deprecated = (cache_info->ifa_prefered == 0); -- } break; -- default: -- break; -- } -- } -- if (local) -- address = local; -- if (!address) -- return false; -- *out = IPAddress(address, address_length); -- return true; --} -- --} // namespace -- - // static - char* AddressTrackerLinux::GetInterfaceName(int interface_index, char* buf) { -- memset(buf, 0, IFNAMSIZ); -- base::ScopedFD ioctl_socket = GetSocketForIoctl(); -- if (!ioctl_socket.is_valid()) -- return buf; -- -- struct ifreq ifr = {}; -- ifr.ifr_ifindex = interface_index; -- -- if (ioctl(ioctl_socket.get(), SIOCGIFNAME, &ifr) == 0) -- strncpy(buf, ifr.ifr_name, IFNAMSIZ - 1); -- return buf; -+ NOTIMPLEMENTED(); -+ return NULL; - } - - AddressTrackerLinux::AddressTrackerLinux() -@@ -153,93 +67,8 @@ AddressTrackerLinux::~AddressTrackerLinux() { - } + #include <errno.h> ++#if !defined(OS_BSD) + #include <linux/if.h> ++#endif + #include <stdint.h> + #include <sys/ioctl.h> + #include <utility> +@@ -177,6 +179,7 @@ AddressTrackerLinux::AddressTrackerLinux( + AddressTrackerLinux::~AddressTrackerLinux() = default; void AddressTrackerLinux::Init() { -- netlink_fd_ = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); -- if (netlink_fd_ < 0) { -- PLOG(ERROR) << "Could not create NETLINK socket"; -- AbortAndForceOnline(); -- return; -- } -- -- int rv; -- -- if (tracking_) { -- // Request notifications. -- struct sockaddr_nl addr = {}; -- addr.nl_family = AF_NETLINK; -- addr.nl_pid = getpid(); -- // TODO(szym): Track RTMGRP_LINK as well for ifi_type, -- // http://crbug.com/113993 -- addr.nl_groups = -- RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR | RTMGRP_NOTIFY | RTMGRP_LINK; -- rv = bind( -- netlink_fd_, reinterpret_cast<struct sockaddr*>(&addr), sizeof(addr)); -- if (rv < 0) { -- PLOG(ERROR) << "Could not bind NETLINK socket"; -- AbortAndForceOnline(); -- return; -- } -- } -- -- // Request dump of addresses. -- struct sockaddr_nl peer = {}; -- peer.nl_family = AF_NETLINK; -- -- struct { -- struct nlmsghdr header; -- struct rtgenmsg msg; -- } request = {}; -- -- request.header.nlmsg_len = NLMSG_LENGTH(sizeof(request.msg)); -- request.header.nlmsg_type = RTM_GETADDR; -- request.header.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP; -- request.header.nlmsg_pid = getpid(); -- request.msg.rtgen_family = AF_UNSPEC; -- -- rv = HANDLE_EINTR(sendto(netlink_fd_, &request, request.header.nlmsg_len, -- 0, reinterpret_cast<struct sockaddr*>(&peer), -- sizeof(peer))); -- if (rv < 0) { -- PLOG(ERROR) << "Could not send NETLINK request"; -- AbortAndForceOnline(); -- return; -- } -- -- // Consume pending message to populate the AddressMap, but don't notify. -- // Sending another request without first reading responses results in EBUSY. -- bool address_changed; -- bool link_changed; -- bool tunnel_changed; -- ReadMessages(&address_changed, &link_changed, &tunnel_changed); -- -- // Request dump of link state -- request.header.nlmsg_type = RTM_GETLINK; -- -- rv = HANDLE_EINTR(sendto(netlink_fd_, &request, request.header.nlmsg_len, 0, -- reinterpret_cast<struct sockaddr*>(&peer), -- sizeof(peer))); -- if (rv < 0) { -- PLOG(ERROR) << "Could not send NETLINK request"; -- AbortAndForceOnline(); -- return; -- } -- -- // Consume pending message to populate links_online_, but don't notify. -- ReadMessages(&address_changed, &link_changed, &tunnel_changed); -- { -- AddressTrackerAutoLock lock(*this, connection_type_lock_); -- connection_type_initialized_ = true; -- connection_type_initialized_cv_.Broadcast(); -- } -- -- if (tracking_) { -- rv = base::MessageLoopCurrentForIO::Get()->WatchFileDescriptor( -- netlink_fd_, true, base::MessagePumpForIO::WATCH_READ, &watcher_, this); -- if (rv < 0) { -- PLOG(ERROR) << "Could not watch NETLINK socket"; -- AbortAndForceOnline(); -- return; -- } -- } -+NOTIMPLEMENTED(); -+AbortAndForceOnline(); ++#if !defined(OS_FREEBSD) + netlink_fd_.reset(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)); + if (!netlink_fd_.is_valid()) { + PLOG(ERROR) << "Could not create NETLINK socket"; +@@ -272,6 +275,7 @@ void AddressTrackerLinux::AbortAndForceOnline() { + connection_type_initialized_cv_.Broadcast(); } - void AddressTrackerLinux::AbortAndForceOnline() { -@@ -250,25 +79,6 @@ void AddressTrackerLinux::AbortAndForceOnline() { - connection_type_initialized_cv_.Broadcast(); ++#if !defined(OS_BSD) + AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const { + AddressTrackerAutoLock lock(*this, address_map_lock_); + return address_map_; +@@ -290,6 +294,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter + const char* interface_name = get_interface_name_(interface_index, buf); + return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end(); } ++#endif // !OS_BSD --AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const { -- AddressTrackerAutoLock lock(*this, address_map_lock_); -- return address_map_; --} -- --std::unordered_set<int> AddressTrackerLinux::GetOnlineLinks() const { -- AddressTrackerAutoLock lock(*this, online_links_lock_); -- return online_links_; --} -- --bool AddressTrackerLinux::IsInterfaceIgnored(int interface_index) const { -- if (ignored_interfaces_.empty()) -- return false; -- -- char buf[IFNAMSIZ] = {0}; -- const char* interface_name = get_interface_name_(interface_index, buf); -- return ignored_interfaces_.find(interface_name) != ignored_interfaces_.end(); --} -- NetworkChangeNotifier::ConnectionType AddressTrackerLinux::GetCurrentConnectionType() { - // http://crbug.com/125097 -@@ -326,102 +136,7 @@ void AddressTrackerLinux::HandleMessage(char* buffer, +@@ -348,6 +353,7 @@ void AddressTrackerLinux::HandleMessage(const char* bu bool* address_changed, bool* link_changed, bool* tunnel_changed) { -- DCHECK(buffer); -- for (struct nlmsghdr* header = reinterpret_cast<struct nlmsghdr*>(buffer); -- NLMSG_OK(header, length); -- header = NLMSG_NEXT(header, length)) { -- switch (header->nlmsg_type) { -- case NLMSG_DONE: -- return; -- case NLMSG_ERROR: { -- const struct nlmsgerr* msg = -- reinterpret_cast<struct nlmsgerr*>(NLMSG_DATA(header)); -- LOG(ERROR) << "Unexpected netlink error " << msg->error << "."; -- } return; -- case RTM_NEWADDR: { -- IPAddress address; -- bool really_deprecated; -- struct ifaddrmsg* msg = -- reinterpret_cast<struct ifaddrmsg*>(NLMSG_DATA(header)); -- if (IsInterfaceIgnored(msg->ifa_index)) -- break; -- if (GetAddress(header, &address, &really_deprecated)) { -- AddressTrackerAutoLock lock(*this, address_map_lock_); -- // Routers may frequently (every few seconds) output the IPv6 ULA -- // prefix which can cause the linux kernel to frequently output two -- // back-to-back messages, one without the deprecated flag and one with -- // the deprecated flag but both with preferred lifetimes of 0. Avoid -- // interpretting this as an actual change by canonicalizing the two -- // messages by setting the deprecated flag based on the preferred -- // lifetime also. http://crbug.com/268042 -- if (really_deprecated) -- msg->ifa_flags |= IFA_F_DEPRECATED; -- // Only indicate change if the address is new or ifaddrmsg info has -- // changed. -- auto it = address_map_.find(address); -- if (it == address_map_.end()) { -- address_map_.insert(it, std::make_pair(address, *msg)); -- *address_changed = true; -- } else if (memcmp(&it->second, msg, sizeof(*msg))) { -- it->second = *msg; -- *address_changed = true; -- } -- } -- } break; -- case RTM_DELADDR: { -- IPAddress address; -- const struct ifaddrmsg* msg = -- reinterpret_cast<struct ifaddrmsg*>(NLMSG_DATA(header)); -- if (IsInterfaceIgnored(msg->ifa_index)) -- break; -- if (GetAddress(header, &address, NULL)) { -- AddressTrackerAutoLock lock(*this, address_map_lock_); -- if (address_map_.erase(address)) -- *address_changed = true; -- } -- } break; -- case RTM_NEWLINK: { -- const struct ifinfomsg* msg = -- reinterpret_cast<struct ifinfomsg*>(NLMSG_DATA(header)); -- if (IsInterfaceIgnored(msg->ifi_index)) -- break; -- if (IgnoreWirelessChange(header, msg)) { -- VLOG(2) << "Ignoring RTM_NEWLINK message"; -- break; -- } -- if (!(msg->ifi_flags & IFF_LOOPBACK) && (msg->ifi_flags & IFF_UP) && -- (msg->ifi_flags & IFF_LOWER_UP) && (msg->ifi_flags & IFF_RUNNING)) { -- AddressTrackerAutoLock lock(*this, online_links_lock_); -- if (online_links_.insert(msg->ifi_index).second) { -- *link_changed = true; -- if (IsTunnelInterface(msg->ifi_index)) -- *tunnel_changed = true; -- } -- } else { -- AddressTrackerAutoLock lock(*this, online_links_lock_); -- if (online_links_.erase(msg->ifi_index)) { -- *link_changed = true; -- if (IsTunnelInterface(msg->ifi_index)) -- *tunnel_changed = true; -- } -- } -- } break; -- case RTM_DELLINK: { -- const struct ifinfomsg* msg = -- reinterpret_cast<struct ifinfomsg*>(NLMSG_DATA(header)); -- if (IsInterfaceIgnored(msg->ifi_index)) -- break; -- AddressTrackerAutoLock lock(*this, online_links_lock_); -- if (online_links_.erase(msg->ifi_index)) { -- *link_changed = true; -- if (IsTunnelInterface(msg->ifi_index)) -- *tunnel_changed = true; -- } -- } break; -- default: -- break; -- } -- } ++#if !defined(OS_FREEBSD) + DCHECK(buffer); + // Note that NLMSG_NEXT decrements |length| to reflect the number of bytes + // remaining in |buffer|. +@@ -460,6 +466,10 @@ void AddressTrackerLinux::HandleMessage(const char* bu + break; + } + } ++#else // !OS_FREEBSD + NOTIMPLEMENTED(); ++ AbortAndForceOnline(); ++#endif // !OS_FREEBSD } - void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) { -@@ -458,31 +173,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const + void AddressTrackerLinux::OnFileCanReadWithoutBlocking() { +@@ -487,31 +497,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const } void AddressTrackerLinux::UpdateCurrentConnectionType() { @@ -357,4 +85,4 @@ + NOTIMPLEMENTED(); } - int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting() + int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting() { diff --git a/www/iridium/files/patch-net_base_features.cc b/www/iridium/files/patch-net_base_features.cc new file mode 100644 index 000000000000..306de5e6d980 --- /dev/null +++ b/www/iridium/files/patch-net_base_features.cc @@ -0,0 +1,11 @@ +--- net/base/features.cc.orig 2020-03-17 10:02:15 UTC ++++ net/base/features.cc +@@ -88,7 +88,7 @@ const base::FeatureParam<int> + #if BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) + const base::Feature kCertVerifierBuiltinFeature { + "CertVerifierBuiltin", +-#if defined(OS_CHROMEOS) || defined(OS_LINUX) ++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD) + base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/iridium/files/patch-net_base_network__change__notifier.cc b/www/iridium/files/patch-net_base_network__change__notifier.cc index 9080a42d1d0e..b570610a6483 100644 --- a/www/iridium/files/patch-net_base_network__change__notifier.cc +++ b/www/iridium/files/patch-net_base_network__change__notifier.cc @@ -1,8 +1,26 @@ ---- net/base/network_change_notifier.cc.orig 2019-03-11 22:01:00 UTC +--- net/base/network_change_notifier.cc.orig 2020-02-03 21:52:49 UTC +++ net/base/network_change_notifier.cc -@@ -221,7 +221,6 @@ NetworkChangeNotifier* NetworkChangeNotifier::Create() +@@ -35,7 +35,7 @@ + #include "net/base/network_change_notifier_linux.h" + #elif defined(OS_MACOSX) + #include "net/base/network_change_notifier_mac.h" +-#elif defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#elif defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) + #include "net/base/network_change_notifier_posix.h" #elif defined(OS_FUCHSIA) - return new NetworkChangeNotifierFuchsia(0 /* required_features */); + #include "net/base/network_change_notifier_fuchsia.h" +@@ -229,7 +229,7 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo + // service in a separate process. + return std::make_unique<NetworkChangeNotifierPosix>(initial_type, + initial_subtype); +-#elif defined(OS_CHROMEOS) ++#elif defined(OS_CHROMEOS) || defined(OS_BSD) + return std::make_unique<NetworkChangeNotifierPosix>(initial_type, + initial_subtype); + #elif defined(OS_LINUX) +@@ -241,7 +241,6 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo + return std::make_unique<NetworkChangeNotifierFuchsia>( + 0 /* required_features */); #else - NOTIMPLEMENTED(); return NULL; diff --git a/www/iridium/files/patch-net_dns_dns__config__service__posix__unittest.cc b/www/iridium/files/patch-net_dns_dns__config__service__posix__unittest.cc index 51b150d18143..21bd683f8187 100644 --- a/www/iridium/files/patch-net_dns_dns__config__service__posix__unittest.cc +++ b/www/iridium/files/patch-net_dns_dns__config__service__posix__unittest.cc @@ -1,4 +1,4 @@ ---- net/dns/dns_config_service_posix_unittest.cc.orig 2019-03-11 22:01:01 UTC +--- net/dns/dns_config_service_posix_unittest.cc.orig 2019-06-04 18:55:27 UTC +++ net/dns/dns_config_service_posix_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be @@ -9,7 +9,7 @@ #include <memory> #include "base/cancelable_callback.h" -@@ -46,7 +44,7 @@ const char* const kNameserversIPv4[] = { +@@ -50,7 +48,7 @@ const char* const kNameserversIPv4[] = { "1.0.0.1", }; @@ -18,7 +18,7 @@ const char* const kNameserversIPv6[] = { NULL, "2001:DB8:0::42", -@@ -82,7 +80,7 @@ void InitializeResState(res_state res) { +@@ -86,7 +84,7 @@ void InitializeResState(res_state res) { ++res->nscount; } @@ -27,7 +27,7 @@ // Install IPv6 addresses, replacing the corresponding IPv4 addresses. unsigned nscount6 = 0; for (unsigned i = 0; i < base::size(kNameserversIPv6) && i < MAXNS; ++i) { -@@ -103,7 +101,7 @@ void InitializeResState(res_state res) { +@@ -107,7 +105,7 @@ void InitializeResState(res_state res) { } void CloseResState(res_state res) { @@ -36,7 +36,7 @@ for (int i = 0; i < res->nscount; ++i) { if (res->_u._ext.nsaddrs[i] != NULL) free(res->_u._ext.nsaddrs[i]); -@@ -128,7 +126,7 @@ void InitializeExpectedConfig(DnsConfig* config) { +@@ -132,7 +130,7 @@ void InitializeExpectedConfig(DnsConfig* config) { config->nameservers.push_back(IPEndPoint(ip, NS_DEFAULTPORT + i)); } diff --git a/www/iridium/files/patch-net_dns_dns__util.cc b/www/iridium/files/patch-net_dns_dns__util.cc index 9e63c0c29904..be75a59fbd52 100644 --- a/www/iridium/files/patch-net_dns_dns__util.cc +++ b/www/iridium/files/patch-net_dns_dns__util.cc @@ -1,6 +1,6 @@ ---- net/dns/dns_util.cc.orig 2019-03-11 22:01:01 UTC +--- net/dns/dns_util.cc.orig 2019-10-21 19:06:38 UTC +++ net/dns/dns_util.cc -@@ -36,6 +36,8 @@ const uint16_t kFlagNamePointer = 0xc000; +@@ -38,6 +38,8 @@ const uint16_t kFlagNamePointer = 0xc000; } // namespace diff --git a/www/iridium/files/patch-net_dns_host__resolver__proc.cc b/www/iridium/files/patch-net_dns_host__resolver__proc.cc index 3c0b7ee87598..752211dde398 100644 --- a/www/iridium/files/patch-net_dns_host__resolver__proc.cc +++ b/www/iridium/files/patch-net_dns_host__resolver__proc.cc @@ -1,8 +1,8 @@ ---- net/dns/host_resolver_proc.cc.orig 2019-03-11 22:01:01 UTC +--- net/dns/host_resolver_proc.cc.orig 2020-02-03 21:52:49 UTC +++ net/dns/host_resolver_proc.cc -@@ -195,7 +195,7 @@ int SystemHostResolverCall(const std::string& host, - // current process during that time. - base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::WILL_BLOCK); +@@ -159,7 +159,7 @@ int SystemHostResolverCall(const std::string& host, + base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, + base::BlockingType::WILL_BLOCK); -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) && \ diff --git a/www/iridium/files/patch-net_features.gni b/www/iridium/files/patch-net_features.gni index 949a31c49681..cb5adcfbf764 100644 --- a/www/iridium/files/patch-net_features.gni +++ b/www/iridium/files/patch-net_features.gni @@ -1,6 +1,6 @@ ---- net/features.gni.orig 2019-03-11 22:01:01 UTC +--- net/features.gni.orig 2019-09-09 21:55:21 UTC +++ net/features.gni -@@ -27,7 +27,7 @@ declare_args() { +@@ -23,7 +23,7 @@ declare_args() { disable_brotli_filter = false # Multicast DNS. diff --git a/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc index a8fbaf810f5f..f4c603544da0 100644 --- a/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc +++ b/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc @@ -1,6 +1,6 @@ ---- net/http/http_auth_gssapi_posix.cc.orig 2019-03-11 22:01:01 UTC +--- net/http/http_auth_gssapi_posix.cc.orig 2020-02-03 21:52:49 UTC +++ net/http/http_auth_gssapi_posix.cc -@@ -431,8 +431,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib +@@ -367,8 +367,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib static const char* const kDefaultLibraryNames[] = { #if defined(OS_MACOSX) "/System/Library/Frameworks/GSS.framework/GSS" diff --git a/www/iridium/files/patch-net_http_http__auth__gssapi__posix.h b/www/iridium/files/patch-net_http_http__auth__gssapi__posix.h new file mode 100644 index 000000000000..e333287758ee --- /dev/null +++ b/www/iridium/files/patch-net_http_http__auth__gssapi__posix.h @@ -0,0 +1,12 @@ +--- net/http/http_auth_gssapi_posix.h.orig 2019-09-09 21:55:21 UTC ++++ net/http/http_auth_gssapi_posix.h +@@ -21,6 +21,9 @@ + #include <GSS/gssapi.h> + #elif defined(OS_FREEBSD) + #include <gssapi/gssapi.h> ++#ifndef GSS_C_DELEG_POLICY_FLAG ++#define GSS_C_DELEG_POLICY_FLAG 32768 ++#endif + #else + #include <gssapi.h> + #endif diff --git a/www/iridium/files/patch-net_http_http__network__session.cc b/www/iridium/files/patch-net_http_http__network__session.cc deleted file mode 100644 index 9552bf40336a..000000000000 --- a/www/iridium/files/patch-net_http_http__network__session.cc +++ /dev/null @@ -1,12 +0,0 @@ ---- net/http/http_network_session.cc.orig 2019-03-11 22:01:01 UTC -+++ net/http/http_network_session.cc -@@ -19,7 +19,9 @@ - #include "base/trace_event/memory_dump_request_args.h" - #include "base/trace_event/process_memory_dump.h" - #include "base/values.h" -+#if defined(USE_KERBEROS) - #include "net/http/http_auth_handler_factory.h" -+#endif - #include "net/http/http_response_body_drainer.h" - #include "net/http/http_stream_factory.h" - #include "net/http/url_security_manager.h" diff --git a/www/iridium/files/patch-net_nqe_network__quality__estimator.cc b/www/iridium/files/patch-net_nqe_network__quality__estimator.cc index 1e4e2be343e0..e23051d78497 100644 --- a/www/iridium/files/patch-net_nqe_network__quality__estimator.cc +++ b/www/iridium/files/patch-net_nqe_network__quality__estimator.cc @@ -1,6 +1,6 @@ ---- net/nqe/network_quality_estimator.cc.orig 2019-03-17 14:51:31 UTC +--- net/nqe/network_quality_estimator.cc.orig 2020-03-16 18:40:33 UTC +++ net/nqe/network_quality_estimator.cc -@@ -99,7 +99,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID() { +@@ -100,7 +100,7 @@ nqe::internal::NetworkID DoGetCurrentNetworkID() { case NetworkChangeNotifier::ConnectionType::CONNECTION_ETHERNET: break; case NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI: diff --git a/www/iridium/files/patch-net_nqe_network__quality__estimator__unittest.cc b/www/iridium/files/patch-net_nqe_network__quality__estimator__unittest.cc index 0aef528f8567..6851ab0d6bc3 100644 --- a/www/iridium/files/patch-net_nqe_network__quality__estimator__unittest.cc +++ b/www/iridium/files/patch-net_nqe_network__quality__estimator__unittest.cc @@ -1,11 +1,11 @@ ---- net/nqe/network_quality_estimator_unittest.cc.orig 2019-03-17 14:56:02 UTC +--- net/nqe/network_quality_estimator_unittest.cc.orig 2020-03-16 18:39:54 UTC +++ net/nqe/network_quality_estimator_unittest.cc -@@ -2058,7 +2058,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa - +@@ -2107,7 +2107,7 @@ TEST_F(NetworkQualityEstimatorTest, TestGlobalSocketWa // TestTCPSocketRTT requires kernel support for tcp_info struct, and so it is // enabled only on certain platforms. --#if defined(TCP_INFO) || defined(OS_LINUX) || defined(OS_ANDROID) -+#if defined(TCP_INFO) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + // ChromeOS is disabled due to crbug.com/986904 +-#if (defined(TCP_INFO) || defined(OS_LINUX) || defined(OS_ANDROID)) && \ ++#if (defined(TCP_INFO) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)) && \ + !defined(OS_CHROMEOS) #define MAYBE_TestTCPSocketRTT TestTCPSocketRTT #else - #define MAYBE_TestTCPSocketRTT DISABLED_TestTCPSocketRTT diff --git a/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc index 26e797554e92..cd644766442f 100644 --- a/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc +++ b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc @@ -1,4 +1,4 @@ ---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2019-03-11 22:01:01 UTC +--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2020-03-16 18:40:33 UTC +++ net/proxy_resolution/proxy_config_service_linux.cc @@ -6,7 +6,9 @@ @@ -10,7 +10,7 @@ #include <unistd.h> #include <map> -@@ -495,6 +497,7 @@ int StringToIntOrDefault(base::StringPiece value, int +@@ -511,6 +513,7 @@ int StringToIntOrDefault(base::StringPiece value, int return default_value; } @@ -18,7 +18,7 @@ // This is the KDE version that reads kioslaverc and simulates gsettings. // Doing this allows the main Delegate code, as well as the unit tests // for it, to stay the same - and the settings map fairly well besides. -@@ -986,6 +989,7 @@ class SettingGetterImplKDE : public ProxyConfigService +@@ -1000,6 +1003,7 @@ class SettingGetterImplKDE : public ProxyConfigService DISALLOW_COPY_AND_ASSIGN(SettingGetterImplKDE); }; @@ -26,7 +26,7 @@ } // namespace -@@ -1197,8 +1201,10 @@ ProxyConfigServiceLinux::Delegate::Delegate( +@@ -1214,8 +1218,10 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE3: case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: diff --git a/www/iridium/files/patch-net_proxy__resolution_proxy__resolution__service.cc b/www/iridium/files/patch-net_proxy__resolution_proxy__resolution__service.cc index 2d17877f7d8e..ef8a51424888 100644 --- a/www/iridium/files/patch-net_proxy__resolution_proxy__resolution__service.cc +++ b/www/iridium/files/patch-net_proxy__resolution_proxy__resolution__service.cc @@ -1,6 +1,6 @@ ---- net/proxy_resolution/proxy_resolution_service.cc.orig 2019-03-11 22:01:01 UTC +--- net/proxy_resolution/proxy_resolution_service.cc.orig 2020-02-03 21:52:49 UTC +++ net/proxy_resolution/proxy_resolution_service.cc -@@ -48,7 +48,7 @@ +@@ -49,7 +49,7 @@ #elif defined(OS_MACOSX) #include "net/proxy_resolution/proxy_config_service_mac.h" #include "net/proxy_resolution/proxy_resolver_mac.h" @@ -9,7 +9,7 @@ #include "net/proxy_resolution/proxy_config_service_linux.h" #elif defined(OS_ANDROID) #include "net/proxy_resolution/proxy_config_service_android.h" -@@ -62,7 +62,7 @@ namespace net { +@@ -63,7 +63,7 @@ namespace net { namespace { #if defined(OS_WIN) || defined(OS_IOS) || defined(OS_MACOSX) || \ @@ -18,7 +18,7 @@ constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation = net::DefineNetworkTrafficAnnotation("proxy_config_system", R"( semantics { -@@ -1577,7 +1577,7 @@ ProxyResolutionService::CreateSystemProxyConfigService +@@ -1556,7 +1556,7 @@ ProxyResolutionService::CreateSystemProxyConfigService << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; return std::make_unique<UnsetProxyConfigService>(); diff --git a/www/iridium/files/patch-net_socket_socket__posix.cc b/www/iridium/files/patch-net_socket_socket__posix.cc index b24dc928bdae..6b1297662465 100644 --- a/www/iridium/files/patch-net_socket_socket__posix.cc +++ b/www/iridium/files/patch-net_socket_socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/socket_posix.cc.orig 2019-03-17 15:48:31 UTC +--- net/socket/socket_posix.cc.orig 2019-12-16 21:51:27 UTC +++ net/socket/socket_posix.cc -@@ -568,7 +568,7 @@ void SocketPosix::ReadCompleted() { +@@ -517,7 +517,7 @@ void SocketPosix::ReadCompleted() { } int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) { diff --git a/www/iridium/files/patch-net_socket_socks5__client__socket.cc b/www/iridium/files/patch-net_socket_socks5__client__socket.cc index 69e902d418e4..1df3deefc418 100644 --- a/www/iridium/files/patch-net_socket_socks5__client__socket.cc +++ b/www/iridium/files/patch-net_socket_socks5__client__socket.cc @@ -1,4 +1,4 @@ ---- net/socket/socks5_client_socket.cc.orig 2019-03-11 22:01:01 UTC +--- net/socket/socks5_client_socket.cc.orig 2019-04-30 22:22:55 UTC +++ net/socket/socks5_client_socket.cc @@ -4,6 +4,10 @@ @@ -10,4 +10,4 @@ + #include <utility> - #include "base/callback_helpers.h" + #include "base/bind.h" diff --git a/www/iridium/files/patch-net_socket_udp__socket__posix.cc b/www/iridium/files/patch-net_socket_udp__socket__posix.cc index 67f6c8a4709a..c0cfba258179 100644 --- a/www/iridium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/iridium/files/patch-net_socket_udp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_posix.cc.orig 2019-03-11 22:01:01 UTC +--- net/socket/udp_socket_posix.cc.orig 2019-09-09 21:55:22 UTC +++ net/socket/udp_socket_posix.cc -@@ -68,7 +68,7 @@ const int kActivityMonitorMinimumSamplesForThroughputE +@@ -69,7 +69,7 @@ const int kActivityMonitorMinimumSamplesForThroughputE const base::TimeDelta kActivityMonitorMsThreshold = base::TimeDelta::FromMilliseconds(100); @@ -9,7 +9,7 @@ // When enabling multicast using setsockopt(IP_MULTICAST_IF) MacOS // requires passing IPv4 address instead of interface index. This function // resolves IPv4 address by interface index. The |address| is returned in -@@ -97,7 +97,7 @@ int GetIPv4AddressFromIndex(int socket, uint32_t index +@@ -98,7 +98,7 @@ int GetIPv4AddressFromIndex(int socket, uint32_t index return OK; } @@ -57,7 +57,7 @@ rv = setsockopt(socket_, SOL_SOCKET, SO_BROADCAST, &value, sizeof(value)); return rv == 0 ? OK : MapSystemError(errno); -@@ -937,19 +940,24 @@ int UDPSocketPosix::SetMulticastOptions() { +@@ -935,7 +938,7 @@ int UDPSocketPosix::SetMulticastOptions() { if (multicast_interface_ != 0) { switch (addr_family_) { case AF_INET: { @@ -66,26 +66,19 @@ ip_mreq mreq = {}; int error = GetIPv4AddressFromIndex(socket_, multicast_interface_, &mreq.imr_interface.s_addr); - if (error != OK) - return error; --#else // defined(OS_MACOSX) -+#else // defined(OS_MACOSX) || defined(OS_BSD) - ip_mreqn mreq = {}; - mreq.imr_ifindex = multicast_interface_; +@@ -947,7 +950,11 @@ int UDPSocketPosix::SetMulticastOptions() { mreq.imr_address.s_addr = htonl(INADDR_ANY); --#endif // !defined(OS_MACOSX) -+#endif // !defined(OS_MACOSX) || defined(OS_BSD) + #endif // !defined(OS_MACOSX) int rv = setsockopt(socket_, IPPROTO_IP, IP_MULTICAST_IF, +#if defined(OS_BSD) -+ reinterpret_cast<const char*>(&mreq.imr_interface.s_addr), -+ sizeof(mreq.imr_interface.s_addr)); ++ reinterpret_cast<const char*>(&mreq.imr_interface.s_addr), sizeof(mreq.imr_interface.s_addr)); +#else reinterpret_cast<const char*>(&mreq), sizeof(mreq)); +#endif if (rv) return MapSystemError(errno); break; -@@ -1011,7 +1019,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a +@@ -1009,7 +1016,7 @@ int UDPSocketPosix::JoinGroup(const IPAddress& group_a if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; @@ -94,7 +87,7 @@ ip_mreq mreq = {}; int error = GetIPv4AddressFromIndex(socket_, multicast_interface_, &mreq.imr_interface.s_addr); -@@ -1059,9 +1067,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_ +@@ -1057,9 +1064,18 @@ int UDPSocketPosix::LeaveGroup(const IPAddress& group_ case IPAddress::kIPv4AddressSize: { if (addr_family_ != AF_INET) return ERR_ADDRESS_INVALID; diff --git a/www/iridium/files/patch-net_socket_udp__socket__posix.h b/www/iridium/files/patch-net_socket_udp__socket__posix.h new file mode 100644 index 000000000000..373c468ca84d --- /dev/null +++ b/www/iridium/files/patch-net_socket_udp__socket__posix.h @@ -0,0 +1,11 @@ +--- net/socket/udp_socket_posix.h.orig 2019-06-07 19:57:25 UTC ++++ net/socket/udp_socket_posix.h +@@ -33,7 +33,7 @@ + + #if defined(__ANDROID__) && defined(__aarch64__) + #define HAVE_SENDMMSG 1 +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #define HAVE_SENDMMSG 1 + #else + #define HAVE_SENDMMSG 0 diff --git a/www/iridium/files/patch-net_socket_unix__domain__client__socket__posix.cc b/www/iridium/files/patch-net_socket_unix__domain__client__socket__posix.cc new file mode 100644 index 000000000000..9f9ad02d0d9c --- /dev/null +++ b/www/iridium/files/patch-net_socket_unix__domain__client__socket__posix.cc @@ -0,0 +1,11 @@ +--- net/socket/unix_domain_client_socket_posix.cc.orig 2019-06-07 19:59:03 UTC ++++ net/socket/unix_domain_client_socket_posix.cc +@@ -56,7 +56,7 @@ bool UnixDomainClientSocket::FillAddress(const std::st + return true; + } + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + // Convert the path given into abstract socket name. It must start with + // the '\0' character, so we are adding it. |addr_len| must specify the + // length of the structure exactly, as potentially the socket name may diff --git a/www/iridium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc b/www/iridium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc deleted file mode 100644 index cdcc39a31db5..000000000000 --- a/www/iridium/files/patch-net_third__party_quic_platform_impl_quic__ip__address__impl.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- net/third_party/quic/platform/impl/quic_ip_address_impl.cc.orig 2019-03-11 22:01:01 UTC -+++ net/third_party/quic/platform/impl/quic_ip_address_impl.cc -@@ -13,6 +13,7 @@ - #include <ws2bth.h> - #elif defined(OS_POSIX) || defined(OS_FUCHSIA) - #include <netinet/in.h> -+#include <sys/socket.h> - #endif - - using std::string; diff --git a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc index d8f07ef3f0ee..3e87bd2fcfd9 100644 --- a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,6 +1,6 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2019-03-11 22:01:01 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2020-03-16 18:39:54 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc -@@ -27,7 +27,7 @@ +@@ -29,7 +29,7 @@ #include "net/url_request/url_request_context_builder.h" #include "net/url_request/url_request_context_getter.h" @@ -9,8 +9,8 @@ #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -46,7 +46,7 @@ void SetUpOnNetworkThread(std::unique_ptr<net::URLRequ - base::WaitableEvent* initialization_complete_event) { +@@ -51,7 +51,7 @@ void SetUpOnNetworkThread( + base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); -#if defined(OS_LINUX) diff --git a/www/iridium/files/patch-net_tools_quic_quic__http__proxy__backend.cc b/www/iridium/files/patch-net_tools_quic_quic__http__proxy__backend.cc index 2cd0fb3a72b3..65d641ec320d 100644 --- a/www/iridium/files/patch-net_tools_quic_quic__http__proxy__backend.cc +++ b/www/iridium/files/patch-net_tools_quic_quic__http__proxy__backend.cc @@ -1,6 +1,6 @@ ---- net/tools/quic/quic_http_proxy_backend.cc.orig 2019-03-17 15:38:01 UTC +--- net/tools/quic/quic_http_proxy_backend.cc.orig 2019-10-21 19:06:39 UTC +++ net/tools/quic/quic_http_proxy_backend.cc -@@ -160,7 +160,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext +@@ -161,7 +161,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext // Enable HTTP2, but disable QUIC on the backend context_builder.SetSpdyAndQuicEnabled(true /* http2 */, false /* quic */); diff --git a/www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h b/www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h new file mode 100644 index 000000000000..7f70fcc54ea6 --- /dev/null +++ b/www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h @@ -0,0 +1,20 @@ +--- net/traffic_annotation/network_traffic_annotation.h.orig 2019-09-16 09:58:42 UTC ++++ net/traffic_annotation/network_traffic_annotation.h +@@ -356,7 +356,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { + } // namespace net + + // Placeholder for unannotated usages. +-#if !defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if !defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(OS_BSD) + #define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \ + net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.") + #endif +@@ -367,7 +367,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { + // + // On Linux and Windows, use MISSING_TRAFFIC_ANNOTATION or + // TRAFFIC_ANNOTATION_FOR_TESTS. +-#if (!defined(OS_WIN) && !defined(OS_LINUX)) || defined(OS_CHROMEOS) ++#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) + #define NO_TRAFFIC_ANNOTATION_YET \ + net::DefineNetworkTrafficAnnotation("undefined", "Nothing here yet.") + diff --git a/www/iridium/files/patch-net_url__request_url__fetcher.cc b/www/iridium/files/patch-net_url__request_url__fetcher.cc new file mode 100644 index 000000000000..36e2fa9c37e2 --- /dev/null +++ b/www/iridium/files/patch-net_url__request_url__fetcher.cc @@ -0,0 +1,11 @@ +--- net/url_request/url_fetcher.cc.orig 2019-10-30 16:19:14 UTC ++++ net/url_request/url_fetcher.cc +@@ -11,7 +11,7 @@ namespace net { + + URLFetcher::~URLFetcher() = default; + +-#if (!defined(OS_WIN) && !defined(OS_LINUX)) || defined(OS_CHROMEOS) ++#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) + // static + std::unique_ptr<URLFetcher> URLFetcher::Create( + const GURL& url, diff --git a/www/iridium/files/patch-net_url__request_url__fetcher.h b/www/iridium/files/patch-net_url__request_url__fetcher.h new file mode 100644 index 000000000000..bd4fbd669d4c --- /dev/null +++ b/www/iridium/files/patch-net_url__request_url__fetcher.h @@ -0,0 +1,11 @@ +--- net/url_request/url_fetcher.h.orig 2019-10-30 16:19:33 UTC ++++ net/url_request/url_fetcher.h +@@ -113,7 +113,7 @@ class NET_EXPORT URLFetcher { + // The unannotated Create() methods are not available on desktop Linux + + // Windows. They are available on other platforms, since we only audit network + // annotations on Linux & Windows. +-#if (!defined(OS_WIN) && !defined(OS_LINUX)) || defined(OS_CHROMEOS) ++#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) + // |url| is the URL to send the request to. It must be valid. + // |request_type| is the type of request to make. + // |d| the object that will receive the callback on fetch completion. diff --git a/www/iridium/files/patch-net_url__request_url__request__context.cc b/www/iridium/files/patch-net_url__request_url__request__context.cc new file mode 100644 index 000000000000..fd2e091f9f61 --- /dev/null +++ b/www/iridium/files/patch-net_url__request_url__request__context.cc @@ -0,0 +1,11 @@ +--- net/url_request/url_request_context.cc.orig 2020-03-16 18:39:54 UTC ++++ net/url_request/url_request_context.cc +@@ -89,7 +89,7 @@ const HttpNetworkSession::Context* URLRequestContext:: + return &network_session->context(); + } + +-#if (!defined(OS_WIN) && !defined(OS_LINUX)) || defined(OS_CHROMEOS) ++#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) + std::unique_ptr<URLRequest> URLRequestContext::CreateRequest( + const GURL& url, + RequestPriority priority, diff --git a/www/iridium/files/patch-net_url__request_url__request__context.h b/www/iridium/files/patch-net_url__request_url__request__context.h new file mode 100644 index 000000000000..cc9af1e29180 --- /dev/null +++ b/www/iridium/files/patch-net_url__request_url__request__context.h @@ -0,0 +1,11 @@ +--- net/url_request/url_request_context.h.orig 2020-03-16 18:40:33 UTC ++++ net/url_request/url_request_context.h +@@ -82,7 +82,7 @@ class NET_EXPORT URLRequestContext + // session. + const HttpNetworkSession::Context* GetNetworkSessionContext() const; + +-#if (!defined(OS_WIN) && !defined(OS_LINUX)) || defined(OS_CHROMEOS) ++#if (!defined(OS_WIN) && !defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) + // This function should not be used in Chromium, please use the version with + // NetworkTrafficAnnotationTag in the future. + // diff --git a/www/iridium/files/patch-net_url__request_url__request__context__builder.cc b/www/iridium/files/patch-net_url__request_url__request__context__builder.cc index deed16f19611..0144efb4a529 100644 --- a/www/iridium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/iridium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context_builder.cc.orig 2019-03-11 22:01:01 UTC +--- net/url_request/url_request_context_builder.cc.orig 2020-03-16 18:40:33 UTC +++ net/url_request/url_request_context_builder.cc -@@ -520,7 +520,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -507,7 +507,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { @@ -9,3 +9,12 @@ // TODO(willchan): Switch to using this code when // ProxyResolutionService::CreateSystemProxyConfigService()'s signature // doesn't suck. +@@ -516,7 +516,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu + ProxyResolutionService::CreateSystemProxyConfigService( + base::ThreadTaskRunnerHandle::Get().get()); + } +-#endif // !defined(OS_LINUX) && !defined(OS_ANDROID) ++#endif // !defined(OS_LINUX) && !defined(OS_ANDROID) && !defined(OS_BSD) + proxy_resolution_service_ = CreateProxyResolutionService( + std::move(proxy_config_service_), context.get(), + context->host_resolver(), context->network_delegate(), diff --git a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc index bb4fd053ed0d..c1b3c3d2c8a3 100644 --- a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,74 +1,56 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2019-03-11 22:01:01 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2020-03-16 18:40:33 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -133,7 +133,7 @@ constexpr base::TimeDelta kMaxInitialProgressivePaintT - - PDFiumEngine* g_engine_for_fontmapper = nullptr; +@@ -52,7 +52,7 @@ + #include "ui/gfx/geometry/rect.h" + #include "v8/include/v8.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) + #include "pdf/pdfium/pdfium_font_linux.h" + #endif - PP_Instance g_last_instance_id; - -@@ -413,7 +413,7 @@ void Release(FPDF_SYSFONTINFO* sysfontinfo) { - fontinfo_with_metrics->default_sysfontinfo->Release( - fontinfo_with_metrics->default_sysfontinfo); - } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - PDFiumEngine::CreateDocumentLoaderFunction - g_create_document_loader_for_testing = nullptr; -@@ -663,7 +663,7 @@ bool InitializeSDK() { +@@ -377,7 +377,7 @@ void InitializeSDK(bool enable_v8) { config.m_v8EmbedderSlot = gin::kEmbedderPDFium; FPDF_InitLibraryWithConfig(&config); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // Font loading doesn't work in the renderer sandbox in Linux. - FPDF_SetSystemFontInfo(&g_font_info); - #else -@@ -688,7 +688,7 @@ bool InitializeSDK() { - - void ShutdownSDK() { - FPDF_DestroyLibrary(); --#if !defined(OS_LINUX) -+#if !defined(OS_LINUX) && !defined(OS_BSD) - delete g_font_info; + InitializeLinuxFontMapper(); #endif - TearDownV8(); -@@ -712,7 +712,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, + +@@ -411,7 +411,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client, IFSDK_PAUSE::user = nullptr; IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // PreviewModeClient does not know its pp::Instance. - pp::Instance* instance = client_->GetPluginInstance(); - if (instance) -@@ -1176,7 +1176,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( + SetLastInstance(client_->GetPluginInstance()); + #endif +@@ -878,7 +878,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( KillFormFocus(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - g_last_instance_id = client_->GetPluginInstance()->pp_instance(); + SetLastInstance(client_->GetPluginInstance()); #endif -@@ -2973,7 +2973,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index +@@ -2861,7 +2861,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index DCHECK(image_data); last_progressive_start_time_ = base::Time::Now(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - g_last_instance_id = client_->GetPluginInstance()->pp_instance(); + SetLastInstance(client_->GetPluginInstance()); #endif -@@ -3448,7 +3448,7 @@ void PDFiumEngine::SetCurrentPage(int index) { +@@ -3357,7 +3357,7 @@ void PDFiumEngine::SetCurrentPage(int index) { FORM_DoPageAAction(old_page, form(), FPDFPAGE_AACTION_CLOSE); } most_visible_page_ = index; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - g_last_instance_id = client_->GetPluginInstance()->pp_instance(); + SetLastInstance(client_->GetPluginInstance()); #endif if (most_visible_page_ != -1 && called_do_document_action_) { diff --git a/www/iridium/files/patch-ppapi_proxy_file__io__resource.cc b/www/iridium/files/patch-ppapi_proxy_file__io__resource.cc index 17531b7125b1..bd63ba366842 100644 --- a/www/iridium/files/patch-ppapi_proxy_file__io__resource.cc +++ b/www/iridium/files/patch-ppapi_proxy_file__io__resource.cc @@ -1,6 +1,6 @@ ---- ppapi/proxy/file_io_resource.cc.orig 2019-03-11 22:01:01 UTC +--- ppapi/proxy/file_io_resource.cc.orig 2020-03-16 18:39:54 UTC +++ ppapi/proxy/file_io_resource.cc -@@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t offset, +@@ -284,17 +284,19 @@ int32_t FileIOResource::Write(int64_t offset, if (check_quota_) { int64_t increase = 0; @@ -24,7 +24,7 @@ } if (increase > 0) { -@@ -319,7 +321,7 @@ int32_t FileIOResource::Write(int64_t offset, +@@ -318,7 +320,7 @@ int32_t FileIOResource::Write(int64_t offset, if (append) append_mode_write_amount_ += bytes_to_write; else @@ -33,7 +33,7 @@ } } return WriteValidated(offset, buffer, bytes_to_write, callback); -@@ -597,9 +599,9 @@ void FileIOResource::OnRequestWriteQuotaComplete( +@@ -594,9 +596,9 @@ void FileIOResource::OnRequestWriteQuotaComplete( } else { DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted); diff --git a/www/iridium/files/patch-ppapi_proxy_flash__resource.cc b/www/iridium/files/patch-ppapi_proxy_flash__resource.cc new file mode 100644 index 000000000000..a45deba61a6e --- /dev/null +++ b/www/iridium/files/patch-ppapi_proxy_flash__resource.cc @@ -0,0 +1,11 @@ +--- ppapi/proxy/flash_resource.cc.orig 2019-09-16 10:01:18 UTC ++++ ppapi/proxy/flash_resource.cc +@@ -136,7 +136,7 @@ double FlashResource::GetLocalTimeZoneOffset(PP_Instan + // require filesystem access prohibited by the sandbox. + // TODO(shess): Figure out why OSX needs the access, the sandbox warmup should + // handle it. http://crbug.com/149006 +-#if defined(OS_LINUX) || defined(OS_MACOSX) ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) + int32_t result = SyncCall<PpapiPluginMsg_Flash_GetLocalTimeZoneOffsetReply>( + BROWSER, + PpapiHostMsg_Flash_GetLocalTimeZoneOffset(PPTimeToTime(t)), diff --git a/www/iridium/files/patch-printing_backend_print__backend__cups.h b/www/iridium/files/patch-printing_backend_print__backend__cups.h deleted file mode 100644 index 816d95f5f5c7..000000000000 --- a/www/iridium/files/patch-printing_backend_print__backend__cups.h +++ /dev/null @@ -1,11 +0,0 @@ ---- printing/backend/print_backend_cups.h.orig 2019-03-11 22:01:01 UTC -+++ printing/backend/print_backend_cups.h -@@ -5,6 +5,8 @@ - #ifndef PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_ - #define PRINTING_BACKEND_PRINT_BACKEND_CUPS_H_ - -+#include <cups/ppd.h> -+ - #include <string> - - #include "base/files/file_util.h" diff --git a/www/iridium/files/patch-printing_cups__config__helper.py b/www/iridium/files/patch-printing_cups__config__helper.py index 0818e1bf8f0e..0795067ee45f 100644 --- a/www/iridium/files/patch-printing_cups__config__helper.py +++ b/www/iridium/files/patch-printing_cups__config__helper.py @@ -1,11 +1,11 @@ ---- printing/cups_config_helper.py.orig 2019-03-11 22:01:01 UTC +--- printing/cups_config_helper.py.orig 2019-12-16 21:50:51 UTC +++ printing/cups_config_helper.py -@@ -65,7 +65,7 @@ def main(): +@@ -67,7 +67,7 @@ def main(): mode = sys.argv[1] if len(sys.argv) > 2 and sys.argv[2]: sysroot = sys.argv[2] - cups_config = os.path.join(sysroot, 'usr', 'bin', 'cups-config') + cups_config = os.path.join(sysroot, 'bin', 'cups-config') if not os.path.exists(cups_config): - print 'cups-config not found: %s' % cups_config + print('cups-config not found: %s' % cups_config) return 1 diff --git a/www/iridium/files/patch-remoting_base_chromoting__event.cc b/www/iridium/files/patch-remoting_base_chromoting__event.cc index 1e4813781028..93df172fe5e5 100644 --- a/www/iridium/files/patch-remoting_base_chromoting__event.cc +++ b/www/iridium/files/patch-remoting_base_chromoting__event.cc @@ -1,8 +1,8 @@ ---- remoting/base/chromoting_event.cc.orig 2019-03-11 22:01:01 UTC +--- remoting/base/chromoting_event.cc.orig 2019-09-09 21:55:22 UTC +++ remoting/base/chromoting_event.cc -@@ -189,7 +189,7 @@ void ChromotingEvent::AddSystemInfo() { +@@ -188,7 +188,7 @@ void ChromotingEvent::AddSystemInfo() { SetString(kCpuKey, base::SysInfo::OperatingSystemArchitecture()); - SetString(kOsVersionKey, GetOperatingSystemVersionString()); + SetString(kOsVersionKey, base::SysInfo::OperatingSystemVersion()); SetString(kWebAppVersionKey, STRINGIZE(VERSION)); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) diff --git a/www/iridium/files/patch-remoting_host_host__attributes.cc b/www/iridium/files/patch-remoting_host_host__attributes.cc index e3ebcf149315..d2a35b8d8d01 100644 --- a/www/iridium/files/patch-remoting_host_host__attributes.cc +++ b/www/iridium/files/patch-remoting_host_host__attributes.cc @@ -1,6 +1,6 @@ ---- remoting/host/host_attributes.cc.orig 2019-03-11 22:01:01 UTC +--- remoting/host/host_attributes.cc.orig 2019-09-09 21:55:22 UTC +++ remoting/host/host_attributes.cc -@@ -123,7 +123,7 @@ std::string GetHostAttributes() { +@@ -124,7 +124,7 @@ std::string GetHostAttributes() { media::InitializeMediaFoundation()) { result.push_back("HWEncoder"); } diff --git a/www/iridium/files/patch-remoting_host_host__details.cc b/www/iridium/files/patch-remoting_host_host__details.cc index c221907fcaf0..2467708caed9 100644 --- a/www/iridium/files/patch-remoting_host_host__details.cc +++ b/www/iridium/files/patch-remoting_host_host__details.cc @@ -1,6 +1,6 @@ ---- remoting/host/host_details.cc.orig 2019-03-11 22:01:01 UTC +--- remoting/host/host_details.cc.orig 2019-09-09 21:55:22 UTC +++ remoting/host/host_details.cc -@@ -24,7 +24,7 @@ std::string GetHostOperatingSystemName() { +@@ -22,7 +22,7 @@ std::string GetHostOperatingSystemName() { return "Mac"; #elif defined(OS_CHROMEOS) return "ChromeOS"; diff --git a/www/iridium/files/patch-remoting_host_host__main.cc b/www/iridium/files/patch-remoting_host_host__main.cc new file mode 100644 index 000000000000..72f86cb90395 --- /dev/null +++ b/www/iridium/files/patch-remoting_host_host__main.cc @@ -0,0 +1,27 @@ +--- remoting/host/host_main.cc.orig 2019-10-30 16:20:58 UTC ++++ remoting/host/host_main.cc +@@ -49,9 +49,9 @@ int DesktopProcessMain(); + int FileChooserMain(); + int RdpDesktopSessionMain(); + #endif // defined(OS_WIN) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + int XSessionChooserMain(); +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + namespace { + +@@ -146,10 +146,10 @@ MainRoutineFn SelectMainRoutine(const std::string& pro + } else if (process_type == kProcessTypeRdpDesktopSession) { + main_routine = &RdpDesktopSessionMain; + #endif // defined(OS_WIN) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + } else if (process_type == kProcessTypeXSessionChooser) { + main_routine = &XSessionChooserMain; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + } + + return main_routine; diff --git a/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc index 25b9ed454046..ca1e5dce0129 100644 --- a/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc +++ b/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc @@ -1,7 +1,7 @@ ---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2019-03-11 22:01:01 UTC +--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2020-02-03 21:52:49 UTC +++ remoting/host/it2me/it2me_native_messaging_host_main.cc -@@ -27,12 +27,12 @@ - #include "remoting/host/resources.h" +@@ -29,12 +29,12 @@ + #include "remoting/host/switches.h" #include "remoting/host/usage_stats_consent.h" -#if defined(OS_LINUX) @@ -14,8 +14,8 @@ +#endif // defined(OS_LINUX) || defined(OS_BSD) #if defined(OS_MACOSX) - #include "base/mac/scoped_nsautorelease_pool.h" -@@ -106,7 +106,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv + #include "base/mac/mac_util.h" +@@ -112,7 +112,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv remoting::LoadResources(""); @@ -24,7 +24,7 @@ // Required in order for us to run multiple X11 threads. XInitThreads(); -@@ -122,7 +122,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -128,7 +128,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv // Need to prime the host OS version value for linux to prevent IO on the // network thread. base::GetLinuxDistro() caches the result. base::GetLinuxDistro(); diff --git a/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc index b06387323b47..af1299dd2bdf 100644 --- a/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,4 +1,4 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2019-03-11 22:01:01 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2019-09-09 21:55:22 UTC +++ remoting/host/me2me_desktop_environment.cc @@ -129,7 +129,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( diff --git a/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc b/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc index a9b177ae327a..4773f4846b88 100644 --- a/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,6 +1,6 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2019-03-11 22:01:01 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2020-03-16 18:40:33 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -117,13 +117,13 @@ +@@ -118,13 +118,13 @@ #include "remoting/host/mac/permission_utils.h" #endif // defined(OS_MACOSX) @@ -16,7 +16,7 @@ #if defined(OS_WIN) #include <commctrl.h> -@@ -158,11 +158,11 @@ const char kApplicationName[] = "chromoting"; +@@ -159,11 +159,11 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -30,7 +30,7 @@ #if defined(OS_POSIX) // The command line switch used to pass name of the unix domain socket used to -@@ -353,7 +353,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -357,7 +357,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -39,7 +39,7 @@ // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; #endif -@@ -567,10 +567,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm +@@ -582,10 +582,10 @@ bool HostProcess::InitWithCommandLine(const base::Comm enable_window_capture_ = cmd_line->HasSwitch(kWindowIdSwitchName); if (enable_window_capture_) { @@ -52,7 +52,7 @@ // uint32_t is large enough to hold window IDs on all platforms. uint32_t window_id; -@@ -763,7 +763,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -780,7 +780,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -61,7 +61,7 @@ if (!cert_watcher_) { cert_watcher_.reset(new CertificateWatcher( base::Bind(&HostProcess::ShutdownHost, this, kSuccessExitCode), -@@ -849,7 +849,7 @@ void HostProcess::StartOnUiThread() { +@@ -866,7 +866,7 @@ void HostProcess::StartOnUiThread() { base::Bind(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::Bind(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -70,7 +70,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()-> -@@ -858,7 +858,7 @@ void HostProcess::StartOnUiThread() { +@@ -875,7 +875,7 @@ void HostProcess::StartOnUiThread() { remoting::AudioCapturerLinux::InitializePipeReader( context_->audio_task_runner(), audio_pipe_name); } @@ -79,7 +79,7 @@ #if defined(OS_POSIX) base::FilePath security_key_socket_name = -@@ -916,7 +916,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -930,7 +930,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -88,7 +88,7 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1547,7 +1547,7 @@ void HostProcess::StartHost() { +@@ -1529,7 +1529,7 @@ void HostProcess::StartHost() { host_->AddExtension(std::make_unique<TestEchoExtension>()); // TODO(simonmorris): Get the maximum session duration from a policy. @@ -97,7 +97,7 @@ host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20)); #endif -@@ -1719,7 +1719,7 @@ void HostProcess::OnCrash(const std::string& function_ +@@ -1698,7 +1698,7 @@ void HostProcess::OnCrash(const std::string& function_ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); diff --git a/www/iridium/files/patch-remoting_host_switches.cc b/www/iridium/files/patch-remoting_host_switches.cc new file mode 100644 index 000000000000..feb1d19fe0ec --- /dev/null +++ b/www/iridium/files/patch-remoting_host_switches.cc @@ -0,0 +1,14 @@ +--- remoting/host/switches.cc.orig 2019-10-30 16:21:28 UTC ++++ remoting/host/switches.cc +@@ -21,9 +21,9 @@ const char kProcessTypeHost[] = "host"; + const char kProcessTypeRdpDesktopSession[] = "rdp_desktop_session"; + const char kProcessTypeEvaluateCapability[] = "evaluate_capability"; + const char kProcessTypeFileChooser[] = "file_chooser"; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + const char kProcessTypeXSessionChooser[] = "xsession_chooser"; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + const char kEvaluateCapabilitySwitchName[] = "evaluate-type"; + diff --git a/www/iridium/files/patch-remoting_host_switches.h b/www/iridium/files/patch-remoting_host_switches.h new file mode 100644 index 000000000000..39fcdf4bebb2 --- /dev/null +++ b/www/iridium/files/patch-remoting_host_switches.h @@ -0,0 +1,14 @@ +--- remoting/host/switches.h.orig 2019-10-30 16:21:42 UTC ++++ remoting/host/switches.h +@@ -34,9 +34,9 @@ extern const char kProcessTypeHost[]; + extern const char kProcessTypeRdpDesktopSession[]; + extern const char kProcessTypeEvaluateCapability[]; + extern const char kProcessTypeFileChooser[]; +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + extern const char kProcessTypeXSessionChooser[]; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + extern const char kEvaluateCapabilitySwitchName[]; + diff --git a/www/iridium/files/patch-remoting_resources_remoting__strings.grd b/www/iridium/files/patch-remoting_resources_remoting__strings.grd new file mode 100644 index 000000000000..34c07b2c400d --- /dev/null +++ b/www/iridium/files/patch-remoting_resources_remoting__strings.grd @@ -0,0 +1,20 @@ +--- remoting/resources/remoting_strings.grd.orig 2020-02-03 21:53:32 UTC ++++ remoting/resources/remoting_strings.grd +@@ -1393,7 +1393,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. + Open Screen Recording Preferences + </message> + </if> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <message name="IDS_SESSION_DIALOG_MESSAGE" desc="The message to show at the top of the session-selection dialog."> + Select a session to launch within your Chrome Remote Desktop environment. (Note that some session types may not support running within Chrome Remote Desktop and on the local console simultaneously.) + </message> +@@ -1409,7 +1409,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. + <message name="IDS_SESSION_DIALOG_DEFAULT_SESSION_COMMENT" desc="The comment for the entry to launch the default session."> + Launch the default XSession + </message> +- </if> <!-- is_linux --> ++ </if> <!-- is_posix --> + </messages> + </release> + </grit> diff --git a/www/iridium/files/patch-remoting_webapp_base_js_platform.js b/www/iridium/files/patch-remoting_webapp_base_js_platform.js deleted file mode 100644 index b03f6c2d525e..000000000000 --- a/www/iridium/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/iridium/files/patch-sandbox_features.gni b/www/iridium/files/patch-sandbox_features.gni index 896bf2107142..b5a277f82178 100644 --- a/www/iridium/files/patch-sandbox_features.gni +++ b/www/iridium/files/patch-sandbox_features.gni @@ -1,10 +1,11 @@ ---- sandbox/features.gni.orig 2019-03-11 22:01:01 UTC +--- sandbox/features.gni.orig 2020-03-16 18:39:54 UTC +++ sandbox/features.gni -@@ -12,6 +12,6 @@ use_seccomp_bpf = - (is_linux || is_android) && - (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm" || - current_cpu == "arm64" || current_cpu == "mipsel" || -- current_cpu == "mips64el") -+ current_cpu == "mips64el") && !is_bsd - - use_seccomp_bpf = use_seccomp_bpf || is_nacl_nonsfi +@@ -8,7 +8,7 @@ import("//build/config/nacl/config.gni") + # currently. + # Do not disable seccomp_bpf anywhere without talking to + # security@chromium.org! +-use_seccomp_bpf = (is_linux || is_android) && ++use_seccomp_bpf = (is_linux || is_android) && !is_bsd && + (current_cpu == "x86" || current_cpu == "x64" || + current_cpu == "arm" || current_cpu == "arm64" || + current_cpu == "mipsel" || current_cpu == "mips64el") diff --git a/www/iridium/files/patch-sandbox_linux_BUILD.gn b/www/iridium/files/patch-sandbox_linux_BUILD.gn index 972f75eda046..d9c24596c644 100644 --- a/www/iridium/files/patch-sandbox_linux_BUILD.gn +++ b/www/iridium/files/patch-sandbox_linux_BUILD.gn @@ -1,4 +1,4 @@ ---- sandbox/linux/BUILD.gn.orig 2019-04-10 10:50:05 UTC +--- sandbox/linux/BUILD.gn.orig 2020-04-10 00:39:11 UTC +++ sandbox/linux/BUILD.gn @@ -12,12 +12,12 @@ if (is_android) { } @@ -16,7 +16,7 @@ } if (is_nacl_nonsfi) { -@@ -382,7 +382,7 @@ component("sandbox_services") { +@@ -373,7 +373,7 @@ component("sandbox_services") { public_deps += [ ":sandbox_services_headers" ] } @@ -25,7 +25,7 @@ cflags = [ "-fgnu-inline-asm" ] sources -= [ -@@ -390,6 +390,8 @@ component("sandbox_services") { +@@ -381,6 +381,8 @@ component("sandbox_services") { "services/init_process_reaper.h", "services/scoped_process.cc", "services/scoped_process.h", @@ -34,7 +34,7 @@ "services/yama.cc", "services/yama.h", "syscall_broker/broker_channel.cc", -@@ -408,6 +410,10 @@ component("sandbox_services") { +@@ -399,6 +401,10 @@ component("sandbox_services") { "syscall_broker/broker_process.h", "syscall_broker/broker_simple_message.cc", "syscall_broker/broker_simple_message.h", diff --git a/www/iridium/files/patch-sandbox_linux_services_libc__interceptor.cc b/www/iridium/files/patch-sandbox_linux_services_libc__interceptor.cc index 9156cfe0424e..6046b28b1771 100644 --- a/www/iridium/files/patch-sandbox_linux_services_libc__interceptor.cc +++ b/www/iridium/files/patch-sandbox_linux_services_libc__interceptor.cc @@ -1,4 +1,4 @@ ---- sandbox/linux/services/libc_interceptor.cc.orig 2019-03-11 22:01:01 UTC +--- sandbox/linux/services/libc_interceptor.cc.orig 2020-03-16 18:39:54 UTC +++ sandbox/linux/services/libc_interceptor.cc @@ -11,7 +11,9 @@ #include <stddef.h> @@ -10,7 +10,7 @@ #include <sys/socket.h> #include <sys/types.h> #include <time.h> -@@ -94,7 +96,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, +@@ -92,7 +94,7 @@ bool ReadTimeStruct(base::PickleIterator* iter, } else { base::AutoLock lock(g_timezones_lock.Get()); auto ret_pair = g_timezones.Get().insert(timezone); diff --git a/www/iridium/files/patch-services_audio_BUILD.gn b/www/iridium/files/patch-services_audio_BUILD.gn index d3b1cdf7c7eb..32423e1a0600 100644 --- a/www/iridium/files/patch-services_audio_BUILD.gn +++ b/www/iridium/files/patch-services_audio_BUILD.gn @@ -1,7 +1,7 @@ ---- services/audio/BUILD.gn.orig 2019-03-11 22:01:01 UTC +--- services/audio/BUILD.gn.orig 2020-03-16 18:39:54 UTC +++ services/audio/BUILD.gn -@@ -106,7 +106,7 @@ source_set("lib") { - "//services/service_manager/sandbox:sandbox", +@@ -82,7 +82,7 @@ source_set("audio") { + "//services/service_manager/sandbox", ] - if (is_linux) { diff --git a/www/iridium/files/patch-services_catalog_store.cc b/www/iridium/files/patch-services_catalog_store.cc deleted file mode 100644 index 11bf71b32891..000000000000 --- a/www/iridium/files/patch-services_catalog_store.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- services/catalog/store.cc.orig 2019-03-11 22:01:01 UTC -+++ services/catalog/store.cc -@@ -38,5 +38,7 @@ const char Store::kRequiredFilesKey_PlatformValue_MacO - const char Store::kRequiredFilesKey_PlatformValue_Android[] = "android"; - // static - const char Store::kRequiredFilesKey_PlatformValue_Fuchsia[] = "fuchsia"; -+// static -+const char Store::kRequiredFilesKey_PlatformValue_FreeBSD[] = "freebsd"; - - } // namespace catalog diff --git a/www/iridium/files/patch-services_catalog_store.h b/www/iridium/files/patch-services_catalog_store.h deleted file mode 100644 index 58ea5e1be58b..000000000000 --- a/www/iridium/files/patch-services_catalog_store.h +++ /dev/null @@ -1,10 +0,0 @@ ---- services/catalog/store.h.orig 2019-03-11 22:01:01 UTC -+++ services/catalog/store.h -@@ -38,6 +38,7 @@ class Store { - static const char kRequiredFilesKey_PlatformValue_MacOSX[]; - static const char kRequiredFilesKey_PlatformValue_Android[]; - static const char kRequiredFilesKey_PlatformValue_Fuchsia[]; -+ static const char kRequiredFilesKey_PlatformValue_FreeBSD[]; - }; - - } // namespace catalog diff --git a/www/iridium/files/patch-services_content_simple__browser_simple__browser__service.h b/www/iridium/files/patch-services_content_simple__browser_simple__browser__service.h deleted file mode 100644 index 899614558c19..000000000000 --- a/www/iridium/files/patch-services_content_simple__browser_simple__browser__service.h +++ /dev/null @@ -1,20 +0,0 @@ ---- services/content/simple_browser/simple_browser_service.h.orig 2019-03-11 22:01:01 UTC -+++ services/content/simple_browser/simple_browser_service.h -@@ -16,7 +16,7 @@ - #include "services/service_manager/public/cpp/service_binding.h" - #include "services/service_manager/public/mojom/service.mojom.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "components/services/font/public/cpp/font_loader.h" // nogncheck - #endif - -@@ -50,7 +50,7 @@ class COMPONENT_EXPORT(SIMPLE_BROWSER) SimpleBrowserSe - // service_manager::Service: - void OnStart() override; - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - sk_sp<font_service::FontLoader> font_loader_; - #endif - diff --git a/www/iridium/files/patch-services_device_device__service.h b/www/iridium/files/patch-services_device_device__service.h deleted file mode 100644 index dfa9f67d0c8c..000000000000 --- a/www/iridium/files/patch-services_device_device__service.h +++ /dev/null @@ -1,11 +0,0 @@ ---- services/device/device_service.h.orig 2019-03-17 14:44:04 UTC -+++ services/device/device_service.h -@@ -198,7 +198,7 @@ class DeviceService : public service_manager::Service - #endif - - #if (defined(OS_LINUX) && defined(USE_UDEV)) || defined(OS_WIN) || \ -- defined(OS_MACOSX) -+ defined(OS_MACOSX) || defined(OS_BSD) - // Requests for the SerialPortManager interface must be bound to - // |serial_port_manager_| on |serial_port_manager_task_runner_| and it will - // be destroyed on that sequence. diff --git a/www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc b/www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc index 41d470db80a2..17db61b295df 100644 --- a/www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc +++ b/www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc @@ -1,11 +1,11 @@ ---- services/device/geolocation/location_arbitrator.cc.orig 2019-03-11 22:01:01 UTC +--- services/device/geolocation/location_arbitrator.cc.orig 2020-02-03 21:53:32 UTC +++ services/device/geolocation/location_arbitrator.cc -@@ -164,7 +164,7 @@ LocationArbitrator::NewNetworkLocationProvider( +@@ -157,7 +157,7 @@ LocationArbitrator::NewNetworkLocationProvider( + std::unique_ptr<LocationProvider> LocationArbitrator::NewSystemLocationProvider() { - #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ -- defined(OS_FUCHSIA) -+ defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) return nullptr; #else return device::NewSystemLocationProvider(); diff --git a/www/iridium/files/patch-services_device_hid_BUILD.gn b/www/iridium/files/patch-services_device_hid_BUILD.gn index 9f794ce68041..01a7f29e58fa 100644 --- a/www/iridium/files/patch-services_device_hid_BUILD.gn +++ b/www/iridium/files/patch-services_device_hid_BUILD.gn @@ -1,4 +1,4 @@ ---- services/device/hid/BUILD.gn.orig 2019-03-11 22:01:01 UTC +--- services/device/hid/BUILD.gn.orig 2019-06-04 18:55:28 UTC +++ services/device/hid/BUILD.gn @@ -51,6 +51,19 @@ source_set("hid") { deps += [ "//device/udev_linux" ] @@ -18,5 +18,5 @@ + } + if (is_chromeos) { - deps += [ "//chromeos/dbus" ] + deps += [ "//chromeos/dbus/permission_broker" ] } diff --git a/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc b/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc index 63e52ab2847d..42e0cc8b1986 100644 --- a/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc +++ b/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc @@ -1,4 +1,4 @@ ---- services/device/hid/hid_connection_freebsd.cc.orig 2019-04-15 17:58:16 UTC +--- services/device/hid/hid_connection_freebsd.cc.orig 2019-05-04 09:19:19 UTC +++ services/device/hid/hid_connection_freebsd.cc @@ -0,0 +1,240 @@ +// Copyright (c) 2014 The Chromium Authors. All rights reserved. @@ -57,7 +57,7 @@ + WriteCallback callback) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + base::ScopedBlockingCall scoped_blocking_call( -+ base::BlockingType::MAY_BLOCK); ++ FROM_HERE, base::BlockingType::MAY_BLOCK); + + auto data = buffer->front(); + size_t size = buffer->size(); @@ -83,7 +83,7 @@ + ReadCallback callback) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + base::ScopedBlockingCall scoped_blocking_call( -+ base::BlockingType::MAY_BLOCK); ++ FROM_HERE, base::BlockingType::MAY_BLOCK); + struct usb_gen_descriptor ugd; + ugd.ugd_report_type = UHID_FEATURE_REPORT; + ugd.ugd_data = buffer->front(); @@ -233,7 +233,7 @@ + scoped_refptr<base::RefCountedBytes> buffer, + WriteCallback callback) { + base::ScopedBlockingCall scoped_blocking_call( -+ base::BlockingType::MAY_BLOCK); ++ FROM_HERE, base::BlockingType::MAY_BLOCK); + blocking_task_runner_->PostTask( + FROM_HERE, + base::BindOnce(&BlockingTaskHelper::SendFeatureReport, diff --git a/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.h b/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.h index 27eb84639bc1..0b6704917991 100644 --- a/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.h +++ b/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.h @@ -1,4 +1,4 @@ ---- services/device/hid/hid_connection_freebsd.h.orig 2019-04-15 17:58:16 UTC +--- services/device/hid/hid_connection_freebsd.h.orig 2019-05-01 15:21:27 UTC +++ services/device/hid/hid_connection_freebsd.h @@ -0,0 +1,68 @@ +// Copyright (c) 2014 The Chromium Authors. All rights reserved. diff --git a/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc b/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc index 33eaa3ee8cda..1ede85233d94 100644 --- a/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc +++ b/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc @@ -1,6 +1,6 @@ ---- services/device/hid/hid_service_freebsd.cc.orig 2019-04-15 17:58:16 UTC +--- services/device/hid/hid_service_freebsd.cc.orig 2020-03-17 15:11:01 UTC +++ services/device/hid/hid_service_freebsd.cc -@@ -0,0 +1,373 @@ +@@ -0,0 +1,383 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -19,6 +19,8 @@ +#include "base/bind.h" +#include "base/files/file_descriptor_watcher_posix.h" +#include "base/files/file_enumerator.h" ++#include "base/files/file_util.h" ++#include "base/files/file.h" +#include "base/location.h" +#include "base/logging.h" +#include "base/posix/eintr_wrapper.h" @@ -41,12 +43,12 @@ + +struct HidServiceFreeBSD::ConnectParams { + ConnectParams(scoped_refptr<HidDeviceInfo> device_info, -+ const ConnectCallback& callback) ++ ConnectCallback callback) + : device_info(std::move(device_info)), -+ callback(callback), ++ callback(std::move(callback)), + task_runner(base::ThreadTaskRunnerHandle::Get()), + blocking_task_runner( -+ base::CreateSequencedTaskRunnerWithTraits(kBlockingTaskTraits)) {} ++ base::CreateSequencedTaskRunner(kBlockingTaskTraits)) {} + ~ConnectParams() {} + + scoped_refptr<HidDeviceInfo> device_info; @@ -111,7 +113,7 @@ + + void OnDeviceAdded(std::string device_id) { + base::ScopedBlockingCall scoped_blocking_call( -+ base::BlockingType::MAY_BLOCK); ++ FROM_HERE, base::BlockingType::MAY_BLOCK); + std::string device_node = "/dev/" + device_id; + uint16_t vendor_id = 0xffff; + uint16_t product_id = 0xffff; @@ -161,9 +163,15 @@ + } + + scoped_refptr<HidDeviceInfo> device_info(new HidDeviceInfo( -+ device_id, vendor_id, product_id, product_name, serial_number, ++ device_id, ++ /*physical_device_id*/"", ++ vendor_id, ++ product_id, ++ product_name, ++ serial_number, + device::mojom::HidBusType::kHIDBusTypeUSB, -+ report_descriptor, device_node)); ++ report_descriptor, ++ device_node)); + + task_runner_->PostTask(FROM_HERE, base::Bind(&HidServiceFreeBSD::AddDevice, + service_, device_info)); @@ -171,7 +179,7 @@ + + void OnDeviceRemoved(std::string device_id) { + base::ScopedBlockingCall scoped_blocking_call( -+ base::BlockingType::MAY_BLOCK); ++ FROM_HERE, base::BlockingType::MAY_BLOCK); + task_runner_->PostTask( + FROM_HERE, base::Bind(&HidServiceFreeBSD::RemoveDevice, service_, + device_id)); @@ -296,7 +304,7 @@ +HidServiceFreeBSD::HidServiceFreeBSD() + : task_runner_(base::ThreadTaskRunnerHandle::Get()), + blocking_task_runner_( -+ base::CreateSequencedTaskRunnerWithTraits(kBlockingTaskTraits)), ++ base::CreateSequencedTaskRunner(kBlockingTaskTraits)), + weak_factory_(this) { + helper_ = std::make_unique<BlockingTaskHelper>(weak_factory_.GetWeakPtr()); + blocking_task_runner_->PostTask( @@ -315,7 +323,8 @@ +// static +void HidServiceFreeBSD::OpenOnBlockingThread( + std::unique_ptr<ConnectParams> params) { -+ base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK); ++ base::ScopedBlockingCall scoped_blocking_call( ++ FROM_HERE, base::BlockingType::MAY_BLOCK); + scoped_refptr<base::SequencedTaskRunner> task_runner = params->task_runner; + + base::FilePath device_path(params->device_info->device_node()); @@ -327,50 +336,51 @@ + HID_LOG(EVENT) << "Failed to open '" << params->device_info->device_node() + << "': " + << base::File::ErrorToString(device_file.error_details()); -+ task_runner->PostTask(FROM_HERE, base::Bind(params->callback, nullptr)); ++ task_runner->PostTask(FROM_HERE, ++ base::BindOnce(std::move(params->callback), nullptr)); + return; + } + params->fd.reset(device_file.TakePlatformFile()); -+ FinishOpen(std::move(params)); ++ task_runner->PostTask(FROM_HERE, base::BindOnce(&HidServiceFreeBSD::FinishOpen, ++ std::move(params))); +} + +void HidServiceFreeBSD::Connect(const std::string& device_guid, -+ const ConnectCallback& callback) { ++ ConnectCallback callback) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + + const auto& map_entry = devices().find(device_guid); + if (map_entry == devices().end()) { + base::ThreadTaskRunnerHandle::Get()->PostTask( -+ FROM_HERE, base::Bind(callback, nullptr)); ++ FROM_HERE, base::BindOnce(std::move(callback), nullptr)); + return; + } + + scoped_refptr<HidDeviceInfo> device_info = map_entry->second; + -+ auto params = std::make_unique<ConnectParams>(device_info, callback); -+ ++ auto params = std::make_unique<ConnectParams>(device_info, std::move(callback)); + scoped_refptr<base::SequencedTaskRunner> blocking_task_runner = + params->blocking_task_runner; ++ + blocking_task_runner->PostTask( -+ FROM_HERE, base::Bind(&HidServiceFreeBSD::OpenOnBlockingThread, -+ base::Passed(¶ms))); ++ FROM_HERE, base::BindOnce(&HidServiceFreeBSD::OpenOnBlockingThread, ++ std::move(params))); +} + +// static +void HidServiceFreeBSD::FinishOpen(std::unique_ptr<ConnectParams> params) { -+ scoped_refptr<base::SequencedTaskRunner> task_runner = params->task_runner; ++ DCHECK(params->fd.is_valid()); + -+ task_runner->PostTask( -+ FROM_HERE, -+ base::Bind(&HidServiceFreeBSD::CreateConnection, base::Passed(¶ms))); -+} ++ if (!base::SetNonBlocking(params->fd.get())) { ++ HID_PLOG(ERROR) << "Failed to set the non-blocking flag on the device fd"; ++ std::move(params->callback).Run(nullptr); ++ } + -+// static -+void HidServiceFreeBSD::CreateConnection(std::unique_ptr<ConnectParams> params) { -+ DCHECK(params->fd.is_valid()); -+ params->callback.Run(base::MakeRefCounted<HidConnectionFreeBSD>( -+ std::move(params->device_info), std::move(params->fd), -+ std::move(params->blocking_task_runner))); ++ std::move(params->callback).Run(base::MakeRefCounted<HidConnectionFreeBSD>( ++ std::move(params->device_info), ++ std::move(params->fd), ++ std::move(params->blocking_task_runner) ++ )); +} + +} // namespace device diff --git a/www/iridium/files/patch-services_device_hid_hid__service__freebsd.h b/www/iridium/files/patch-services_device_hid_hid__service__freebsd.h index 2c515c6ba632..593c762ba5a1 100644 --- a/www/iridium/files/patch-services_device_hid_hid__service__freebsd.h +++ b/www/iridium/files/patch-services_device_hid_hid__service__freebsd.h @@ -1,6 +1,6 @@ ---- services/device/hid/hid_service_freebsd.h.orig 2019-03-17 01:47:14 UTC +--- services/device/hid/hid_service_freebsd.h.orig 2020-03-17 15:11:01 UTC +++ services/device/hid/hid_service_freebsd.h -@@ -0,0 +1,48 @@ +@@ -0,0 +1,47 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -25,7 +25,7 @@ + ~HidServiceFreeBSD() override; + + void Connect(const std::string& device_guid, -+ const ConnectCallback& connect) override; ++ ConnectCallback connect) override; + base::WeakPtr<HidService> GetWeakPtr() override; + + private: @@ -34,7 +34,6 @@ + + static void OpenOnBlockingThread(std::unique_ptr<ConnectParams> params); + static void FinishOpen(std::unique_ptr<ConnectParams> params); -+ static void CreateConnection(std::unique_ptr<ConnectParams> params); + + const scoped_refptr<base::SequencedTaskRunner> task_runner_; + const scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_; diff --git a/www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc b/www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc index f8b54bcb97a3..e05dd930bc94 100644 --- a/www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc +++ b/www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc @@ -1,6 +1,6 @@ ---- services/device/serial/serial_io_handler_posix.cc.orig 2019-03-11 22:01:01 UTC +--- services/device/serial/serial_io_handler_posix.cc.orig 2019-04-30 22:22:56 UTC +++ services/device/serial/serial_io_handler_posix.cc -@@ -65,7 +65,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee +@@ -66,7 +66,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) BITRATE_TO_SPEED_CASE(38400) diff --git a/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc b/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor.cc deleted file mode 100644 index 7f039a8e8b9a..000000000000 --- a/www/iridium/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-03-11 22:01:01 UTC -+++ services/device/time_zone_monitor/time_zone_monitor.cc -@@ -29,7 +29,7 @@ void TimeZoneMonitor::Bind(device::mojom::TimeZoneMoni - - 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()); -@@ -41,7 +41,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/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc index bba3a937061a..cff5f136f844 100644 --- a/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc +++ b/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc @@ -1,6 +1,6 @@ ---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2019-03-11 22:01:01 UTC +--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2020-03-16 18:39:54 UTC +++ services/device/time_zone_monitor/time_zone_monitor_linux.cc -@@ -104,7 +104,11 @@ class TimeZoneMonitorLinuxImpl +@@ -127,7 +127,11 @@ class TimeZoneMonitorLinuxImpl // false positives are harmless, assuming the false positive rate is // reasonable. const char* const kFilesToWatch[] = { diff --git a/www/iridium/files/patch-services_device_usb_BUILD.gn b/www/iridium/files/patch-services_device_usb_BUILD.gn new file mode 100644 index 000000000000..7c3ad6a76957 --- /dev/null +++ b/www/iridium/files/patch-services_device_usb_BUILD.gn @@ -0,0 +1,11 @@ +--- services/device/usb/BUILD.gn.orig 2019-09-09 21:55:22 UTC ++++ services/device/usb/BUILD.gn +@@ -110,7 +110,7 @@ static_library("usb") { + ] + } + +- if (is_android || is_chromeos || is_linux) { ++ if ((is_android || is_chromeos || is_linux) && !is_bsd) { + sources += [ + "usb_device_handle_usbfs.cc", + "usb_device_handle_usbfs.h", diff --git a/www/iridium/files/patch-services_network_BUILD.gn b/www/iridium/files/patch-services_network_BUILD.gn index f88e8f7016ca..be4d33bb2644 100644 --- a/www/iridium/files/patch-services_network_BUILD.gn +++ b/www/iridium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2019-03-11 22:01:01 UTC +--- services/network/BUILD.gn.orig 2020-03-16 18:40:34 UTC +++ services/network/BUILD.gn -@@ -248,7 +248,6 @@ jumbo_component("network_service") { +@@ -260,7 +260,6 @@ jumbo_component("network_service") { if (is_linux) { deps += [ diff --git a/www/iridium/files/patch-services_network_network__context.cc b/www/iridium/files/patch-services_network_network__context.cc index 7494dd16ec70..888674c04595 100644 --- a/www/iridium/files/patch-services_network_network__context.cc +++ b/www/iridium/files/patch-services_network_network__context.cc @@ -1,38 +1,11 @@ ---- services/network/network_context.cc.orig 2019-03-11 22:01:01 UTC +--- services/network/network_context.cc.orig 2020-03-16 18:40:34 UTC +++ services/network/network_context.cc -@@ -132,7 +132,7 @@ - #endif // defined(USE_NSS_CERTS) - - #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) -+ ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) - #include "net/cert/cert_net_fetcher.h" - #include "net/cert_net/cert_net_fetcher_impl.h" - #endif -@@ -610,7 +610,7 @@ NetworkContext::~NetworkContext() { - #endif - - #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) -+ ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) - net::ShutdownGlobalCertNetFetcher(); - #endif - } -@@ -1700,7 +1700,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar +@@ -1758,7 +1758,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestC net::CookieCryptoDelegate* crypto_delegate = nullptr; if (params_->enable_encrypted_cookies) { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST) +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST) DCHECK(network_service_->os_crypt_config_set()) << "NetworkService::SetCryptConfig must be called before creating a " "NetworkContext with encrypted cookies."; -@@ -2015,7 +2015,7 @@ URLRequestContextOwner NetworkContext::ApplyContextPar - net::SetURLRequestContextForNSSHttpIO(result.url_request_context.get()); - #endif - #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \ -- (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) -+ ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) - net::SetGlobalCertNetFetcher( - net::CreateCertNetFetcher(result.url_request_context.get())); - #endif diff --git a/www/iridium/files/patch-services_network_network__service.cc b/www/iridium/files/patch-services_network_network__service.cc index 8ffb810f07ce..1e69f01166a8 100644 --- a/www/iridium/files/patch-services_network_network__service.cc +++ b/www/iridium/files/patch-services_network_network__service.cc @@ -1,20 +1,20 @@ ---- services/network/network_service.cc.orig 2019-03-21 00:36:59 UTC +--- services/network/network_service.cc.orig 2020-03-16 18:40:34 UTC +++ services/network/network_service.cc -@@ -61,7 +61,7 @@ +@@ -63,7 +63,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(IS_CHROMECAST)) || defined(OS_BSD) +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST) #include "components/os_crypt/key_storage_config_linux.h" #endif -@@ -605,7 +605,7 @@ void NetworkService::OnCertDBChanged() { +@@ -627,7 +627,7 @@ void NetworkService::OnCertDBChanged() { net::CertDatabase::GetInstance()->NotifyObserversCertDBChanged(); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) void NetworkService::SetCryptConfig(mojom::CryptConfigPtr crypt_config) { - #if !defined(IS_CHROMECAST) + #if !BUILDFLAG(IS_CHROMECAST) DCHECK(!os_crypt_config_set_); diff --git a/www/iridium/files/patch-services_network_network__service.h b/www/iridium/files/patch-services_network_network__service.h index 194096d9dc92..5f21c0217c3a 100644 --- a/www/iridium/files/patch-services_network_network__service.h +++ b/www/iridium/files/patch-services_network_network__service.h @@ -1,11 +1,11 @@ ---- services/network/network_service.h.orig 2019-03-11 22:01:01 UTC +--- services/network/network_service.h.orig 2020-03-16 18:40:34 UTC +++ services/network/network_service.h -@@ -186,7 +186,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService - #endif // !BUILDFLAG(IS_CT_SUPPORTED) - void UpdateCRLSet(base::span<const uint8_t> crl_set) override; +@@ -150,7 +150,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkService + base::span<const uint8_t> config, + mojom::NetworkService::UpdateLegacyTLSConfigCallback callback) override; void OnCertDBChanged() override; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) void SetCryptConfig(mojom::CryptConfigPtr crypt_config) override; #endif - #if defined(OS_MACOSX) && !defined(OS_IOS) + #if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS)) diff --git a/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc new file mode 100644 index 000000000000..4c391c6c24c4 --- /dev/null +++ b/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -0,0 +1,20 @@ +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2019-09-09 21:55:22 UTC ++++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc +@@ -43,7 +43,7 @@ namespace { + uint32_t CalculatePrivateFootprintKb(const mojom::RawOSMemDump& os_dump, + uint32_t shared_resident_kb) { + DCHECK(os_dump.platform_private_footprint); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes; + uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes; + return (rss_anon_bytes + vm_swap_bytes) / 1024; +@@ -82,7 +82,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl + os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable; + os_dump->private_footprint_kb = + CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb); +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + os_dump->private_footprint_swap_kb = + internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; + #endif diff --git a/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h b/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h index 83e6eb0eaa83..f8b2542dae6e 100644 --- a/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h +++ b/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics.h @@ -1,6 +1,6 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2019-03-11 22:01:02 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h.orig 2019-07-24 18:58:35 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h -@@ -26,9 +26,9 @@ class COMPONENT_EXPORT( +@@ -28,9 +28,9 @@ class COMPONENT_EXPORT( mojom::RawOSMemDump*); static std::vector<mojom::VmRegionPtr> GetProcessMemoryMaps(base::ProcessId); @@ -12,3 +12,21 @@ private: FRIEND_TEST_ALL_PREFIXES(OSMetricsTest, ParseProcSmaps); +@@ -44,7 +44,7 @@ class COMPONENT_EXPORT( + static std::vector<mojom::VmRegionPtr> GetProcessModules(base::ProcessId); + #endif + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + // Provides information on the dump state of resident pages. + enum class MappedAndResidentPagesDumpState { + // Access to /proc/<pid>/pagemap can be denied for android devices running +@@ -68,7 +68,7 @@ class COMPONENT_EXPORT( + // TODO(chiniforooshan): move to /base/process/process_metrics_linux.cc after + // making sure that peak RSS is useful. + static size_t GetPeakResidentSetSize(base::ProcessId pid); +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + }; + + } // namespace memory_instrumentation diff --git a/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc b/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc index f850f430305a..b38e937afd6f 100644 --- a/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc +++ b/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_os__metrics__linux.cc @@ -1,6 +1,6 @@ ---- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2019-04-05 00:49:26 UTC +--- services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc.orig 2019-07-24 18:58:35 UTC +++ services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics_linux.cc -@@ -17,8 +17,10 @@ +@@ -22,8 +22,10 @@ #include "build/build_config.h" #include "services/resource_coordinator/public/cpp/memory_instrumentation/os_metrics.h" @@ -11,23 +11,23 @@ namespace memory_instrumentation { -@@ -67,6 +69,7 @@ struct ModuleData { +@@ -86,6 +88,7 @@ struct ModuleData { ModuleData GetMainModuleData() { ModuleData module_data; +#if !defined(OS_BSD) Dl_info dl_info; if (dladdr(&__ehdr_start, &dl_info)) { - base::Optional<std::string> build_id = -@@ -76,6 +79,7 @@ ModuleData GetMainModuleData() { - module_data.build_id = *build_id; + base::debug::ElfBuildIdBuffer build_id; +@@ -96,6 +99,7 @@ ModuleData GetMainModuleData() { + module_data.build_id = std::string(build_id, build_id_length); } } +#endif return module_data; } -@@ -123,14 +127,14 @@ bool ParseSmapsHeader(const char* header_line, +@@ -143,14 +147,14 @@ bool ParseSmapsHeader(const char* header_line, // Build ID is needed to symbolize heap profiles, and is generated only on // official builds. Build ID is only added for the current library (chrome) // since it is racy to read other libraries which can be unmapped any time. @@ -44,37 +44,60 @@ return res; } -@@ -217,6 +221,9 @@ void OSMetrics::SetProcSmapsForTesting(FILE* f) { - // static - bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, +@@ -239,6 +243,7 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, mojom::RawOSMemDump* dump) { -+#if defined(OS_BSD) -+ return false; -+#else - base::ScopedFD autoclose = OpenStatm(pid); + // TODO(chiniforooshan): There is no need to read both /statm and /status + // files. Refactor to get everything from /status using ProcessMetric. ++#if !defined(OS_BSD) + auto statm_file = GetProcPidDir(pid).Append("statm"); + auto autoclose = base::ScopedFD(open(statm_file.value().c_str(), O_RDONLY)); int statm_fd = autoclose.get(); +@@ -253,6 +258,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, -@@ -242,10 +249,12 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, - dump->resident_set_kb = process_metrics->GetResidentSetSize() / 1024; - - return true; + if (!success) + return false; ++#else ++ uint64_t resident_pages = 0; ++ uint64_t shared_pages = 0; +#endif - } + + auto process_metrics = CreateProcessMetrics(pid); + +@@ -293,6 +302,10 @@ bool OSMetrics::FillOSMemoryDump(base::ProcessId pid, // static std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMaps(base::ProcessId pid) { +#if defined(OS_BSD) ++ NOTIMPLEMENTED(); ++ return std::vector<VmRegionPtr>(); ++#else std::vector<VmRegionPtr> maps; uint32_t res = 0; if (g_proc_smaps_for_testing) { -@@ -263,6 +272,10 @@ std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMa +@@ -310,6 +323,7 @@ std::vector<VmRegionPtr> OSMetrics::GetProcessMemoryMa return std::vector<VmRegionPtr>(); return maps; -+#else ++#endif + } + + // static +@@ -317,6 +331,10 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: + const size_t start_address, + const size_t end_address, + std::vector<uint8_t>* accessed_pages_bitmap) { ++#if defined(OS_BSD) + NOTIMPLEMENTED(); -+ return std::vector<VmRegionPtr>(); ++ return OSMetrics::MappedAndResidentPagesDumpState::kFailure; ++#else + const char* kPagemap = "/proc/self/pagemap"; + + base::ScopedFILE pagemap_file(fopen(kPagemap, "r")); +@@ -358,6 +376,7 @@ OSMetrics::MappedAndResidentPagesDumpState OSMetrics:: + } + } + return OSMetrics::MappedAndResidentPagesDumpState::kSuccess; +#endif } - } // namespace memory_instrumentation + // static diff --git a/www/iridium/files/patch-services_service__manager_embedder_main.cc b/www/iridium/files/patch-services_service__manager_embedder_main.cc index 59c9689f2a44..9c935b9f16e1 100644 --- a/www/iridium/files/patch-services_service__manager_embedder_main.cc +++ b/www/iridium/files/patch-services_service__manager_embedder_main.cc @@ -1,6 +1,6 @@ ---- services/service_manager/embedder/main.cc.orig 2019-03-11 22:01:02 UTC +--- services/service_manager/embedder/main.cc.orig 2019-10-21 19:06:40 UTC +++ services/service_manager/embedder/main.cc -@@ -320,7 +320,7 @@ int Main(const MainParams& params) { +@@ -272,7 +272,7 @@ int Main(const MainParams& params) { #endif base::EnableTerminationOnOutOfMemory(); diff --git a/www/iridium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn b/www/iridium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn index 6be6aa5fe51e..4e2b8913bd0b 100644 --- a/www/iridium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn +++ b/www/iridium/files/patch-services_service__manager_public_cpp_service__executable_BUILD.gn @@ -1,6 +1,6 @@ ---- services/service_manager/public/cpp/service_executable/BUILD.gn.orig 2019-03-11 22:01:02 UTC +--- services/service_manager/public/cpp/service_executable/BUILD.gn.orig 2019-04-30 22:22:56 UTC +++ services/service_manager/public/cpp/service_executable/BUILD.gn -@@ -30,6 +30,11 @@ source_set("support") { +@@ -29,6 +29,11 @@ source_set("support") { "//sandbox/linux:seccomp_bpf", ] } @@ -11,4 +11,4 @@ + } } - # Service executable targets should link against this to get a boilerplate entry + source_set("switches") { diff --git a/www/iridium/files/patch-services_service__manager_runner_host_BUILD.gn b/www/iridium/files/patch-services_service__manager_runner_host_BUILD.gn deleted file mode 100644 index 05ce38ea9fad..000000000000 --- a/www/iridium/files/patch-services_service__manager_runner_host_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- services/service_manager/runner/host/BUILD.gn.orig 2019-03-11 22:01:02 UTC -+++ services/service_manager/runner/host/BUILD.gn -@@ -30,7 +30,7 @@ source_set("lib") { - "//mojo/public/cpp/system", - ] - -- if (is_linux) { -+ if (is_linux && !is_bsd) { - deps += [ "//sandbox/linux:sandbox_services" ] - } - diff --git a/www/iridium/files/patch-services_service__manager_sandbox_BUILD.gn b/www/iridium/files/patch-services_service__manager_sandbox_BUILD.gn index edfc14f60d03..79967079b24d 100644 --- a/www/iridium/files/patch-services_service__manager_sandbox_BUILD.gn +++ b/www/iridium/files/patch-services_service__manager_sandbox_BUILD.gn @@ -1,6 +1,6 @@ ---- services/service_manager/sandbox/BUILD.gn.orig 2019-03-11 22:01:02 UTC +--- services/service_manager/sandbox/BUILD.gn.orig 2020-03-16 18:40:34 UTC +++ services/service_manager/sandbox/BUILD.gn -@@ -28,7 +28,7 @@ component("sandbox") { +@@ -26,7 +26,7 @@ component("sandbox") { "//base", "//sandbox:common", ] diff --git a/www/iridium/files/patch-services_service__manager_sandbox_sandbox__type.cc b/www/iridium/files/patch-services_service__manager_sandbox_sandbox__type.cc deleted file mode 100644 index a3ad01ccd336..000000000000 --- a/www/iridium/files/patch-services_service__manager_sandbox_sandbox__type.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- services/service_manager/sandbox/sandbox_type.cc.orig 2019-03-17 14:36:49 UTC -+++ services/service_manager/sandbox/sandbox_type.cc -@@ -25,7 +25,7 @@ bool IsUnsandboxedSandboxType(SandboxType sandbox_type - service_manager::features::kXRSandbox); - #endif - case SANDBOX_TYPE_AUDIO: --#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) -+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - return !base::FeatureList::IsEnabled( - service_manager::features::kAudioServiceSandbox); - #else diff --git a/www/iridium/files/patch-services_service__manager_zygote_zygote__linux.cc b/www/iridium/files/patch-services_service__manager_zygote_zygote__linux.cc index 61cc883b5421..3a2ff8db55e7 100644 --- a/www/iridium/files/patch-services_service__manager_zygote_zygote__linux.cc +++ b/www/iridium/files/patch-services_service__manager_zygote_zygote__linux.cc @@ -1,4 +1,4 @@ ---- services/service_manager/zygote/zygote_linux.cc.orig 2019-03-11 22:01:02 UTC +--- services/service_manager/zygote/zygote_linux.cc.orig 2019-06-04 18:55:28 UTC +++ services/service_manager/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ // Copyright (c) 2012 The Chromium Authors. All rights reserved. @@ -8,7 +8,7 @@ #include "services/service_manager/zygote/zygote_linux.h" -@@ -664,3 +665,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick +@@ -657,3 +658,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick } } // namespace service_manager diff --git a/www/iridium/files/patch-services_service__manager_zygote_zygote__main__linux.cc b/www/iridium/files/patch-services_service__manager_zygote_zygote__main__linux.cc index 51f86ce5be01..c1871f137977 100644 --- a/www/iridium/files/patch-services_service__manager_zygote_zygote__main__linux.cc +++ b/www/iridium/files/patch-services_service__manager_zygote_zygote__main__linux.cc @@ -1,4 +1,4 @@ ---- services/service_manager/zygote/zygote_main_linux.cc.orig 2019-03-11 22:01:02 UTC +--- services/service_manager/zygote/zygote_main_linux.cc.orig 2020-02-03 21:53:32 UTC +++ services/service_manager/zygote/zygote_main_linux.cc @@ -11,7 +11,9 @@ #include <stddef.h> @@ -10,7 +10,7 @@ #include <sys/socket.h> #include <sys/types.h> #include <unistd.h> -@@ -101,6 +103,7 @@ static bool CreateInitProcessReaper( +@@ -99,6 +101,7 @@ static bool CreateInitProcessReaper( // created through the setuid sandbox. static bool EnterSuidSandbox(sandbox::SetuidSandboxClient* setuid_sandbox, base::OnceClosure post_fork_parent_callback) { @@ -18,7 +18,7 @@ DCHECK(setuid_sandbox); DCHECK(setuid_sandbox->IsSuidSandboxChild()); -@@ -133,6 +136,9 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxCli +@@ -131,6 +134,9 @@ static bool EnterSuidSandbox(sandbox::SetuidSandboxCli CHECK(service_manager::SandboxDebugHandling::SetDumpableStatusAndHandlers()); return true; @@ -28,7 +28,7 @@ } static void DropAllCapabilities(int proc_fd) { -@@ -178,6 +184,7 @@ static void EnterLayerOneSandbox(service_manager::Sand +@@ -176,6 +182,7 @@ static void EnterLayerOneSandbox(service_manager::Sand bool ZygoteMain( std::vector<std::unique_ptr<ZygoteForkDelegate>> fork_delegates) { @@ -36,7 +36,7 @@ sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD()); auto* linux_sandbox = service_manager::SandboxLinux::GetInstance(); -@@ -240,6 +247,9 @@ bool ZygoteMain( +@@ -238,6 +245,9 @@ bool ZygoteMain( // This function call can return multiple times, once per fork(). return zygote.ProcessRequests(); diff --git a/www/iridium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc b/www/iridium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc new file mode 100644 index 000000000000..61e7cb3830ad --- /dev/null +++ b/www/iridium/files/patch-services_tracing_public_cpp_perfetto_trace__time.cc @@ -0,0 +1,23 @@ +--- services/tracing/public/cpp/perfetto/trace_time.cc.orig 2020-03-17 10:13:47 UTC ++++ services/tracing/public/cpp/perfetto/trace_time.cc +@@ -13,13 +13,17 @@ namespace tracing { + + int64_t TraceBootTicksNow() { + // On Windows and Mac, TRACE_TIME_TICKS_NOW() behaves like boottime already. +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) + struct timespec ts; ++#if defined(OS_BSD) ++ int res = clock_gettime(CLOCK_UPTIME, &ts); ++#else + int res = clock_gettime(CLOCK_BOOTTIME, &ts); ++#endif + if (res != -1) + return static_cast<int64_t>(perfetto::base::FromPosixTimespec(ts).count()); + #endif + return TRACE_TIME_TICKS_NOW().since_origin().InNanoseconds(); + } + +-} // namespace tracing +\ No newline at end of file ++} // namespace tracing diff --git a/www/iridium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc b/www/iridium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc new file mode 100644 index 000000000000..06d34c96b6cd --- /dev/null +++ b/www/iridium/files/patch-services_tracing_public_cpp_stack__sampling_tracing__sampler__profiler.cc @@ -0,0 +1,11 @@ +--- services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc.orig 2020-03-17 10:16:22 UTC ++++ services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.cc +@@ -362,7 +362,7 @@ TracingSamplerProfiler::TracingProfileBuilder::GetCall + } + #endif + +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + // Linux ELF module IDs are 160bit integers, which we need to mangle + // down to 128bit integers to match the id that Breakpad outputs. + // Example on version '66.0.3359.170' x64: diff --git a/www/iridium/files/patch-services_video__capture_broadcasting__receiver.cc b/www/iridium/files/patch-services_video__capture_broadcasting__receiver.cc new file mode 100644 index 000000000000..31c7ab5e263a --- /dev/null +++ b/www/iridium/files/patch-services_video__capture_broadcasting__receiver.cc @@ -0,0 +1,20 @@ +--- services/video_capture/broadcasting_receiver.cc.orig 2019-12-16 21:51:28 UTC ++++ services/video_capture/broadcasting_receiver.cc +@@ -40,7 +40,7 @@ void CloneSharedBufferHandle(const mojo::ScopedSharedB + void CloneSharedBufferToRawFileDescriptorHandle( + const mojo::ScopedSharedBufferHandle& source, + media::mojom::VideoBufferHandlePtr* target) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // |source| is unwrapped to a |PlatformSharedMemoryRegion|, from whence a file + // descriptor can be extracted which is then mojo-wrapped. + base::subtle::PlatformSharedMemoryRegion platform_region = +@@ -183,7 +183,7 @@ void BroadcastingReceiver::BufferContext:: + ConvertRawFileDescriptorToSharedBuffer() { + DCHECK(buffer_handle_->is_shared_memory_via_raw_file_descriptor()); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // The conversion unwraps the descriptor from its mojo handle to the raw file + // descriptor (ie, an int). This is used to create a + // PlatformSharedMemoryRegion which is then wrapped as a diff --git a/www/iridium/files/patch-third__party_angle_BUILD.gn b/www/iridium/files/patch-third__party_angle_BUILD.gn index a2aa44b3e13f..330949cb3773 100644 --- a/www/iridium/files/patch-third__party_angle_BUILD.gn +++ b/www/iridium/files/patch-third__party_angle_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/BUILD.gn.orig 2019-03-11 22:07:58 UTC +--- third_party/angle/BUILD.gn.orig 2020-03-16 18:42:05 UTC +++ third_party/angle/BUILD.gn -@@ -276,6 +276,7 @@ angle_static_library("angle_gpu_info_util") { +@@ -384,6 +384,7 @@ angle_static_library("angle_gpu_info_util") { "X11", "Xi", "Xext", @@ -8,14 +8,3 @@ ] } } -@@ -842,10 +843,6 @@ foreach(is_shared_library, - libs = [] - if (is_linux) { - sources += util_linux_sources -- libs += [ -- "rt", -- "dl", -- ] - } - - if (is_mac) { diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp index 0021521dfbc0..48998ce95915 100644 --- a/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,20 +1,11 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2019-03-11 22:07:59 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2020-03-16 18:42:05 UTC +++ third_party/angle/src/libANGLE/Display.cpp -@@ -64,7 +64,7 @@ - #if defined(ANGLE_ENABLE_VULKAN) - # if defined(ANGLE_PLATFORM_WINDOWS) - # include "libANGLE/renderer/vulkan/win32/DisplayVkWin32.h" +@@ -286,7 +286,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di + { + impl = rx::CreateVulkanWin32Display(state); + } -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_POSIX) - # include "libANGLE/renderer/vulkan/xcb/DisplayVkXcb.h" - # elif defined(ANGLE_PLATFORM_ANDROID) - # include "libANGLE/renderer/vulkan/android/DisplayVkAndroid.h" -@@ -216,7 +216,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib - #if defined(ANGLE_ENABLE_VULKAN) - # if defined(ANGLE_PLATFORM_WINDOWS) - impl = new rx::DisplayVkWin32(state); --# elif defined(ANGLE_PLATFORM_LINUX) -+# elif defined(ANGLE_PLATFORM_POSIX) - impl = new rx::DisplayVkXcb(state); - # elif defined(ANGLE_PLATFORM_ANDROID) - impl = new rx::DisplayVkAndroid(state); + if (rx::IsVulkanXcbDisplayAvailable()) + { + impl = rx::CreateVulkanXcbDisplay(state); diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h index 99bcfb4201b5..380c2f0a1a4f 100644 --- a/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h +++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2019-03-11 22:07:59 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2020-03-16 18:42:06 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -107,7 +107,7 @@ inline bool IsWindows() +@@ -122,7 +122,7 @@ inline bool IsWindows() inline bool IsLinux() { diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h new file mode 100644 index 000000000000..aa021274cc80 --- /dev/null +++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h @@ -0,0 +1,15 @@ +--- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2020-02-03 21:54:48 UTC ++++ third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h +@@ -19,10 +19,10 @@ bool IsVulkanWin32DisplayAvailable(); + DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state); + #endif // defined(ANGLE_PLATFORM_WINDOWS) + +-#if defined(ANGLE_PLATFORM_LINUX) ++#if defined(ANGLE_PLATFORM_POSIX) + bool IsVulkanXcbDisplayAvailable(); + DisplayImpl *CreateVulkanXcbDisplay(const egl::DisplayState &state); +-#endif // defined(ANGLE_PLATFORM_LINUX) ++#endif // defined(ANGLE_PLATFORM_POSIX) + + #if defined(ANGLE_PLATFORM_ANDROID) + bool IsVulkanAndroidDisplayAvailable(); diff --git a/www/iridium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c b/www/iridium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c index e61a4d98148f..c03540dc02ea 100644 --- a/www/iridium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c +++ b/www/iridium/files/patch-third__party_angle_third__party_vulkan-loader_src_loader_loader.c @@ -1,11 +1,11 @@ ---- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2019-03-11 22:08:05 UTC +--- third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2020-02-03 21:54:58 UTC +++ third_party/angle/third_party/vulkan-loader/src/loader/loader.c -@@ -215,7 +215,7 @@ void *loader_device_heap_realloc(const struct loader_d +@@ -238,7 +238,7 @@ void *loader_device_heap_realloc(const struct loader_d } // Environment variables -#if defined(__linux__) || defined(__APPLE__) +#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) - static inline char *loader_getenv(const char *name, const struct loader_instance *inst) { - // No allocation of memory necessary for Linux, but we should at least touch + static inline bool IsHighIntegrity() { + return geteuid() != getuid() || getegid() != getgid(); diff --git a/www/iridium/files/patch-third__party_blink_renderer_BUILD.gn b/www/iridium/files/patch-third__party_blink_renderer_BUILD.gn new file mode 100644 index 000000000000..3ee19aa5429f --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_renderer_BUILD.gn @@ -0,0 +1,13 @@ +--- third_party/blink/renderer/BUILD.gn.orig 2020-03-16 18:40:34 UTC ++++ third_party/blink/renderer/BUILD.gn +@@ -45,8 +45,8 @@ config("inside_blink") { + "-Wconversion", + "-Wno-float-conversion", + "-Wno-sign-conversion", +- "-Wno-implicit-float-conversion", +- "-Wno-implicit-int-conversion", ++# "-Wno-implicit-float-conversion", ++# "-Wno-implicit-int-conversion", + ] + + if (!is_chromeos || default_toolchain != "//build/toolchain/cros:target") { diff --git a/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc new file mode 100644 index 000000000000..f2b1624738c8 --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc @@ -0,0 +1,20 @@ +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2020-03-17 10:17:22 UTC ++++ third_party/blink/renderer/controller/blink_initializer.cc +@@ -69,7 +69,7 @@ + #include "third_party/blink/renderer/controller/memory_usage_monitor_posix.h" + #endif + +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX) || \ ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_BSD) || \ + defined(OS_WIN) + #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" + #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" +@@ -146,7 +146,7 @@ void InitializeCommon(Platform* platform, mojo::Binder + CrashMemoryMetricsReporterImpl::Instance(); + #endif + +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX) || \ ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX) || defined(OS_BSD) || \ + defined(OS_WIN) + // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring. + if (UserLevelMemoryPressureSignalGenerator::Enabled()) diff --git a/www/iridium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h b/www/iridium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h new file mode 100644 index 000000000000..0c30711ac49d --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.h @@ -0,0 +1,47 @@ +--- third_party/blink/renderer/controller/memory_usage_monitor_posix.h.orig 2020-03-17 10:18:29 UTC ++++ third_party/blink/renderer/controller/memory_usage_monitor_posix.h +@@ -12,7 +12,7 @@ + #include "third_party/blink/renderer/controller/controller_export.h" + #include "third_party/blink/renderer/controller/memory_usage_monitor.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "third_party/blink/public/mojom/memory_usage_monitor_linux.mojom-blink.h" + #endif + +@@ -21,7 +21,7 @@ namespace blink { + // MemoryUsageMonitor implementation for Android and Linux. + class CONTROLLER_EXPORT MemoryUsageMonitorPosix + : public MemoryUsageMonitor +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + , + public mojom::blink::MemoryUsageMonitorLinux + #endif +@@ -29,7 +29,7 @@ class CONTROLLER_EXPORT MemoryUsageMonitorPosix + public: + MemoryUsageMonitorPosix() = default; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + static void Bind( + mojo::PendingReceiver<mojom::blink::MemoryUsageMonitorLinux> receiver); + #endif +@@ -47,7 +47,7 @@ class CONTROLLER_EXPORT MemoryUsageMonitorPosix + uint64_t* vm_size, + uint64_t* vm_hwm_size); + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // mojom::MemoryUsageMonitorLinux implementations: + void SetProcFiles(base::File statm_file, base::File status_file) override; + #endif +@@ -65,7 +65,7 @@ class CONTROLLER_EXPORT MemoryUsageMonitorPosix + base::ScopedFD statm_fd_; + base::ScopedFD status_fd_; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + mojo::Receiver<mojom::blink::MemoryUsageMonitorLinux> receiver_{this}; + #endif + }; diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc b/www/iridium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc index f57e563f421d..1ba55b799c74 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_editing_editing__behavior.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2019-03-11 22:01:03 UTC +--- third_party/blink/renderer/core/editing/editing_behavior.cc.orig 2020-03-16 18:39:56 UTC +++ third_party/blink/renderer/core/editing/editing_behavior.cc -@@ -270,7 +270,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb +@@ -274,7 +274,7 @@ bool EditingBehavior::ShouldInsertCharacter(const Keyb // unexpected behaviour if (ch < ' ') return false; diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc index 52d3aa574519..af22ef50a74c 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc @@ -1,7 +1,7 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2019-03-11 22:01:03 UTC +--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2020-02-03 21:52:51 UTC +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -39,7 +39,7 @@ constexpr TimeDelta kEncodeRowSlackBeforeDeadline = - TimeDelta::FromMicroseconds(100); +@@ -41,7 +41,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin + base::TimeDelta::FromMicroseconds(100); /* The value is based on user statistics on Nov 2017. */ -#if (defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)) diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc b/www/iridium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc index d05250810ced..d05dcc105788 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2019-03-11 22:01:03 UTC +--- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2020-03-16 18:40:35 UTC +++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc -@@ -127,7 +127,7 @@ class InternalPopupMenu::ItemIterationContext { +@@ -122,7 +122,7 @@ class InternalPopupMenu::ItemIterationContext { is_in_group_(false), buffer_(buffer) { DCHECK(buffer_); diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc index 8a28ae58a8c3..5f3d6ec67939 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc @@ -1,11 +1,11 @@ ---- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2019-03-11 22:01:03 UTC +--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2019-09-09 21:55:24 UTC +++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc -@@ -171,7 +171,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t +@@ -184,7 +184,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t - std::vector<std::string> InspectorMemoryAgent::Symbolize( - const std::vector<void*>& addresses) { + Vector<String> InspectorMemoryAgent::Symbolize( + const WebVector<void*>& addresses) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // TODO(alph): Move symbolization to the client. - std::vector<void*> addresses_to_symbolize; - for (void* address : addresses) { + Vector<void*> addresses_to_symbolize; + for (size_t i = 0; i < addresses.size(); i++) { diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index c960ddc9f0d3..eb2c92cf0610 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,15 +1,15 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2019-03-17 20:57:47 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2020-03-16 18:40:35 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -58,7 +58,7 @@ +@@ -59,7 +59,7 @@ + #include "third_party/blink/renderer/platform/instrumentation/tracing/traced_value.h" #include "third_party/blink/renderer/platform/runtime_enabled_features.h" - #include "third_party/blink/renderer/platform/transforms/transform_state.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -321,7 +321,7 @@ void LayoutView::UpdateLayout() { +@@ -326,7 +326,7 @@ void LayoutView::UpdateLayout() { DCHECK(!layout_state_); LayoutState root_layout_state(*this); diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index 74442a38fa4f..8414327a53f4 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2019-03-11 22:01:03 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2020-03-16 18:40:35 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -104,7 +104,7 @@ namespace { +@@ -106,7 +106,7 @@ namespace { static CompositingQueryMode g_compositing_query_mode = kCompositingQueriesAreOnlyAllowedInCertainDocumentLifecyclePhases; diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index 3425511a45e5..2d02c5dfa4c2 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,6 +1,15 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2019-03-11 22:01:03 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2020-03-16 18:39:56 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc -@@ -332,7 +332,7 @@ ScrollbarPart ScrollbarThemeAura::InvalidateOnThumbPos +@@ -137,7 +137,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const + // Disable snapback on desktop Linux to better integrate with the desktop + // behavior. Typically, Linux apps do not implement scrollbar snapback (this + // is true for at least GTK and QT apps). +-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + return false; + #endif + +@@ -301,7 +301,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar, const WebMouseEvent& event) { diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc new file mode 100644 index 000000000000..14dc2ef5bb1a --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2020-03-16 18:39:56 UTC ++++ third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc +@@ -444,7 +444,7 @@ void ProcessedLocalAudioSource::CaptureUsingProcessor( + bool key_pressed) { + #if defined(OS_WIN) || defined(OS_MACOSX) + DCHECK_LE(volume, 1.0); +-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD) ++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // We have a special situation on Linux where the microphone volume can be + // "higher than maximum". The input volume slider in the sound preference + // allows the user to set a scaling that is higher than 100%. It means that diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn index 3d62c085808a..6c239154d0c0 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2019-03-11 22:01:04 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2020-03-16 18:40:35 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -129,6 +129,7 @@ executable("character_data_generator") { +@@ -100,6 +100,7 @@ executable("character_data_generator") { "//build/win:default_exe_manifest", "//third_party/icu", ] diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc index b237065ecdae..086b16ed616f 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-03-11 22:01:04 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2020-02-03 21:52:52 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -66,7 +66,7 @@ namespace blink { +@@ -76,7 +76,7 @@ static const char kColorEmojiLocale[] = "und-Zsye"; SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,12 +9,12 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -89,7 +89,7 @@ FontCache::FontCache() +@@ -115,7 +115,7 @@ FontCache::FontCache() FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) if (family.IsEmpty() || family == font_family_names::kSystemUi) return nullptr; #else diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index 7d9dce581b79..ea74c8b323ef 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,6 +1,15 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2019-03-11 22:01:04 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2020-02-03 21:52:52 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h -@@ -157,7 +157,7 @@ class PLATFORM_EXPORT FontCache { +@@ -58,7 +58,7 @@ + #include "third_party/skia/include/core/SkFontMgr.h" + #include "third_party/skia/include/core/SkRefCnt.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "ui/gfx/font_fallback_linux.h" + #endif + +@@ -166,7 +166,7 @@ class PLATFORM_EXPORT FontCache { sk_sp<SkFontMgr> FontManager() { return font_manager_; } static void SetFontManager(sk_sp<SkFontMgr>); @@ -9,41 +18,37 @@ // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -218,7 +218,7 @@ class PLATFORM_EXPORT FontCache { +@@ -241,11 +241,11 @@ class PLATFORM_EXPORT FontCache { const FontDescription&); #endif // defined(OS_ANDROID) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - struct PlatformFallbackFont { - String name; - CString filename; -@@ -230,7 +230,7 @@ class PLATFORM_EXPORT FontCache { - static void GetFontForCharacter(UChar32, + static bool GetFontForCharacter(UChar32, const char* preferred_locale, - PlatformFallbackFont*); + gfx::FallbackFontData*); -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) scoped_refptr<SimpleFontData> FontDataFromFontPlatformData( const FontPlatformData*, -@@ -294,12 +294,12 @@ class PLATFORM_EXPORT FontCache { +@@ -317,12 +317,12 @@ class PLATFORM_EXPORT FontCache { const FontFaceCreationParams&, - CString& name); + std::string& name); --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, FontFallbackPriority); --#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) - scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle(const FontDescription&, - UChar32); -@@ -330,7 +330,7 @@ class PLATFORM_EXPORT FontCache { - bool is_test_font_mgr_ = false; + scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle( + const FontDescription&, +@@ -356,7 +356,7 @@ class PLATFORM_EXPORT FontCache { + std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_; #endif // defined(OS_WIN) -#if defined(OS_LINUX) || defined(OS_CHROMEOS) diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index bf9aea7b1d12..3c38c7f4dc44 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,17 +1,17 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2019-03-11 22:01:04 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2019-12-16 21:50:53 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc @@ -38,7 +38,7 @@ - #include "third_party/blink/renderer/platform/wtf/text/atomic_string_hash.h" #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" + #include "third_party/blink/renderer/platform/wtf/text/string_hasher.h" -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -223,7 +223,7 @@ FontCacheKey FontDescription::CacheKey( - static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 - static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 +@@ -225,7 +225,7 @@ FontCacheKey FontDescription::CacheKey( + static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 + static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 -#if defined(OS_LINUX) || defined(OS_CHROMEOS) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc index f2ef075940b9..4445ec96128b 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__metrics.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2019-03-11 22:01:04 UTC +--- third_party/blink/renderer/platform/fonts/font_metrics.cc.orig 2019-07-24 18:58:42 UTC +++ third_party/blink/renderer/platform/fonts/font_metrics.cc -@@ -39,7 +39,7 @@ +@@ -38,7 +38,7 @@ namespace blink { @@ -9,7 +9,7 @@ // This is the largest VDMX table which we'll try to load and parse. static const size_t kMaxVDMXTableSize = 1024 * 1024; // 1 MB #endif -@@ -61,7 +61,7 @@ void FontMetrics::AscentDescentWithHacks( +@@ -60,7 +60,7 @@ void FontMetrics::AscentDescentWithHacks( int vdmx_ascent = 0, vdmx_descent = 0; bool is_vdmx_valid = false; @@ -18,7 +18,7 @@ // Manually digging up VDMX metrics is only applicable when bytecode hinting // using FreeType. With DirectWrite or CoreText, no bytecode hinting is ever // done. This code should be pushed into FreeType (hinted font metrics). -@@ -107,7 +107,7 @@ void FontMetrics::AscentDescentWithHacks( +@@ -106,7 +106,7 @@ void FontMetrics::AscentDescentWithHacks( visual_overflow_inflation_for_ascent = 1; if (descent < metrics.fDescent) { visual_overflow_inflation_for_descent = 1; diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc index 1ea3aeb653ef..4766c40ab521 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__unique__name__lookup.cc @@ -1,15 +1,15 @@ ---- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2019-03-11 22:01:04 UTC +--- third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc.orig 2019-06-04 18:55:30 UTC +++ third_party/blink/renderer/platform/fonts/font_unique_name_lookup.cc -@@ -10,7 +10,7 @@ +@@ -8,7 +8,7 @@ #if defined(OS_ANDROID) - #include "third_party/blink/public/platform/modules/font_unique_name_lookup/font_unique_name_lookup.mojom-blink.h" + #include "third_party/blink/public/mojom/font_unique_name_lookup/font_unique_name_lookup.mojom-blink.h" #include "third_party/blink/renderer/platform/fonts/android/font_unique_name_lookup_android.h" -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) #include "third_party/blink/renderer/platform/fonts/linux/font_unique_name_lookup_linux.h" #elif defined(OS_WIN) - #include "third_party/blink/public/mojom/dwrite_font_proxy/dwrite_font_proxy.mojom-blink.h" -@@ -26,7 +26,7 @@ std::unique_ptr<FontUniqueNameLookup> + #include "third_party/blink/renderer/platform/fonts/win/font_unique_name_lookup_win.h" +@@ -23,7 +23,7 @@ std::unique_ptr<FontUniqueNameLookup> FontUniqueNameLookup::GetPlatformUniqueNameLookup() { #if defined(OS_ANDROID) return std::make_unique<FontUniqueNameLookupAndroid>(); diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc index 60496185f038..01d7699e4ddb 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc @@ -1,24 +1,24 @@ ---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2019-03-11 22:01:04 UTC +--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2019-09-09 21:55:26 UTC +++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc -@@ -60,7 +60,7 @@ AtomicString ToAtomicString(const SkString& str) { +@@ -59,7 +59,7 @@ AtomicString ToAtomicString(const SkString& str) { return AtomicString::FromUTF8(str.c_str(), str.size()); } --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) - // Android special locale for retrieving the color emoji font - // based on the proposed changes in UTR #51 for introducing - // an Emoji script code: -@@ -104,7 +104,7 @@ AtomicString FontCache::GetFamilyNameForCharacter( +-#if defined(OS_ANDROID) || defined(OS_LINUX) ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) + // This function is called on android or when we are emulating android fonts on + // linux and the embedder has overriden the default fontManager with + // WebFontRendering::setSkiaFontMgr. +@@ -82,7 +82,7 @@ AtomicString FontCache::GetFamilyNameForCharacter( typeface->getFamilyName(&skia_family_name); return ToAtomicString(skia_family_name); } --#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) -+#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#endif // defined(OS_ANDROID) || defined(OS_LINUX) ++#endif // defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) void FontCache::PlatformInit() {} -@@ -249,7 +249,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( +@@ -227,7 +227,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface( } #endif @@ -27,12 +27,12 @@ // On linux if the fontManager has been overridden then we should be calling // the embedder provided font Manager rather than calling // SkTypeface::CreateFromName which may redirect the call to the default font -@@ -276,7 +276,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon - CString name; +@@ -254,7 +254,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon + std::string name; sk_sp<SkTypeface> typeface; -#if defined(OS_ANDROID) || defined(OS_LINUX) +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD) if (alternate_name == AlternateFontName::kLocalUniqueFace && RuntimeEnabledFeatures::FontSrcLocalMatchingEnabled()) { - typeface = CreateTypefaceFromUniqueName(creation_params, name); + typeface = CreateTypefaceFromUniqueName(creation_params); diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc deleted file mode 100644 index 8b4b98e988c9..000000000000 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_heap_stack__frame__depth.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- third_party/blink/renderer/platform/heap/stack_frame_depth.cc.orig 2019-03-11 22:01:04 UTC -+++ third_party/blink/renderer/platform/heap/stack_frame_depth.cc -@@ -15,6 +15,11 @@ - extern "C" void* __libc_stack_end; // NOLINT - #endif - -+#if defined(OS_FREEBSD) -+#include <sys/signal.h> -+#include <pthread_np.h> -+#endif -+ - namespace blink { - - static const char* g_avoid_optimization = nullptr; diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn deleted file mode 100644 index 68d27a0630f4..000000000000 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_BUILD.gn +++ /dev/null @@ -1,16 +0,0 @@ ---- third_party/blink/renderer/platform/wtf/BUILD.gn.orig 2019-03-11 22:01:04 UTC -+++ third_party/blink/renderer/platform/wtf/BUILD.gn -@@ -267,8 +267,12 @@ jumbo_component("wtf") { - if (is_android) { - libs = [ "log" ] - } -- if (is_linux) { -+ if (is_linux && !is_bsd) { - libs = [ "dl" ] -+ } -+ -+ if (is_bsd) { -+ libs = [ "execinfo" ] - } - - if (is_mac) { diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc deleted file mode 100644 index 71b0442cb527..000000000000 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_assertions.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/blink/renderer/platform/wtf/assertions.cc.orig 2019-03-11 22:01:04 UTC -+++ third_party/blink/renderer/platform/wtf/assertions.cc -@@ -48,7 +48,7 @@ - #include <windows.h> - #endif - --#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(__UCLIBC__)) -+#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(__UCLIBC__)) - #include <cxxabi.h> - #include <dlfcn.h> - #include <execinfo.h> diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h index 0cee47e68086..27b83fe51ce9 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_container__annotations.h @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2019-03-11 22:01:04 UTC +--- third_party/blink/renderer/platform/wtf/container_annotations.h.orig 2019-06-04 18:55:30 UTC +++ third_party/blink/renderer/platform/wtf/container_annotations.h @@ -10,7 +10,7 @@ @@ -9,3 +9,19 @@ #define ANNOTATE_CONTIGUOUS_CONTAINER #define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize) \ if (buffer) { \ +@@ -35,13 +35,13 @@ + ANNOTATE_NEW_BUFFER(buffer, newCapacity, bufferSize); + // Annotations require buffers to begin on an 8-byte boundary. + +-#else // ADDRESS_SANITIZER && OS_LINUX && ARCH_CPU_X86_64 ++#else // ADDRESS_SANITIZER && (OS_LINUX || OS_BSD) && ARCH_CPU_X86_64 + + #define ANNOTATE_NEW_BUFFER(buffer, capacity, newSize) + #define ANNOTATE_DELETE_BUFFER(buffer, capacity, oldSize) + #define ANNOTATE_CHANGE_SIZE(buffer, capacity, oldSize, newSize) + #define ANNOTATE_CHANGE_CAPACITY(buffer, oldCapacity, bufferSize, newCapacity) + +-#endif // ADDRESS_SANITIZER && OS_LINUX && ARCH_CPU_X86_64 ++#endif // ADDRESS_SANITIZER && (OS_LINUX || OS_BSD) && ARCH_CPU_X86_64 + + #endif // THIRD_PARTY_BLINK_RENDERER_PLATFORM_WTF_CONTAINER_ANNOTATIONS_H_ diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc index a4f0a8b59577..24a812ce5223 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_stack__util.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2019-03-11 22:01:04 UTC +--- third_party/blink/renderer/platform/wtf/stack_util.cc.orig 2019-06-04 18:55:30 UTC +++ third_party/blink/renderer/platform/wtf/stack_util.cc -@@ -18,6 +18,11 @@ +@@ -17,6 +17,11 @@ extern "C" void* __libc_stack_end; // NOLINT #endif diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc deleted file mode 100644 index 7d8de2b7ae80..000000000000 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_threading.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- third_party/blink/renderer/platform/wtf/threading.cc.orig 2019-03-11 22:01:04 UTC -+++ third_party/blink/renderer/platform/wtf/threading.cc -@@ -17,12 +17,16 @@ - #error Blink does not support threading on your platform. - #endif - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include <sys/syscall.h> - #elif defined(OS_ANDROID) - #include <sys/types.h> - #endif - -+#if defined(OS_BSD) -+#include <pthread_np.h> -+#endif -+ - namespace WTF { - - // Current thread identity -@@ -38,6 +42,8 @@ ThreadIdentifier CurrentThreadSyscall() { - return syscall(__NR_gettid); - #elif defined(OS_ANDROID) - return gettid(); -+#elif defined(OS_BSD) -+ return pthread_getthreadid_np(); - #else - return reinterpret_cast<uintptr_t>(pthread_self()); - #endif diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc index 0c52ba787f29..1ab0c14a5a4e 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_threading__pthreads.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/wtf/threading_pthreads.cc.orig 2019-03-11 22:01:04 UTC +--- third_party/blink/renderer/platform/wtf/threading_pthreads.cc.orig 2019-12-16 21:50:53 UTC +++ third_party/blink/renderer/platform/wtf/threading_pthreads.cc -@@ -52,12 +52,17 @@ +@@ -50,12 +50,17 @@ #include <objc/objc-auto.h> #endif diff --git a/www/iridium/files/patch-third__party_boringssl_BUILD.gn b/www/iridium/files/patch-third__party_boringssl_BUILD.gn index 2e56f692737c..8a3c15eac37d 100644 --- a/www/iridium/files/patch-third__party_boringssl_BUILD.gn +++ b/www/iridium/files/patch-third__party_boringssl_BUILD.gn @@ -1,4 +1,4 @@ ---- third_party/boringssl/BUILD.gn.orig 2019-03-11 22:01:15 UTC +--- third_party/boringssl/BUILD.gn.orig 2019-12-16 21:51:04 UTC +++ third_party/boringssl/BUILD.gn @@ -71,7 +71,7 @@ if (is_win && !is_msan && current_cpu != "arm64") { } else if (current_cpu == "x64") { diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c b/www/iridium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c new file mode 100644 index 000000000000..5856c89852d1 --- /dev/null +++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_cpu-aarch64-linux.c @@ -0,0 +1,73 @@ +--- third_party/boringssl/src/crypto/cpu-aarch64-linux.c.orig 2020-03-03 18:55:22 UTC ++++ third_party/boringssl/src/crypto/cpu-aarch64-linux.c +@@ -14,49 +14,45 @@ + + #include <openssl/cpu.h> + +-#if defined(OPENSSL_AARCH64) && defined(OPENSSL_LINUX) && \ +- !defined(OPENSSL_STATIC_ARMCAP) ++#if defined(OPENSSL_AARCH64) + +-#include <sys/auxv.h> +- + #include <openssl/arm_arch.h> + + #include "internal.h" + +- + extern uint32_t OPENSSL_armcap_P; + +-void OPENSSL_cpuid_setup(void) { +- unsigned long hwcap = getauxval(AT_HWCAP); ++#include <sys/types.h> ++#include <machine/armreg.h> + +- // See /usr/include/asm/hwcap.h on an aarch64 installation for the source of +- // these values. +- static const unsigned long kNEON = 1 << 1; +- static const unsigned long kAES = 1 << 3; +- static const unsigned long kPMULL = 1 << 4; +- static const unsigned long kSHA1 = 1 << 5; +- static const unsigned long kSHA256 = 1 << 6; ++#ifndef ID_AA64ISAR0_AES_VAL ++#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES ++#endif ++#ifndef ID_AA64ISAR0_SHA1_VAL ++#define ID_AA64ISAR0_SHA1_VAL ID_AA64ISAR0_SHA1 ++#endif ++#ifndef ID_AA64ISAR0_SHA2_VAL ++#define ID_AA64ISAR0_SHA2_VAL ID_AA64ISAR0_SHA2 ++#endif + +- if ((hwcap & kNEON) == 0) { +- // Matching OpenSSL, if NEON is missing, don't report other features +- // either. +- return; +- } ++void OPENSSL_cpuid_setup(void) { ++ uint64_t id_aa64isar0; + ++ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); ++ + OPENSSL_armcap_P |= ARMV7_NEON; + +- if (hwcap & kAES) { ++ if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) >= ID_AA64ISAR0_AES_BASE) { + OPENSSL_armcap_P |= ARMV8_AES; + } +- if (hwcap & kPMULL) { ++ if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) { + OPENSSL_armcap_P |= ARMV8_PMULL; + } +- if (hwcap & kSHA1) { ++ if (ID_AA64ISAR0_SHA1_VAL(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE) { + OPENSSL_armcap_P |= ARMV8_SHA1; + } +- if (hwcap & kSHA256) { ++ if(ID_AA64ISAR0_SHA2_VAL(id_aa64isar0) >= ID_AA64ISAR0_SHA2_BASE) { + OPENSSL_armcap_P |= ARMV8_SHA256; + } + } +- +-#endif // OPENSSL_AARCH64 && !OPENSSL_STATIC_ARMCAP ++#endif // OPENSSL_AARCH64 diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni b/www/iridium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni index 0ba7612e9112..97991dfed588 100644 --- a/www/iridium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni +++ b/www/iridium/files/patch-third__party_crashpad_crashpad_build_crashpad__buildconfig.gni @@ -1,8 +1,8 @@ ---- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2019-03-11 22:01:15 UTC +--- third_party/crashpad/crashpad/build/crashpad_buildconfig.gni.orig 2020-02-03 21:53:08 UTC +++ third_party/crashpad/crashpad/build/crashpad_buildconfig.gni -@@ -38,7 +38,7 @@ crashpad_is_standalone = crashpad_dependencies == "sta - if (crashpad_is_in_chromium) { +@@ -38,7 +38,7 @@ if (crashpad_is_in_chromium) { crashpad_is_mac = is_mac + crashpad_is_ios = is_ios crashpad_is_win = is_win - crashpad_is_linux = is_linux + crashpad_is_linux = is_linux && !is_bsd diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc b/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc index 9c0f7a749462..911ec6d61ccd 100644 --- a/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc +++ b/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc @@ -1,4 +1,4 @@ ---- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2019-03-11 22:01:15 UTC +--- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2019-12-16 21:51:05 UTC +++ third_party/crashpad/crashpad/util/posix/signals.cc @@ -45,10 +45,10 @@ constexpr int kCrashSignals[] = { #if defined(SIGEMT) @@ -25,7 +25,7 @@ }; bool InstallHandlers(const std::vector<int>& signals, -@@ -216,8 +216,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi +@@ -224,8 +224,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi // remains. See 10.12.3 xnu-3789.41.3/bsd/kern/kern_sig.c // psignal_internal(). (code > 0 && diff --git a/www/iridium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h b/www/iridium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h index 907f1b0f986c..0dd0f21d8d58 100644 --- a/www/iridium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h +++ b/www/iridium/files/patch-third__party_crc32c_src_src_crc32c__arm64__linux__check.h @@ -1,19 +1,57 @@ ---- third_party/crc32c/src/src/crc32c_arm64_linux_check.h.orig 2019-03-11 22:07:59 UTC +--- third_party/crc32c/src/src/crc32c_arm64_linux_check.h.orig 2020-03-03 18:55:23 UTC +++ third_party/crc32c/src/src/crc32c_arm64_linux_check.h -@@ -29,6 +29,8 @@ extern "C" unsigned long getauxval(unsigned long type) - namespace crc32c { +@@ -7,8 +7,6 @@ + #ifndef CRC32C_CRC32C_ARM_LINUX_CHECK_H_ + #define CRC32C_CRC32C_ARM_LINUX_CHECK_H_ + +-// X86-specific code checking for the availability of SSE4.2 instructions. +- + #include <cstddef> + #include <cstdint> + +@@ -16,30 +14,25 @@ + + #if HAVE_ARM64_CRC32C + +-#if HAVE_STRONG_GETAUXVAL +-#include <sys/auxv.h> +-#elif HAVE_WEAK_GETAUXVAL +-// getauxval() is not available on Android until API level 20. Link it as a weak +-// symbol. +-extern "C" unsigned long getauxval(unsigned long type) __attribute__((weak)); ++#include <sys/types.h> ++#include <machine/armreg.h> - inline bool CanUseArm64Linux() { -+return false; -+#if 0 - #if HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL - // From 'arch/arm64/include/uapi/asm/hwcap.h' in Linux kernel source code. - constexpr unsigned long kHWCAP_PMULL = 1 << 4; -@@ -39,6 +41,7 @@ inline bool CanUseArm64Linux() { - #else - return false; - #endif // HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL +-#define AT_HWCAP 16 +-#endif // HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL ++#ifndef ID_AA64ISAR0_AES_VAL ++#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES +#endif - } ++#ifndef ID_AA64ISAR0_CRC32_VAL ++#define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32 ++#endif + + namespace crc32c { + +-inline bool CanUseArm64Linux() { +-#if HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL +- // From 'arch/arm64/include/uapi/asm/hwcap.h' in Linux kernel source code. +- constexpr unsigned long kHWCAP_PMULL = 1 << 4; +- constexpr unsigned long kHWCAP_CRC32 = 1 << 7; +- unsigned long hwcap = (&getauxval != nullptr) ? getauxval(AT_HWCAP) : 0; +- return (hwcap & (kHWCAP_PMULL | kHWCAP_CRC32)) == +- (kHWCAP_PMULL | kHWCAP_CRC32); +-#else +- return false; +-#endif // HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL +-} ++ inline bool CanUseArm64Linux() { ++ uint64_t id_aa64isar0; ++ ++ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); ++ return ((ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) && ++ (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE)); ++ } } // namespace crc32c + diff --git a/www/iridium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h b/www/iridium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h deleted file mode 100644 index 305296610dba..000000000000 --- a/www/iridium/files/patch-third__party_googletest_src_googletest_include_gtest_internal_gtest-port.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h.orig 2019-03-11 22:08:00 UTC -+++ third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h -@@ -623,7 +623,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SE - (GTEST_OS_WINDOWS || GTEST_OS_CYGWIN || GTEST_OS_AIX || GTEST_OS_OS2) - - // Determines whether test results can be streamed to a socket. --#if GTEST_OS_LINUX -+#if GTEST_OS_LINUX || GTEST_OS_FREEBSD - # define GTEST_CAN_STREAM_RESULTS_ 1 - #endif - diff --git a/www/iridium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc b/www/iridium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc index b3f414506f9d..ba45bf4dc184 100644 --- a/www/iridium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc +++ b/www/iridium/files/patch-third__party_googletest_src_googletest_src_gtest-port.cc @@ -1,8 +1,8 @@ ---- third_party/googletest/src/googletest/src/gtest-port.cc.orig 2019-03-11 22:08:00 UTC +--- third_party/googletest/src/googletest/src/gtest-port.cc.orig 2020-03-16 18:42:08 UTC +++ third_party/googletest/src/googletest/src/gtest-port.cc -@@ -55,6 +55,11 @@ - # include <mach/vm_map.h> - #endif // GTEST_OS_MAC +@@ -64,6 +64,11 @@ + # endif + #endif +#if GTEST_OS_FREEBSD +#include <sys/sysctl.h> @@ -12,7 +12,7 @@ #if GTEST_OS_QNX # include <devctl.h> # include <fcntl.h> -@@ -129,6 +134,28 @@ size_t GetThreadCount() { +@@ -138,6 +143,28 @@ size_t GetThreadCount() { } else { return 0; } @@ -40,4 +40,4 @@ + return KP_NLWP(info); } - #elif GTEST_OS_QNX + #elif GTEST_OS_DRAGONFLY || GTEST_OS_FREEBSD || GTEST_OS_GNU_KFREEBSD || \ diff --git a/www/iridium/files/patch-third__party_googletest_src_googletest_src_gtest.cc b/www/iridium/files/patch-third__party_googletest_src_googletest_src_gtest.cc index baa7c326c7b9..e56b6079f8f5 100644 --- a/www/iridium/files/patch-third__party_googletest_src_googletest_src_gtest.cc +++ b/www/iridium/files/patch-third__party_googletest_src_googletest_src_gtest.cc @@ -1,6 +1,6 @@ ---- third_party/googletest/src/googletest/src/gtest.cc.orig 2019-03-11 22:08:00 UTC +--- third_party/googletest/src/googletest/src/gtest.cc.orig 2020-03-16 18:42:08 UTC +++ third_party/googletest/src/googletest/src/gtest.cc -@@ -114,6 +114,7 @@ +@@ -118,6 +118,7 @@ #if GTEST_CAN_STREAM_RESULTS_ # include <arpa/inet.h> // NOLINT diff --git a/www/iridium/files/patch-third__party_googletest_src_googletest_test_googletest-port-test.cc b/www/iridium/files/patch-third__party_googletest_src_googletest_test_googletest-port-test.cc deleted file mode 100644 index 305637d04a46..000000000000 --- a/www/iridium/files/patch-third__party_googletest_src_googletest_test_googletest-port-test.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/googletest/src/googletest/test/googletest-port-test.cc.orig 2019-03-11 22:08:00 UTC -+++ third_party/googletest/src/googletest/test/googletest-port-test.cc -@@ -286,7 +286,7 @@ TEST(FormatCompilerIndependentFileLocationTest, Format - EXPECT_EQ("unknown file", FormatCompilerIndependentFileLocation(nullptr, -1)); - } - --#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA -+#if GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_QNX || GTEST_OS_FUCHSIA || GTEST_OS_FREEBSD - void* ThreadFunc(void* data) { - internal::Mutex* mutex = static_cast<internal::Mutex*>(data); - mutex->Lock(); diff --git a/www/iridium/files/patch-third__party_harfbuzz-ng_harfbuzz.gni b/www/iridium/files/patch-third__party_harfbuzz-ng_harfbuzz.gni new file mode 100644 index 000000000000..eb8e42c94bca --- /dev/null +++ b/www/iridium/files/patch-third__party_harfbuzz-ng_harfbuzz.gni @@ -0,0 +1,20 @@ +--- third_party/harfbuzz-ng/harfbuzz.gni.orig 2019-05-04 09:19:19 UTC ++++ third_party/harfbuzz-ng/harfbuzz.gni +@@ -3,10 +3,11 @@ + # found in the LICENSE file. + + declare_args() { +- # Blink uses a cutting-edge version of Harfbuzz; most Linux distros do not +- # contain a new enough version of the code to work correctly. However, +- # ChromeOS chroots (i.e, real ChromeOS builds for devices) do contain a +- # new enough version of the library, and so this variable exists so that +- # ChromeOS can build against the system lib and keep binary sizes smaller. +- use_system_harfbuzz = false ++ # Blink uses a cutting-edge version of Harfbuzz (version listed in ++ # third_party/harfbuzz-ng/README.chromium); most Linux distros do not contain ++ # a new enough version of the code to work correctly. However, ChromeOS ++ # chroots (i.e. real ChromeOS builds for devices) do contain a new enough ++ # version of the library, and so this variable exists so that ChromeOS can ++ # build against the system lib and keep binary sizes smaller. ++ use_system_harfbuzz = true + } diff --git a/www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc index 53a211aa8162..74a2d6efc9a1 100644 --- a/www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc +++ b/www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc @@ -1,6 +1,6 @@ ---- third_party/leveldatabase/env_chromium.cc.orig 2019-03-11 22:01:15 UTC +--- third_party/leveldatabase/env_chromium.cc.orig 2020-03-16 18:40:42 UTC +++ third_party/leveldatabase/env_chromium.cc -@@ -39,7 +39,11 @@ +@@ -40,7 +40,11 @@ #include "third_party/leveldatabase/leveldb_chrome.h" #include "third_party/leveldatabase/leveldb_features.h" #include "third_party/leveldatabase/src/include/leveldb/options.h" diff --git a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h index 243f211e49fb..b09577e3c1d7 100644 --- a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h +++ b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h @@ -1,11 +1,11 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2019-03-11 22:08:01 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2019-10-21 19:09:13 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h -@@ -37,7 +37,7 @@ typedef boost::mutex::scoped_lock AutoLock; +@@ -63,7 +63,7 @@ class Lock { (private) // Dummy lock implementation on non-POSIX platforms. If you are running on a // different platform and care about thread-safety, please compile with // -DI18N_PHONENUMBERS_USE_BOOST. --#if !defined(__linux__) && !defined(__APPLE__) -+#if !defined(__linux__) && !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) +-#elif !defined(__linux__) && !defined(__APPLE__) ++#elif !defined(__linux__) && !defined(__APPLE__) && !defined(__FreeBSD__) namespace i18n { namespace phonenumbers { diff --git a/www/iridium/files/patch-third__party_libpng_pnglibconf.h b/www/iridium/files/patch-third__party_libpng_pnglibconf.h new file mode 100644 index 000000000000..81996a0cfa58 --- /dev/null +++ b/www/iridium/files/patch-third__party_libpng_pnglibconf.h @@ -0,0 +1,14 @@ +--- third_party/libpng/pnglibconf.h.orig 2020-03-03 18:53:28 UTC ++++ third_party/libpng/pnglibconf.h +@@ -230,8 +230,11 @@ + * This is necessary to build multiple copies of libpng. We need this while pdfium builds + * its own copy of libpng. + */ ++/* Need to disable prefixing to unbundle chromium's libpng. */ ++#if 0 + #define PNG_PREFIX + #include "pngprefix.h" ++#endif + /* end of chromium prefixing */ + + #endif /* PNGLCONF_H */ diff --git a/www/iridium/files/patch-third__party_nasm_config_config-linux.h b/www/iridium/files/patch-third__party_nasm_config_config-linux.h new file mode 100644 index 000000000000..6846af2fe7c7 --- /dev/null +++ b/www/iridium/files/patch-third__party_nasm_config_config-linux.h @@ -0,0 +1,29 @@ +--- third_party/nasm/config/config-linux.h.orig 2019-04-30 22:25:54 UTC ++++ third_party/nasm/config/config-linux.h +@@ -117,7 +117,7 @@ + #define HAVE_ACCESS 1 + + /* Define to 1 if you have the `canonicalize_file_name' function. */ +-#define HAVE_CANONICALIZE_FILE_NAME 1 ++/* #undef HAVE_CANONICALIZE_FILE_NAME */ + + /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */ + /* #undef HAVE_CPU_TO_LE16 */ +@@ -161,7 +161,7 @@ + #define HAVE_DECL_STRSEP 1 + + /* Define to 1 if you have the <endian.h> header file. */ +-#define HAVE_ENDIAN_H 1 ++/* #undef HAVE_ENDIAN_H */ + + /* Define to 1 if you have the `faccessat' function. */ + #define HAVE_FACCESSAT 1 +@@ -322,7 +322,7 @@ + #define HAVE_SYSCONF 1 + + /* Define to 1 if you have the <sys/endian.h> header file. */ +-/* #undef HAVE_SYS_ENDIAN_H */ ++#define HAVE_SYS_ENDIAN_H 1 + + /* Define to 1 if you have the <sys/mman.h> header file. */ + #define HAVE_SYS_MMAN_H 1 diff --git a/www/iridium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp b/www/iridium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp new file mode 100644 index 000000000000..0e9aa30717ed --- /dev/null +++ b/www/iridium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp @@ -0,0 +1,11 @@ +--- third_party/pdfium/core/fxcrt/cfx_datetime.cpp.orig 2019-07-29 13:55:20 UTC ++++ third_party/pdfium/core/fxcrt/cfx_datetime.cpp +@@ -9,7 +9,7 @@ + #include "build/build_config.h" + #include "core/fxcrt/fx_system.h" + +-#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \ ++#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || \ + defined(OS_ASMJS) || defined(__wasm__) + #include <sys/time.h> + #include <time.h> diff --git a/www/iridium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h b/www/iridium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h index 291cd06be445..05d6c3e28de0 100644 --- a/www/iridium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h +++ b/www/iridium/files/patch-third__party_pdfium_core_fxcrt_fx__system.h @@ -1,11 +1,11 @@ ---- third_party/pdfium/core/fxcrt/fx_system.h.orig 2019-03-11 22:08:02 UTC +--- third_party/pdfium/core/fxcrt/fx_system.h.orig 2019-07-24 19:03:29 UTC +++ third_party/pdfium/core/fxcrt/fx_system.h -@@ -41,7 +41,7 @@ +@@ -26,7 +26,7 @@ + #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_ #elif defined(_WIN64) - #define _FX_OS_ _FX_OS_WIN64_ #define _FX_PLATFORM_ _FX_PLATFORM_WINDOWS_ -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) - #define _FX_OS_ _FX_OS_LINUX_ #define _FX_PLATFORM_ _FX_PLATFORM_LINUX_ #elif defined(__APPLE__) + #define _FX_PLATFORM_ _FX_PLATFORM_APPLE_ diff --git a/www/iridium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp b/www/iridium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp index 0557f9bf57a8..272bf7a50bf9 100644 --- a/www/iridium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp +++ b/www/iridium/files/patch-third__party_pdfium_core_fxge_fx__ge__linux.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2019-03-11 22:08:02 UTC +--- third_party/pdfium/core/fxge/fx_ge_linux.cpp.orig 2020-03-16 18:42:12 UTC +++ third_party/pdfium/core/fxge/fx_ge_linux.cpp -@@ -146,9 +146,8 @@ std::unique_ptr<SystemFontInfoIface> SystemFontInfoIfa +@@ -155,9 +155,8 @@ std::unique_ptr<SystemFontInfoIface> SystemFontInfoIfa const char** pUserPaths) { auto pInfo = pdfium::MakeUnique<CFX_LinuxFontInfo>(); if (!pInfo->ParseFontCfg(pUserPaths)) { diff --git a/www/iridium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp b/www/iridium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp index f689d845e408..292afa1968d0 100644 --- a/www/iridium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp +++ b/www/iridium/files/patch-third__party_pdfium_fxjs_cjs__publicmethods.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/fxjs/cjs_publicmethods.cpp.orig 2019-03-11 22:08:02 UTC +--- third_party/pdfium/fxjs/cjs_publicmethods.cpp.orig 2019-06-04 18:58:01 UTC +++ third_party/pdfium/fxjs/cjs_publicmethods.cpp -@@ -85,6 +85,103 @@ constexpr const wchar_t* kDateFormats[] = {L"m/d", +@@ -86,6 +86,103 @@ constexpr const wchar_t* kDateFormats[] = {L"m/d", constexpr const wchar_t* kTimeFormats[] = {L"HH:MM", L"h:MM tt", L"HH:MM:ss", L"h:MM:ss tt"}; diff --git a/www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp b/www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp index ba05a132a557..425ec0a4bc9a 100644 --- a/www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp +++ b/www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2019-03-11 22:08:02 UTC +--- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2019-07-24 19:03:29 UTC +++ third_party/pdfium/fxjs/fx_date_helpers.cpp -@@ -34,6 +34,11 @@ double GetLocalTZA() { +@@ -35,6 +35,11 @@ double GetLocalTZA() { return 0; time_t t = 0; FXSYS_time(&t); @@ -10,11 +10,11 @@ + return (double)(-(lt.tm_gmtoff * 1000)); +#else FXSYS_localtime(&t); - #if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ + #if defined(OS_WIN) // In gcc 'timezone' is a global variable declared in time.h. In VC++, that -@@ -42,6 +47,7 @@ double GetLocalTZA() { +@@ -43,6 +48,7 @@ double GetLocalTZA() { _get_timezone(&timezone); - #endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ + #endif return (double)(-(timezone * 1000)); +#endif // __FreeBSD__ } diff --git a/www/iridium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp b/www/iridium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp index d7643b27e4c2..af4bafcfee40 100644 --- a/www/iridium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp +++ b/www/iridium/files/patch-third__party_pdfium_xfa_fgas_font_cfx__fontsourceenum__file.cpp @@ -1,14 +1,14 @@ ---- third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig 2019-03-11 22:08:03 UTC +--- third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp.orig 2019-07-24 19:03:30 UTC +++ third_party/pdfium/xfa/fgas/font/cfx_fontsourceenum_file.cpp -@@ -14,8 +14,9 @@ constexpr char kFolderSeparator = '/'; +@@ -16,9 +16,8 @@ constexpr char kFolderSeparator = '/'; - constexpr const char* g_FontFolders[] = { + constexpr const char* kFontFolders[] = { #if _FX_PLATFORM_ == _FX_PLATFORM_LINUX_ -- "/usr/share/fonts", "/usr/share/X11/fonts/Type1", -- "/usr/share/X11/fonts/TTF", "/usr/local/share/fonts", +- "/usr/share/fonts", +- "/usr/share/X11/fonts/Type1", +- "/usr/share/X11/fonts/TTF", + "/usr/local/share/fonts/Type1", + "/usr/local/share/fonts/TTF", -+ "/usr/local/share/fonts", - #elif _FX_PLATFORM_ == _FX_PLATFORM_APPLE_ - "~/Library/Fonts", "/Library/Fonts", "/System/Library/Fonts", - #elif _FX_PLATFORM_ == _FX_PLATFORM_ANDROID_ + "/usr/local/share/fonts", + #elif defined(OS_MACOSX) + "~/Library/Fonts", diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h index 6473fc184af1..02a9c66ed8e5 100644 --- a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h +++ b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_build__config.h @@ -1,4 +1,4 @@ ---- third_party/perfetto/include/perfetto/base/build_config.h.orig 2019-03-11 22:08:02 UTC +--- third_party/perfetto/include/perfetto/base/build_config.h.orig 2020-03-16 18:42:11 UTC +++ third_party/perfetto/include/perfetto/base/build_config.h @@ -28,6 +28,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 1 @@ -8,7 +8,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -35,13 +36,15 @@ +@@ -37,6 +38,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 @@ -16,16 +16,27 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 --#elif defined(__linux__) -+#elif defined(__linux__) || defined(__FreeBSD__) +@@ -50,15 +52,27 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1 -+#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 1 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -49,6 +52,7 @@ + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_NACL() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0 ++#elif defined(__FreeBSD__) ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 1 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 1 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_NACL() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_IOS() 0 + #elif defined(_WIN32) #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 @@ -33,7 +44,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -56,6 +60,7 @@ +@@ -68,6 +82,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 @@ -41,7 +52,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 1 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 -@@ -63,6 +68,7 @@ +@@ -77,6 +92,7 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 @@ -49,3 +60,11 @@ #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 1 +@@ -86,6 +102,7 @@ + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_ANDROID() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_MACOSX() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_LINUX() 0 ++#define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FREEBSD() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WIN() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_WASM() 0 + #define PERFETTO_BUILDFLAG_DEFINE_PERFETTO_OS_FUCHSIA() 0 diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_event.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_event.h deleted file mode 100644 index bfbfb1266556..000000000000 --- a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_event.h +++ /dev/null @@ -1,14 +0,0 @@ ---- third_party/perfetto/include/perfetto/base/event.h.orig 2019-03-11 22:08:02 UTC -+++ third_party/perfetto/include/perfetto/base/event.h -@@ -20,8 +20,9 @@ - #include "perfetto/base/build_config.h" - #include "perfetto/base/scoped_file.h" - --#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) -+#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -+ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) && \ -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) - #define PERFETTO_USE_EVENTFD() 1 - #else - #define PERFETTO_USE_EVENTFD() 0 diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h new file mode 100644 index 000000000000..c8947d13ecbf --- /dev/null +++ b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_thread__utils.h @@ -0,0 +1,24 @@ +--- third_party/perfetto/include/perfetto/base/thread_utils.h.orig 2020-03-16 18:42:11 UTC ++++ third_party/perfetto/include/perfetto/base/thread_utils.h +@@ -33,6 +33,9 @@ + #include <sys/types.h> + #include <unistd.h> + #endif ++#if PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) ++#include <pthread_np.h> ++#endif + + namespace perfetto { + namespace base { +@@ -41,6 +44,11 @@ namespace base { + using PlatformThreadId = pid_t; + inline PlatformThreadId GetThreadId() { + return gettid(); ++} ++#elif PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) ++using PlatformThreadId = pid_t; ++inline PlatformThreadId GetThreadId() { ++ return pthread_getthreadid_np(); + } + #elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) + using PlatformThreadId = pid_t; diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h index 670eef6f090e..7750793e8235 100644 --- a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h +++ b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_time.h @@ -1,6 +1,6 @@ ---- third_party/perfetto/include/perfetto/base/time.h.orig 2019-03-11 22:08:02 UTC +--- third_party/perfetto/include/perfetto/base/time.h.orig 2020-03-16 18:42:11 UTC +++ third_party/perfetto/include/perfetto/base/time.h -@@ -123,6 +123,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { +@@ -141,6 +141,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time // during suspend (when supported). inline TimeNanos GetBootTimeNs() { @@ -10,7 +10,7 @@ // Determine if CLOCK_BOOTTIME is available on the first call. static const clockid_t kBootTimeClockSource = [] { struct timespec ts = {}; -@@ -130,6 +133,7 @@ inline TimeNanos GetBootTimeNs() { +@@ -148,6 +151,7 @@ inline TimeNanos GetBootTimeNs() { return res == 0 ? CLOCK_BOOTTIME : kWallTimeClockSource; }(); return GetTimeInternalNs(kBootTimeClockSource); diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_watchdog__posix.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_watchdog__posix.h deleted file mode 100644 index e088531d87c3..000000000000 --- a/www/iridium/files/patch-third__party_perfetto_include_perfetto_base_watchdog__posix.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/perfetto/include/perfetto/base/watchdog_posix.h.orig 2019-03-11 22:08:02 UTC -+++ third_party/perfetto/include/perfetto/base/watchdog_posix.h -@@ -46,7 +46,7 @@ class Watchdog { - Timer(const Timer&) = delete; - Timer& operator=(const Timer&) = delete; - -- timer_t timerid_ = nullptr; -+ timer_t timerid_ = 0; - }; - virtual ~Watchdog(); - diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h new file mode 100644 index 000000000000..e49d012bec39 --- /dev/null +++ b/www/iridium/files/patch-third__party_perfetto_include_perfetto_ext_base_event__fd.h @@ -0,0 +1,13 @@ +--- third_party/perfetto/include/perfetto/ext/base/event_fd.h.orig 2019-09-16 11:03:16 UTC ++++ third_party/perfetto/include/perfetto/ext/base/event_fd.h +@@ -20,8 +20,8 @@ + #include "perfetto/base/build_config.h" + #include "perfetto/ext/base/scoped_file.h" + +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ +- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) ++#if !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) && (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ ++ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)) + #define PERFETTO_USE_EVENTFD() 1 + #else + #define PERFETTO_USE_EVENTFD() 0 diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc b/www/iridium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc new file mode 100644 index 000000000000..1196437c938c --- /dev/null +++ b/www/iridium/files/patch-third__party_perfetto_src_base_thread__task__runner.cc @@ -0,0 +1,20 @@ +--- third_party/perfetto/src/base/thread_task_runner.cc.orig 2020-03-19 11:48:14 UTC ++++ third_party/perfetto/src/base/thread_task_runner.cc +@@ -27,7 +27,7 @@ + #include "perfetto/base/logging.h" + #include "perfetto/ext/base/unix_task_runner.h" + +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) + #include <sys/prctl.h> + #endif +@@ -84,6 +84,8 @@ void ThreadTaskRunner::RunTaskThread( + if (!name_.empty()) { + #if PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) + pthread_setname_np(name_.c_str()); ++#elif PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) ++ pthread_set_name_np(pthread_self(), name_.c_str()); + #elif PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) + prctl(PR_SET_NAME, name_.c_str()); diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc b/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc index a4c74f8695d0..f14075502887 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc @@ -1,12 +1,20 @@ ---- third_party/perfetto/src/base/unix_socket.cc.orig 2019-03-11 22:08:02 UTC +--- third_party/perfetto/src/base/unix_socket.cc.orig 2020-03-16 18:42:11 UTC +++ third_party/perfetto/src/base/unix_socket.cc -@@ -502,7 +502,8 @@ void UnixSocket::DoConnect(const std::string& socket_n +@@ -37,7 +37,7 @@ + #include "perfetto/ext/base/string_utils.h" + #include "perfetto/ext/base/utils.h" - void UnixSocket::ReadPeerCredentials() { - #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ -- PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) -+ PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) || \ -+ PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) ++#if PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) || PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) + #include <sys/ucred.h> + #endif + +@@ -601,7 +601,7 @@ void UnixSocket::ReadPeerCredentials() { + if (sock_raw_.family() != SockFamily::kUnix) + return; + +-#if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ ++#if (PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) && !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD)) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) struct ucred user_cred; socklen_t len = sizeof(user_cred); - int fd = sock_raw_.fd(); diff --git a/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc index 4772343042dc..f778d36188f5 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,22 +1,10 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2019-03-11 22:08:02 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2020-03-16 18:42:12 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -1494,7 +1494,8 @@ TraceBuffer* TracingServiceImpl::GetBufferByID(BufferI - - void TracingServiceImpl::UpdateMemoryGuardrail() { - #if !PERFETTO_BUILDFLAG(PERFETTO_EMBEDDER_BUILD) && \ -- !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \ -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) - uint64_t total_buffer_bytes = 0; - - // Sum up all the shared memory buffers. -@@ -1545,7 +1546,8 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr - protos::ClockSnapshot* clock_snapshot = packet.mutable_clock_snapshot(); +@@ -2306,6 +2306,7 @@ void TracingServiceImpl::SnapshotClocks(std::vector<Tr #if !PERFETTO_BUILDFLAG(PERFETTO_OS_MACOSX) && \ -- !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ -+ !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) + !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ ++ !PERFETTO_BUILDFLAG(PERFETTO_OS_FREEBSD) && \ + !PERFETTO_BUILDFLAG(PERFETTO_OS_NACL) struct { clockid_t id; - protos::ClockSnapshot::Clock::Type type; diff --git a/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h b/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h index 26b4447c272b..2f151107c8c2 100644 --- a/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h +++ b/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h @@ -1,6 +1,6 @@ ---- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2019-03-11 22:01:16 UTC +--- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2019-10-21 19:07:25 UTC +++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h -@@ -117,7 +117,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR +@@ -118,7 +118,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR #undef GOOGLE_PROTOBUF_PLATFORM_ERROR diff --git a/www/iridium/files/patch-third__party_skia_src_core_SkCpu.cpp b/www/iridium/files/patch-third__party_skia_src_core_SkCpu.cpp index d03c8d261459..4d7db67f8556 100644 --- a/www/iridium/files/patch-third__party_skia_src_core_SkCpu.cpp +++ b/www/iridium/files/patch-third__party_skia_src_core_SkCpu.cpp @@ -1,6 +1,6 @@ ---- third_party/skia/src/core/SkCpu.cpp.orig 2019-03-11 22:08:22 UTC +--- third_party/skia/src/core/SkCpu.cpp.orig 2019-07-24 19:03:35 UTC +++ third_party/skia/src/core/SkCpu.cpp -@@ -74,6 +74,8 @@ +@@ -76,6 +76,8 @@ #include <sys/auxv.h> static uint32_t read_cpu_features() { @@ -9,9 +9,9 @@ const uint32_t kHWCAP_CRC32 = (1<< 7), kHWCAP_ASIMDHP = (1<<10); -@@ -82,6 +84,7 @@ - if (hwcaps & kHWCAP_CRC32 ) { features |= SkCpu::CRC32; } - if (hwcaps & kHWCAP_ASIMDHP) { features |= SkCpu::ASIMDHP; } +@@ -112,6 +114,7 @@ + } + } return features; +#endif } diff --git a/www/iridium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp b/www/iridium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp index a40c444b1336..1241cb9d733b 100644 --- a/www/iridium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp +++ b/www/iridium/files/patch-third__party_skia_src_images_SkJpegEncoder.cpp @@ -1,6 +1,6 @@ ---- third_party/skia/src/images/SkJpegEncoder.cpp.orig 2019-03-11 22:08:28 UTC +--- third_party/skia/src/images/SkJpegEncoder.cpp.orig 2019-09-09 21:57:02 UTC +++ third_party/skia/src/images/SkJpegEncoder.cpp -@@ -75,9 +75,14 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr +@@ -76,9 +76,14 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr return (transform_scanline_proc) nullptr; }; @@ -15,7 +15,7 @@ case kRGBA_8888_SkColorType: fProc = chooseProc8888(); jpegColorType = JCS_EXT_RGBA; -@@ -88,6 +93,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr +@@ -89,6 +94,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr jpegColorType = JCS_EXT_BGRA; numComponents = 4; break; @@ -23,7 +23,7 @@ case kRGB_565_SkColorType: fProc = transform_scanline_565; jpegColorType = JCS_RGB; -@@ -107,6 +113,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr +@@ -108,6 +114,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr jpegColorType = JCS_GRAYSCALE; numComponents = 1; break; @@ -31,7 +31,7 @@ case kRGBA_F16_SkColorType: if (kUnpremul_SkAlphaType == srcInfo.alphaType() && options.fAlphaOption == SkJpegEncoder::AlphaOption::kBlendOnBlack) { -@@ -117,6 +124,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr +@@ -118,6 +125,7 @@ bool SkJpegEncoderMgr::setParams(const SkImageInfo& sr jpegColorType = JCS_EXT_RGBA; numComponents = 4; break; diff --git a/www/iridium/files/patch-third__party_skia_src_opts_SkRasterPipeline__opts.h b/www/iridium/files/patch-third__party_skia_src_opts_SkRasterPipeline__opts.h deleted file mode 100644 index ede24774be9e..000000000000 --- a/www/iridium/files/patch-third__party_skia_src_opts_SkRasterPipeline__opts.h +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2019-03-11 22:08:28 UTC -+++ third_party/skia/src/opts/SkRasterPipeline_opts.h -@@ -729,7 +729,7 @@ SI F approx_powf(F x, F y) { - } - - SI F from_half(U16 h) { --#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -+#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. - return vcvt_f32_f16(h); - - #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) -@@ -749,7 +749,7 @@ SI F from_half(U16 h) { - } - - SI U16 to_half(F f) { --#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -+#if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. - return vcvt_f16_f32(f); - - #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) diff --git a/www/iridium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp b/www/iridium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp deleted file mode 100644 index 0d1c0f100471..000000000000 --- a/www/iridium/files/patch-third__party_skia_src_ports_SkFontHost__FreeType.cpp +++ /dev/null @@ -1,77 +0,0 @@ ---- third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-03-11 22:08:28 UTC -+++ third_party/skia/src/ports/SkFontHost_FreeType.cpp -@@ -122,8 +122,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) - : fGetVarDesignCoordinates(nullptr) - , fGetVarAxisFlags(nullptr) - , fLibrary(nullptr) -- , fIsLCDSupported(false) -- , fLCDExtra(0) - { - if (FT_New_Library(&gFTMemory, &fLibrary)) { - return; -@@ -183,12 +181,7 @@ class FreeTypeLibrary : SkNoncopyable { (public) - } - #endif - -- // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs. -- // The default has changed over time, so this doesn't mean the same thing to all users. -- if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) { -- fIsLCDSupported = true; -- fLCDExtra = 2; //Using a filter adds one full pixel to each side. -- } -+ FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT); - } - ~FreeTypeLibrary() { - if (fLibrary) { -@@ -197,8 +190,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) - } - - FT_Library library() { return fLibrary; } -- bool isLCDSupported() { return fIsLCDSupported; } -- int lcdExtra() { return fLCDExtra; } - - // FT_Get_{MM,Var}_{Blend,Design}_Coordinates were added in FreeType 2.7.1. - // Prior to this there was no way to get the coordinates out of the FT_Face. -@@ -215,8 +206,6 @@ class FreeTypeLibrary : SkNoncopyable { (public) - - private: - FT_Library fLibrary; -- bool fIsLCDSupported; -- int fLCDExtra; - - // FT_Library_SetLcdFilterWeights was introduced in FreeType 2.4.0. - // The following platforms provide FreeType of at least 2.4.0. -@@ -713,17 +702,6 @@ void SkTypeface_FreeType::onFilterRec(SkScalerContextR - rec->fTextSize = SkIntToScalar(1 << 14); - } - -- if (isLCD(*rec)) { -- // TODO: re-work so that FreeType is set-up and selected by the SkFontMgr. -- SkAutoMutexAcquire ama(gFTMutex); -- ref_ft_library(); -- if (!gFTLibrary->isLCDSupported()) { -- // If the runtime Freetype library doesn't support LCD, disable it here. -- rec->fMaskFormat = SkMask::kA8_Format; -- } -- unref_ft_library(); -- } -- - SkFontHinting h = rec->getHinting(); - if (kFull_SkFontHinting == h && !isLCD(*rec)) { - // collapse full->normal hinting if we're not doing LCD -@@ -1121,11 +1099,11 @@ bool SkScalerContext_FreeType::getCBoxForLetter(char l - void SkScalerContext_FreeType::updateGlyphIfLCD(SkGlyph* glyph) { - if (glyph->fMaskFormat == SkMask::kLCD16_Format) { - if (fLCDIsVert) { -- glyph->fHeight += gFTLibrary->lcdExtra(); -- glyph->fTop -= gFTLibrary->lcdExtra() >> 1; -+ glyph->fHeight += 2; -+ glyph->fTop -= 1; - } else { -- glyph->fWidth += gFTLibrary->lcdExtra(); -- glyph->fLeft -= gFTLibrary->lcdExtra() >> 1; -+ glyph->fWidth += 2; -+ glyph->fLeft -= 1; - } - } - } diff --git a/www/iridium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp b/www/iridium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp index 10a9d20a13c7..ce10a392a3de 100644 --- a/www/iridium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp +++ b/www/iridium/files/patch-third__party_skia_src_ports_SkOSFile__stdio.cpp @@ -1,6 +1,6 @@ ---- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig 2019-03-11 22:08:28 UTC +--- third_party/skia/src/ports/SkOSFile_stdio.cpp.orig 2020-02-03 21:54:56 UTC +++ third_party/skia/src/ports/SkOSFile_stdio.cpp -@@ -129,7 +129,7 @@ void sk_fflush(FILE* f) { +@@ -132,7 +132,7 @@ void sk_fflush(FILE* f) { void sk_fsync(FILE* f) { #if !defined(_WIN32) && !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) \ diff --git a/www/iridium/files/patch-third__party_skia_src_sksl_SkSLString.h b/www/iridium/files/patch-third__party_skia_src_sksl_SkSLString.h index 5cf7d9de5ca3..a6806cbac266 100644 --- a/www/iridium/files/patch-third__party_skia_src_sksl_SkSLString.h +++ b/www/iridium/files/patch-third__party_skia_src_sksl_SkSLString.h @@ -1,7 +1,7 @@ ---- third_party/skia/src/sksl/SkSLString.h.orig 2019-03-11 22:08:28 UTC +--- third_party/skia/src/sksl/SkSLString.h.orig 2019-12-16 21:56:18 UTC +++ third_party/skia/src/sksl/SkSLString.h -@@ -22,6 +22,8 @@ - #include "SkString.h" +@@ -17,6 +17,8 @@ + #include "include/core/SkString.h" #endif +#include <stdarg.h> diff --git a/www/iridium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h b/www/iridium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h index 4710263d7bdd..7357a76fa0f9 100644 --- a/www/iridium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h +++ b/www/iridium/files/patch-third__party_skia_third__party_vulkanmemoryallocator_include_vk__mem__alloc.h @@ -1,4 +1,4 @@ ---- third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h.orig 2019-03-17 01:47:13 UTC +--- third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h.orig 2020-04-24 08:05:43 UTC +++ third_party/skia/third_party/vulkanmemoryallocator/include/vk_mem_alloc.h @@ -2232,7 +2232,7 @@ remove them if not needed. #include <mutex> // for std::mutex diff --git a/www/iridium/files/patch-third__party_snappy_src_snappy.h b/www/iridium/files/patch-third__party_snappy_src_snappy.h deleted file mode 100644 index 824b209ee23c..000000000000 --- a/www/iridium/files/patch-third__party_snappy_src_snappy.h +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/snappy/src/snappy.h.orig 2020-01-22 18:43:16 UTC -+++ third_party/snappy/src/snappy.h -@@ -73,7 +73,7 @@ namespace snappy { - // Original contents of *output are lost. - // - // REQUIRES: "input[]" is not an alias of "*output". -- size_t Compress(const char* input, size_t input_length, string* output); -+ size_t Compress(const char* input, size_t input_length, std::string* output); - - // Decompresses "compressed[0,compressed_length-1]" to "*uncompressed". - // Original contents of "*uncompressed" are lost. -@@ -82,7 +82,7 @@ namespace snappy { - // - // returns false if the message is corrupted and could not be decompressed - bool Uncompress(const char* compressed, size_t compressed_length, -- string* uncompressed); -+ std::string* uncompressed); - - // Decompresses "compressed" to "*uncompressed". - // diff --git a/www/iridium/files/patch-third__party_sqlite_BUILD.gn b/www/iridium/files/patch-third__party_sqlite_BUILD.gn index 747f4d473bb6..9bc2ed01d5e2 100644 --- a/www/iridium/files/patch-third__party_sqlite_BUILD.gn +++ b/www/iridium/files/patch-third__party_sqlite_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/sqlite/BUILD.gn.orig 2019-03-11 22:01:16 UTC +--- third_party/sqlite/BUILD.gn.orig 2019-09-09 21:55:43 UTC +++ third_party/sqlite/BUILD.gn -@@ -251,7 +251,7 @@ config("sqlite_warnings") { +@@ -262,7 +262,7 @@ config("sqlite_warnings") { ] } } diff --git a/www/iridium/files/patch-third__party_swiftshader_BUILD.gn b/www/iridium/files/patch-third__party_swiftshader_BUILD.gn index a2728e56134b..7869c319cc9c 100644 --- a/www/iridium/files/patch-third__party_swiftshader_BUILD.gn +++ b/www/iridium/files/patch-third__party_swiftshader_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/swiftshader/BUILD.gn.orig 2019-03-11 22:08:03 UTC +--- third_party/swiftshader/BUILD.gn.orig 2020-03-16 18:42:12 UTC +++ third_party/swiftshader/BUILD.gn -@@ -126,9 +126,6 @@ config("swiftshader_config") { +@@ -136,9 +136,6 @@ config("swiftshader_config") { ldflags = [ "-Wl,--gc-sections" ] if (target_cpu == "mipsel") { @@ -10,7 +10,7 @@ if (mips_arch_variant == "r1") { ldflags += [ "-mips32", -@@ -140,11 +137,8 @@ config("swiftshader_config") { +@@ -150,11 +147,8 @@ config("swiftshader_config") { } } else if (target_cpu == "mips64el") { ldflags += [ diff --git a/www/iridium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp b/www/iridium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp index 2264ab6c8787..888c476a9108 100644 --- a/www/iridium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp +++ b/www/iridium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/Main/SwiftConfig.cpp.orig 2019-03-11 22:08:03 UTC +--- third_party/swiftshader/src/Main/SwiftConfig.cpp.orig 2019-09-09 21:57:01 UTC +++ third_party/swiftshader/src/Main/SwiftConfig.cpp -@@ -762,7 +762,11 @@ namespace sw +@@ -764,7 +764,11 @@ namespace sw struct stat status; int lastModified = ini.getInteger("LastModified", "Time", 0); diff --git a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp index b291ee12c7f9..7577231bc5a8 100644 --- a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp +++ b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2019-03-11 22:08:03 UTC +--- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2019-10-21 19:09:15 UTC +++ third_party/swiftshader/src/OpenGL/libEGL/Display.cpp -@@ -686,7 +686,7 @@ bool Display::isValidWindow(EGLNativeWindowType window +@@ -690,7 +690,7 @@ bool Display::isValidWindow(EGLNativeWindowType window return status != 0; } return false; @@ -9,7 +9,7 @@ return false; // Non X11 linux is headless only #elif defined(__APPLE__) return sw::OSX::IsValidWindow(window); -@@ -862,7 +862,7 @@ sw::Format Display::getDisplayFormat() const +@@ -868,7 +868,7 @@ sw::Format Display::getDisplayFormat() const { return sw::FORMAT_X8R8G8B8; } diff --git a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp index d46d40597ad6..a21bb4acad17 100644 --- a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp +++ b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2019-03-11 22:08:03 UTC +--- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2019-10-21 19:09:15 UTC +++ third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp -@@ -352,7 +352,7 @@ bool WindowSurface::checkForResize() +@@ -362,7 +362,7 @@ bool WindowSurface::checkForResize() int windowWidth = windowAttributes.width; int windowHeight = windowAttributes.height; diff --git a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp index 7b690c4159fb..3ca2cc4d69af 100644 --- a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp +++ b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp @@ -1,6 +1,6 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2019-03-11 22:08:03 UTC +--- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2020-02-03 21:54:55 UTC +++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp -@@ -148,7 +148,7 @@ EGLDisplay GetDisplay(EGLNativeDisplayType display_id) +@@ -153,7 +153,7 @@ EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType // FIXME: Check if display_id is the default display } @@ -9,7 +9,7 @@ #if defined(USE_X11) if(!libX11) #endif // Non X11 linux is headless only -@@ -207,7 +207,7 @@ const char *QueryString(EGLDisplay dpy, EGLint name) +@@ -216,7 +216,7 @@ const char *EGLAPIENTRY QueryString(EGLDisplay dpy, EG { return success( "EGL_KHR_client_get_all_proc_addresses " @@ -18,7 +18,7 @@ "EGL_KHR_platform_gbm " #endif #if defined(USE_X11) -@@ -1248,7 +1248,7 @@ EGLDisplay GetPlatformDisplay(EGLenum platform, void * +@@ -1298,7 +1298,7 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplay(EGLenum plat { TRACE("(EGLenum platform = 0x%X, void *native_display = %p, const EGLAttrib *attrib_list = %p)", platform, native_display, attrib_list); diff --git a/www/iridium/files/patch-third__party_swiftshader_src_Vulkan_VkDebug.cpp b/www/iridium/files/patch-third__party_swiftshader_src_Vulkan_VkDebug.cpp new file mode 100644 index 000000000000..c4eeb77baf0d --- /dev/null +++ b/www/iridium/files/patch-third__party_swiftshader_src_Vulkan_VkDebug.cpp @@ -0,0 +1,53 @@ +--- third_party/swiftshader/src/Vulkan/VkDebug.cpp.orig 2020-04-03 04:13:08 UTC ++++ third_party/swiftshader/src/Vulkan/VkDebug.cpp +@@ -29,12 +29,17 @@ + # include <sys/sysctl.h> + # include <unistd.h> + #endif ++#if defined(__FreeBSD__) ++# include <sys/sysctl.h> ++# include <sys/user.h> ++# include <unistd.h> ++#endif + + namespace { + + bool IsUnderDebugger() + { +-#if defined(PTRACE) && !defined(__APPLE__) && !defined(__MACH__) ++#if defined(PTRACE) && !defined(__APPLE__) && !defined(__MACH__) && !defined(__FreeBSD__) + static bool checked = false; + static bool res = false; + +@@ -56,7 +61,7 @@ bool IsUnderDebugger() + return res; + #elif defined(_WIN32) || defined(_WIN64) + return IsDebuggerPresent() != 0; +-#elif defined(__APPLE__) || defined(__MACH__) ++#elif defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__) + // Code comes from the Apple Technical Q&A QA1361 + + // Tell sysctl what info we're requestion. Specifically we're asking for +@@ -71,14 +76,22 @@ bool IsUnderDebugger() + struct kinfo_proc info; + size_t size = sizeof(info); + ++# if defined(__FreeBSD__) ++ info.ki_flag = 0; ++# else + info.kp_proc.p_flag = 0; ++# endif + + // Get the info we're requesting, if sysctl fails then info.kp_proc.p_flag will remain 0. + res = sysctl(request, sizeof(request) / sizeof(*request), &info, &size, NULL, 0); + ASSERT_MSG(res == 0, "syscl returned %d", res); + + // We're being debugged if the P_TRACED flag is set ++# if defined(__FreeBSD__) ++ return ((info.ki_flag & P_TRACED) != 0); ++# else + return ((info.kp_proc.p_flag & P_TRACED) != 0); ++# endif + #else + return false; + #endif diff --git a/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h b/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h new file mode 100644 index 000000000000..32c68edfca31 --- /dev/null +++ b/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_config.h @@ -0,0 +1,152 @@ +--- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h.orig 2020-03-16 18:42:15 UTC ++++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/config.h +@@ -8,15 +8,15 @@ + #define BUG_REPORT_URL "https://bugs.llvm.org/" + + /* Define to 1 to enable backtraces, and to 0 otherwise. */ +-#define ENABLE_BACKTRACES 0 ++#define ENABLE_BACKTRACES 1 + + /* Define to 1 to enable crash overrides, and to 0 otherwise. */ +-#define ENABLE_CRASH_OVERRIDES 0 ++#define ENABLE_CRASH_OVERRIDES 1 + + /* Define to 1 if you have the `backtrace' function. */ +-/* #undef HAVE_BACKTRACE */ ++#define HAVE_BACKTRACE 1 + +-/* #undef BACKTRACE_HEADER */ ++#define BACKTRACE_HEADER <execinfo.h> + + /* Define to 1 if you have the <CrashReporterClient.h> header file. */ + /* #undef HAVE_CRASHREPORTERCLIENT_H */ +@@ -26,7 +26,7 @@ + + /* Define to 1 if you have the declaration of `arc4random', and to 0 if you + don't. */ +-#define HAVE_DECL_ARC4RANDOM 0 ++#define HAVE_DECL_ARC4RANDOM 1 + + /* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you + don't. */ +@@ -50,7 +50,7 @@ + #define HAVE_DLOPEN 1 + + /* Define if dladdr() is available on this platform. */ +-/* #undef HAVE_DLADDR */ ++#define HAVE_DLADDR 1 + + /* Define to 1 if you have the <errno.h> header file. */ + #define HAVE_ERRNO_H 1 +@@ -89,7 +89,7 @@ + #define HAVE_ISATTY 1 + + /* Define to 1 if you have the `edit' library (-ledit). */ +-/* #undef HAVE_LIBEDIT */ ++#define HAVE_LIBEDIT 1 + + /* Define to 1 if you have the `pfm' library (-lpfm). */ + /* #undef HAVE_LIBPFM */ +@@ -107,25 +107,25 @@ + /* #undef HAVE_PTHREAD_SETNAME_NP */ + + /* Define to 1 if you have the `z' library (-lz). */ +-/* #undef HAVE_LIBZ */ ++#define HAVE_LIBZ 1 + + /* Define to 1 if you have the <link.h> header file. */ + #define HAVE_LINK_H 1 + + /* Define to 1 if you have the `lseek64' function. */ +-#define HAVE_LSEEK64 1 ++/* #undef HAVE_LSEEK64 */ + + /* Define to 1 if you have the <mach/mach.h> header file. */ + /* #undef HAVE_MACH_MACH_H */ + + /* Define to 1 if you have the `mallctl' function. */ +-/* #undef HAVE_MALLCTL */ ++#define HAVE_MALLCTL 1 + + /* Define to 1 if you have the `mallinfo' function. */ +-#define HAVE_MALLINFO 1 ++/* #undef HAVE_MALLINFO */ + + /* Define to 1 if you have the <malloc.h> header file. */ +-#define HAVE_MALLOC_H 1 ++/* #undef HAVE_MALLOC_H */ + + /* Define to 1 if you have the <malloc/malloc.h> header file. */ + /* #undef HAVE_MALLOC_MALLOC_H */ +@@ -137,7 +137,7 @@ + #define HAVE_POSIX_FALLOCATE 1 + + /* Define to 1 if you have the `posix_spawn' function. */ +-/* #undef HAVE_POSIX_SPAWN */ ++#define HAVE_POSIX_SPAWN 1 + + /* Define to 1 if you have the `pread' function. */ + #define HAVE_PREAD 1 +@@ -158,16 +158,16 @@ + #define HAVE_REALPATH 1 + + /* Define to 1 if you have the `sbrk' function. */ +-#define HAVE_SBRK 1 ++/* #undef HAVE_SBRK */ + + /* Define to 1 if you have the `setenv' function. */ + #define HAVE_SETENV 1 + + /* Define to 1 if you have the `sched_getaffinity' function. */ +-#define HAVE_SCHED_GETAFFINITY 1 ++/* #undef HAVE_SCHED_GETAFFINITY */ + + /* Define to 1 if you have the `CPU_COUNT' macro. */ +-#define HAVE_CPU_COUNT 1 ++/* #undef HAVE_CPU_COUNT */ + + /* Define to 1 if you have the `setrlimit' function. */ + #define HAVE_SETRLIMIT 1 +@@ -209,13 +209,13 @@ + #define HAVE_SYS_TYPES_H 1 + + /* Define if the setupterm() function is supported this platform. */ +-/* #undef HAVE_TERMINFO */ ++#define HAVE_TERMINFO 1 + + /* Define if the xar_open() function is supported this platform. */ + /* #undef HAVE_LIBXAR */ + + /* Define to 1 if you have the <termios.h> header file. */ +-/* #undef HAVE_TERMIOS_H */ ++#define HAVE_TERMIOS_H 1 + + /* Define to 1 if you have the <unistd.h> header file. */ + #define HAVE_UNISTD_H 1 +@@ -224,7 +224,7 @@ + /* #undef HAVE_VALGRIND_VALGRIND_H */ + + /* Define to 1 if you have the <zlib.h> header file. */ +-/* #undef HAVE_ZLIB_H */ ++#define HAVE_ZLIB_H 1 + + /* Have host's _alloca */ + /* #undef HAVE__ALLOCA */ +@@ -298,7 +298,7 @@ + #elif defined(__arm__) + #define LLVM_DEFAULT_TARGET_TRIPLE "armv7-linux-gnueabihf" + #elif defined(__aarch64__) +-#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-linux-gnu" ++#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-portbld-freebsd" + #elif defined(__mips__) + #define LLVM_DEFAULT_TARGET_TRIPLE "mipsel-linux-gnu" + #elif defined(__mips64) +@@ -310,7 +310,7 @@ + #endif + + /* Define if zlib compression is available */ +-#define LLVM_ENABLE_ZLIB 0 ++#define LLVM_ENABLE_ZLIB 1 + + /* Define if overriding target triple is enabled */ + /* #undef LLVM_TARGET_TRIPLE_ENV */ diff --git a/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_llvm-config.h b/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_llvm-config.h new file mode 100644 index 000000000000..4405e311225b --- /dev/null +++ b/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-7.0_configs_linux_include_llvm_Config_llvm-config.h @@ -0,0 +1,20 @@ +--- third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h.orig 2019-09-09 21:57:03 UTC ++++ third_party/swiftshader/third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h +@@ -38,7 +38,7 @@ + #elif defined(__arm__) + #define LLVM_DEFAULT_TARGET_TRIPLE "armv7-linux-gnueabihf" + #elif defined(__aarch64__) +-#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-linux-gnu" ++#define LLVM_DEFAULT_TARGET_TRIPLE "aarch64-portbld-freebsd" + #elif defined(__mips__) + #define LLVM_DEFAULT_TARGET_TRIPLE "mipsel-linux-gnu" + #elif defined(__mips64) +@@ -63,7 +63,7 @@ + #elif defined(__arm__) + #define LLVM_HOST_TRIPLE "armv7-linux-gnueabihf" + #elif defined(__aarch64__) +-#define LLVM_HOST_TRIPLE "aarch64-linux-gnu" ++#define LLVM_HOST_TRIPLE "aarch64-portbld-freebsd" + #elif defined(__mips__) + #define LLVM_HOST_TRIPLE "mipsel-linux-gnu" + #elif defined(__mips64) diff --git a/www/iridium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp b/www/iridium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp new file mode 100644 index 000000000000..f34425cdd42e --- /dev/null +++ b/www/iridium/files/patch-third__party_swiftshader_third__party_marl_src_memory.cpp @@ -0,0 +1,11 @@ +--- third_party/swiftshader/third_party/marl/src/memory.cpp.orig 2019-12-22 15:09:53 UTC ++++ third_party/swiftshader/third_party/marl/src/memory.cpp +@@ -19,7 +19,7 @@ + + #include <cstring> + +-#if defined(__linux__) || defined(__APPLE__) ++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) + #include <sys/mman.h> + #include <unistd.h> + namespace { diff --git a/www/iridium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp b/www/iridium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp new file mode 100644 index 000000000000..927560e4f971 --- /dev/null +++ b/www/iridium/files/patch-third__party_swiftshader_third__party_marl_src_thread.cpp @@ -0,0 +1,22 @@ +--- third_party/swiftshader/third_party/marl/src/thread.cpp.orig 2019-12-22 15:09:09 UTC ++++ third_party/swiftshader/third_party/marl/src/thread.cpp +@@ -27,6 +27,10 @@ + #include <mach/thread_act.h> + #include <pthread.h> + #include <unistd.h> ++#elif defined(__FreeBSD__) ++#include <pthread.h> ++#include <pthread_np.h> ++#include <unistd.h> + #else + #include <pthread.h> + #include <unistd.h> +@@ -85,6 +89,8 @@ void Thread::setName(const char* fmt, ...) { + + #if defined(__APPLE__) + pthread_setname_np(name); ++#elif defined(__FreeBSD__) ++ pthread_set_name_np(pthread_self(), name); + #elif !defined(__Fuchsia__) + pthread_setname_np(pthread_self(), name); + #endif diff --git a/www/iridium/files/patch-third__party_webrtc_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_BUILD.gn index 5f28025bfc7a..431b2f75d72c 100644 --- a/www/iridium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/iridium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2019-03-11 22:08:05 UTC +--- third_party/webrtc/BUILD.gn.orig 2020-03-16 18:42:13 UTC +++ third_party/webrtc/BUILD.gn -@@ -153,6 +153,9 @@ config("common_inherited_config") { +@@ -171,6 +171,9 @@ config("common_inherited_config") { if (is_linux) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn index 4596e860ef72..a9fe31ec37b8 100644 --- a/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2019-03-11 22:08:06 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2020-03-16 18:42:14 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -312,7 +312,7 @@ rtc_source_set("audio_device_impl") { +@@ -259,7 +259,7 @@ rtc_library("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { diff --git a/www/iridium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc b/www/iridium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc index 068d460974e3..41cae80d56bd 100644 --- a/www/iridium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc +++ b/www/iridium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc @@ -1,10 +1,10 @@ ---- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2019-03-11 22:08:10 UTC +--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig 2019-09-09 21:57:05 UTC +++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc -@@ -12,6 +12,7 @@ - +@@ -13,6 +13,7 @@ #include <string.h> + #include <algorithm> +#include <cstdlib> #include <utility> - #include "modules/include/module_common_types_public.h" + #include "absl/algorithm/container.h" diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_rtc__base_BUILD.gn deleted file mode 100644 index edb50f296022..000000000000 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_BUILD.gn +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/webrtc/rtc_base/BUILD.gn.orig 2019-03-11 22:08:15 UTC -+++ third_party/webrtc/rtc_base/BUILD.gn -@@ -1088,8 +1088,6 @@ rtc_static_library("rtc_base") { - - if (rtc_use_x11) { - libs += [ -- "dl", -- "rt", - "Xext", - "X11", - "Xcomposite", -@@ -1097,7 +1095,7 @@ rtc_static_library("rtc_base") { - ] - } - -- if (is_linux) { -+ if (is_linux && !is_bsd) { - libs += [ - "dl", - "rt", diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_byte__order.h b/www/iridium/files/patch-third__party_webrtc_rtc__base_byte__order.h index df1d8c9420cb..0f3e3413f1ae 100644 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_byte__order.h +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_byte__order.h @@ -1,11 +1,11 @@ ---- third_party/webrtc/rtc_base/byte_order.h.orig 2019-03-11 22:08:15 UTC +--- third_party/webrtc/rtc_base/byte_order.h.orig 2019-06-04 18:58:09 UTC +++ third_party/webrtc/rtc_base/byte_order.h -@@ -79,7 +79,7 @@ - #error WEBRTC_ARCH_BIG_ENDIAN or WEBRTC_ARCH_LITTLE_ENDIAN must be defined. +@@ -89,7 +89,7 @@ #endif // defined(WEBRTC_ARCH_LITTLE_ENDIAN) + #elif defined(WEBRTC_POSIX) -#include <endian.h> +#include <sys/endian.h> - #endif - - namespace rtc { + #else + #error "Missing byte order functions for this arch." + #endif // defined(WEBRTC_MAC) diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc index febff7cd7555..e45c76f40a22 100644 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc @@ -1,4 +1,4 @@ ---- third_party/webrtc/rtc_base/network.cc.orig 2019-03-11 22:08:15 UTC +--- third_party/webrtc/rtc_base/network.cc.orig 2019-12-16 21:56:20 UTC +++ third_party/webrtc/rtc_base/network.cc @@ -14,7 +14,7 @@ // linux/if.h can't be included at the same time as the posix sys/if.h, and @@ -9,7 +9,7 @@ #include <linux/if.h> #include <linux/route.h> #elif !defined(__native_client__) -@@ -762,7 +762,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_ +@@ -767,7 +767,7 @@ bool BasicNetworkManager::CreateNetworks(bool include_ } #endif // WEBRTC_WIN @@ -18,7 +18,7 @@ bool IsDefaultRoute(const std::string& network_name) { FILE* f = fopen("/proc/net/route", "r"); if (!f) { -@@ -805,7 +805,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo +@@ -810,7 +810,7 @@ bool BasicNetworkManager::IsIgnoredNetwork(const Netwo strncmp(network.name().c_str(), "vboxnet", 7) == 0) { return true; } diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_network.h b/www/iridium/files/patch-third__party_webrtc_rtc__base_network.h index 4916dc17b405..46d64c258e37 100644 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_network.h +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_network.h @@ -1,7 +1,7 @@ ---- third_party/webrtc/rtc_base/network.h.orig 2019-03-11 22:08:15 UTC +--- third_party/webrtc/rtc_base/network.h.orig 2019-12-16 21:56:20 UTC +++ third_party/webrtc/rtc_base/network.h -@@ -25,6 +25,10 @@ - #include "rtc_base/network_monitor.h" +@@ -26,6 +26,10 @@ + #include "rtc_base/system/rtc_export.h" #include "rtc_base/third_party/sigslot/sigslot.h" +#if defined(WEBRTC_BSD) diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc index d72e2a3f05fc..939381fc9f1a 100644 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc @@ -1,6 +1,15 @@ ---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2019-03-11 22:08:16 UTC +--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2020-03-16 18:42:14 UTC +++ third_party/webrtc/rtc_base/physical_socket_server.cc -@@ -66,7 +66,7 @@ typedef void* SockOptArg; +@@ -51,7 +51,7 @@ + #include "rtc_base/null_socket_server.h" + #include "rtc_base/time_utils.h" + +-#if defined(WEBRTC_LINUX) ++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD) + #include <linux/sockios.h> + #endif + +@@ -70,7 +70,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -9,7 +18,7 @@ int64_t GetSocketRecvTimestamp(int socket) { struct timeval tv_ioctl; -@@ -286,7 +286,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) +@@ -290,7 +290,7 @@ int PhysicalSocket::GetOption(Option opt, int* value) socklen_t optlen = sizeof(*value); int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen); if (ret != -1 && opt == OPT_DONTFRAGMENT) { @@ -18,7 +27,7 @@ *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0; #endif } -@@ -299,7 +299,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { +@@ -303,7 +303,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { if (TranslateOption(opt, &slevel, &sopt) == -1) return -1; if (opt == OPT_DONTFRAGMENT) { @@ -27,25 +36,7 @@ value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT; #endif } -@@ -309,7 +309,7 @@ int PhysicalSocket::SetOption(Option opt, int value) { - int PhysicalSocket::Send(const void* pv, size_t cb) { - int sent = DoSend( - s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb), --#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) -+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD) - // Suppress SIGPIPE. Without this, attempting to send on a socket whose - // other end is closed will result in a SIGPIPE signal being raised to - // our process, which by default will terminate the process, which we -@@ -338,7 +338,7 @@ int PhysicalSocket::SendTo(const void* buffer, - size_t len = addr.ToSockAddrStorage(&saddr); - int sent = - DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length), --#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) -+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD) - // Suppress SIGPIPE. See above for explanation. - MSG_NOSIGNAL, - #else -@@ -529,7 +529,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s +@@ -533,7 +533,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s *slevel = IPPROTO_IP; *sopt = IP_DONTFRAGMENT; break; diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc b/www/iridium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc index c13f1619297d..9d0e6fdcc5fd 100644 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_platform__thread__types.cc @@ -1,36 +1,35 @@ ---- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2019-03-11 22:08:16 UTC +--- third_party/webrtc/rtc_base/platform_thread_types.cc.orig 2019-12-16 21:56:20 UTC +++ third_party/webrtc/rtc_base/platform_thread_types.cc -@@ -11,7 +11,9 @@ +@@ -11,7 +11,11 @@ #include "rtc_base/platform_thread_types.h" #if defined(WEBRTC_LINUX) +#if !defined(__FreeBSD__) #include <sys/prctl.h> ++#else ++#include <pthread_np.h> +#endif #include <sys/syscall.h> #endif -@@ -27,8 +29,10 @@ PlatformThreadId CurrentThreadId() { +@@ -27,6 +31,8 @@ PlatformThreadId CurrentThreadId() { return gettid(); #elif defined(WEBRTC_FUCHSIA) return zx_thread_self(); --#elif defined(WEBRTC_LINUX) -+#elif defined(WEBRTC_LINUX) && !defined(__FreeBSD__) - return syscall(__NR_gettid); +#elif defined(__FreeBSD__) -+ return reinterpret_cast<uint64_t>(pthread_self()); - #else - // Default implementation for nacl and solaris. - return reinterpret_cast<pid_t>(pthread_self()); -@@ -55,6 +59,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons ++ return pthread_getthreadid_np(); + #elif defined(WEBRTC_LINUX) + return syscall(__NR_gettid); + #elif defined(__EMSCRIPTEN__) +@@ -57,6 +63,7 @@ bool IsThreadRefEqual(const PlatformThreadRef& a, cons } void SetCurrentThreadName(const char* name) { +#if !defined(__FreeBSD__) #if defined(WEBRTC_WIN) - struct { - DWORD dwType; -@@ -72,6 +77,7 @@ void SetCurrentThreadName(const char* name) { + // For details see: + // https://docs.microsoft.com/en-us/visualstudio/debugger/how-to-set-a-thread-name-in-native-code +@@ -81,6 +88,7 @@ void SetCurrentThreadName(const char* name) { prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name)); // NOLINT #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS) pthread_setname_np(name); diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_string__utils.h b/www/iridium/files/patch-third__party_webrtc_rtc__base_string__utils.h deleted file mode 100644 index b01596a3dfe6..000000000000 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_string__utils.h +++ /dev/null @@ -1,17 +0,0 @@ ---- third_party/webrtc/rtc_base/string_utils.h.orig 2019-03-11 22:08:16 UTC -+++ third_party/webrtc/rtc_base/string_utils.h -@@ -25,11 +25,11 @@ - #endif // WEBRTC_WIN - - #if defined(WEBRTC_POSIX) --#ifdef BSD -+#if defined(WEBRTC_BSD) || defined(BSD) - #include <stdlib.h> --#else // BSD -+#else // WEBRTC_BSD - #include <alloca.h> --#endif // !BSD -+#endif // !WEBRTC_BSD - #include <strings.h> - #endif // WEBRTC_POSIX - diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h b/www/iridium/files/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h new file mode 100644 index 000000000000..3d7e07133d72 --- /dev/null +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h @@ -0,0 +1,19 @@ +--- third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h.orig 2020-03-03 18:55:31 UTC ++++ third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h +@@ -178,6 +178,8 @@ class multi_threaded_local { + #endif // _SIGSLOT_HAS_WIN32_THREADS + + #ifdef _SIGSLOT_HAS_POSIX_THREADS ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wthread-safety-analysis" + // The multi threading policies only get compiled in if they are enabled. + class multi_threaded_global { + public: +@@ -201,6 +203,7 @@ class multi_threaded_local { + private: + pthread_mutex_t m_mutex; + }; ++#pragma GCC diagnostic pop + #endif // _SIGSLOT_HAS_POSIX_THREADS + + template <class mt_policy> diff --git a/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn index 862741091780..bb0b3df2b288 100644 --- a/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn +++ b/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/system_wrappers/BUILD.gn.orig 2019-03-11 22:08:22 UTC +--- third_party/webrtc/system_wrappers/BUILD.gn.orig 2019-09-09 21:57:06 UTC +++ third_party/webrtc/system_wrappers/BUILD.gn -@@ -59,8 +59,6 @@ rtc_static_library("system_wrappers") { +@@ -58,8 +58,6 @@ rtc_static_library("system_wrappers") { if (!build_with_chromium) { deps += [ ":cpu_features_linux" ] } diff --git a/www/iridium/files/patch-third__party_yasm_yasm__assemble.gni b/www/iridium/files/patch-third__party_yasm_yasm__assemble.gni index 2ae6310b09d0..a54244fd5e3e 100644 --- a/www/iridium/files/patch-third__party_yasm_yasm__assemble.gni +++ b/www/iridium/files/patch-third__party_yasm_yasm__assemble.gni @@ -1,4 +1,4 @@ ---- third_party/yasm/yasm_assemble.gni.orig 2019-03-18 08:59:45 UTC +--- third_party/yasm/yasm_assemble.gni.orig 2020-03-16 18:40:14 UTC +++ third_party/yasm/yasm_assemble.gni @@ -1,105 +1,23 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. @@ -120,7 +120,7 @@ action_name = "${target_name}_action" source_set_name = target_name -@@ -114,24 +32,12 @@ template("yasm_assemble") { +@@ -114,22 +32,12 @@ template("yasm_assemble") { inputs = invoker.inputs } @@ -133,9 +133,7 @@ - root_build_dir) ] - - # Deps. -- deps = [ -- yasm_label, -- ] +- deps = [ yasm_label ] + deps = [] if (defined(invoker.deps)) { deps += invoker.deps @@ -147,7 +145,7 @@ if (defined(invoker.yasm_flags)) { args += invoker.yasm_flags } -@@ -188,9 +94,6 @@ template("yasm_assemble") { +@@ -184,9 +92,6 @@ template("yasm_assemble") { } sources = get_target_outputs(":$action_name") @@ -155,5 +153,5 @@ - # Do not publicize any header to remove build dependency. - public = [] - deps = [ - ":$action_name", + deps = [ ":$action_name" ] + } diff --git a/www/iridium/files/patch-third__party_zlib_arm__features.c b/www/iridium/files/patch-third__party_zlib_arm__features.c deleted file mode 100644 index 1dea27934e05..000000000000 --- a/www/iridium/files/patch-third__party_zlib_arm__features.c +++ /dev/null @@ -1,28 +0,0 @@ ---- third_party/zlib/arm_features.c.orig 2019-03-11 22:01:18 UTC -+++ third_party/zlib/arm_features.c -@@ -21,9 +21,10 @@ int ZLIB_INTERNAL arm_cpu_enable_pmull = 0; - #include <asm/hwcap.h> - #include <sys/auxv.h> - #else --#error ### No ARM CPU features detection in your platform/OS -+/* #error ### No ARM CPU features detection in your platform/OS */ - #endif - -+#ifdef ARMV8_OS_LINUX - static pthread_once_t cpu_check_inited_once = PTHREAD_ONCE_INIT; - - static void init_arm_features(void) -@@ -55,10 +56,13 @@ static void init_arm_features(void) - if (capabilities & flag_pmull) - arm_cpu_enable_pmull = 1; - } -+#endif - - void ZLIB_INTERNAL arm_check_features(void) - { -+#ifdef ARMV8_OS_LINUX - pthread_once(&cpu_check_inited_once, init_arm_features); -+#endif - } - #else - #include <windows.h> diff --git a/www/iridium/files/patch-tools_gn_build_gen.py b/www/iridium/files/patch-tools_gn_build_gen.py index c133a516bb05..1461138a4fd5 100644 --- a/www/iridium/files/patch-tools_gn_build_gen.py +++ b/www/iridium/files/patch-tools_gn_build_gen.py @@ -1,33 +1,24 @@ ---- tools/gn/build/gen.py.orig 2019-03-11 22:12:13 UTC +--- tools/gn/build/gen.py.orig 2020-03-16 18:48:21 UTC +++ tools/gn/build/gen.py -@@ -44,7 +44,7 @@ class Platform(object): - - @staticmethod - def known_platforms(): -- return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia'] -+ return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'freebsd'] - - def platform(self): - return self._platform -@@ -67,6 +67,9 @@ class Platform(object): - def is_aix(self): - return self._platform == 'aix' +@@ -73,6 +73,9 @@ class Platform(object): + def is_haiku(self): + return self._platform == 'haiku' + def is_freebsd(self): + return self._platform == 'freebsd' + def is_posix(self): - return self._platform in ['linux', 'freebsd', 'darwin', 'aix'] + return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku'] -@@ -332,6 +335,11 @@ def WriteGNNinja(path, platform, host, options): - elif platform.is_aix(): - cflags_cc.append('-maix64') - ldflags.append('-maix64') +@@ -351,6 +354,11 @@ def WriteGNNinja(path, platform, host, options): + elif platform.is_haiku(): + cflags.append('-fPIC') + cflags.extend(['-D_BSD_SOURCE']) + elif platform.is_freebsd(): + cflags.extend(['-Wno-deprecated-register', '-Wno-parentheses-equality']) + ldflags.extend(['-pthread']) + libs.extend(['-lexecinfo', '-lkvm', '-lutil']) + include_dirs += ['/usr/local/include'] - if platform.is_posix(): + if platform.is_posix() and not platform.is_haiku(): ldflags.append('-pthread') diff --git a/www/iridium/files/patch-tools_gn_base_files_file__posix.cc b/www/iridium/files/patch-tools_gn_src_base_files_file__posix.cc index b96ca30305db..26958b7bf8f1 100644 --- a/www/iridium/files/patch-tools_gn_base_files_file__posix.cc +++ b/www/iridium/files/patch-tools_gn_src_base_files_file__posix.cc @@ -1,6 +1,6 @@ ---- tools/gn/base/files/file_posix.cc.orig 2019-03-11 22:12:13 UTC -+++ tools/gn/base/files/file_posix.cc -@@ -414,7 +414,7 @@ void File::DoInitialize(const FilePath& path, uint32_t +--- tools/gn/src/base/files/file_posix.cc.orig 2020-03-16 18:48:21 UTC ++++ tools/gn/src/base/files/file_posix.cc +@@ -372,7 +372,7 @@ void File::DoInitialize(const FilePath& path, uint32_t bool File::Flush() { DCHECK(IsValid()); diff --git a/www/iridium/files/patch-tools_gn_src_base_files_file__util.h b/www/iridium/files/patch-tools_gn_src_base_files_file__util.h new file mode 100644 index 000000000000..910d80aa09c6 --- /dev/null +++ b/www/iridium/files/patch-tools_gn_src_base_files_file__util.h @@ -0,0 +1,11 @@ +--- tools/gn/src/base/files/file_util.h.orig 2020-03-16 18:48:21 UTC ++++ tools/gn/src/base/files/file_util.h +@@ -325,7 +325,7 @@ bool VerifyPathControlledByAdmin(const base::FilePath& + // the directory |path|, in the number of FilePath::CharType, or -1 on failure. + int GetMaximumPathComponentLength(const base::FilePath& path); + +-#if defined(OS_LINUX) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_AIX) || defined(OS_BSD) + // Broad categories of file systems as returned by statfs() on Linux. + enum FileSystemType { + FILE_SYSTEM_UNKNOWN, // statfs failed. diff --git a/www/iridium/files/patch-tools_gn_src_base_files_file__util__posix.cc b/www/iridium/files/patch-tools_gn_src_base_files_file__util__posix.cc new file mode 100644 index 000000000000..b5476cba713c --- /dev/null +++ b/www/iridium/files/patch-tools_gn_src_base_files_file__util__posix.cc @@ -0,0 +1,11 @@ +--- tools/gn/src/base/files/file_util_posix.cc.orig 2020-03-16 18:48:21 UTC ++++ tools/gn/src/base/files/file_util_posix.cc +@@ -210,7 +210,7 @@ bool ReplaceFile(const FilePath& from_path, + } + + bool CreateLocalNonBlockingPipe(int fds[2]) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + return pipe2(fds, O_CLOEXEC | O_NONBLOCK) == 0; + #else + int raw_fds[2]; diff --git a/www/iridium/files/patch-tools_gn_src_base_files_scoped__file.cc b/www/iridium/files/patch-tools_gn_src_base_files_scoped__file.cc new file mode 100644 index 000000000000..acc59789e438 --- /dev/null +++ b/www/iridium/files/patch-tools_gn_src_base_files_scoped__file.cc @@ -0,0 +1,11 @@ +--- tools/gn/src/base/files/scoped_file.cc.orig 2020-03-16 18:48:21 UTC ++++ tools/gn/src/base/files/scoped_file.cc +@@ -30,7 +30,7 @@ void ScopedFDCloseTraits::Free(int fd) { + // a single open directory would bypass the entire security model. + int ret = IGNORE_EINTR(close(fd)); + +-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || \ ++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_FUCHSIA) || defined(OS_BSD) || \ + defined(OS_ANDROID) + // NB: Some file descriptors can return errors from close() e.g. network + // filesystems such as NFS and Linux input devices. On Linux, macOS, and diff --git a/www/iridium/files/patch-tools_gn_tools_gn_exec__process.cc b/www/iridium/files/patch-tools_gn_src_gn_exec__process.cc index bd6d48b4274e..761ee60ca826 100644 --- a/www/iridium/files/patch-tools_gn_tools_gn_exec__process.cc +++ b/www/iridium/files/patch-tools_gn_src_gn_exec__process.cc @@ -1,6 +1,6 @@ ---- tools/gn/tools/gn/exec_process.cc.orig 2019-03-11 22:12:13 UTC -+++ tools/gn/tools/gn/exec_process.cc -@@ -29,6 +29,10 @@ +--- tools/gn/src/gn/exec_process.cc.orig 2020-03-16 18:48:21 UTC ++++ tools/gn/src/gn/exec_process.cc +@@ -30,6 +30,10 @@ #include "base/posix/file_descriptor_shuffle.h" #endif diff --git a/www/iridium/files/patch-tools_gn_src_util_sys__info.cc b/www/iridium/files/patch-tools_gn_src_util_sys__info.cc new file mode 100644 index 000000000000..8b5fbb9cdb14 --- /dev/null +++ b/www/iridium/files/patch-tools_gn_src_util_sys__info.cc @@ -0,0 +1,11 @@ +--- tools/gn/src/util/sys_info.cc.orig 2020-03-16 18:48:21 UTC ++++ tools/gn/src/util/sys_info.cc +@@ -28,6 +28,8 @@ std::string OperatingSystemArchitecture() { + arch = "x86"; + } else if (arch == "amd64") { + arch = "x86_64"; ++ } else if (arch == "arm64") { ++ arch = "aarch64"; + } else if (std::string(info.sysname) == "AIX") { + arch = "ppc64"; + } diff --git a/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py b/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py index 1d07a4a406d6..fda74ee7deec 100644 --- a/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py +++ b/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/feature_compiler.py.orig 2019-03-11 22:01:18 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2020-02-03 21:53:12 UTC +++ tools/json_schema_compiler/feature_compiler.py -@@ -205,6 +205,7 @@ FEATURE_GRAMMAR = ( +@@ -218,6 +218,7 @@ FEATURE_GRAMMAR = ( 'enum_map': { 'chromeos': 'Feature::CHROMEOS_PLATFORM', 'linux': 'Feature::LINUX_PLATFORM', diff --git a/www/iridium/files/patch-tools_json__schema__compiler_model.py b/www/iridium/files/patch-tools_json__schema__compiler_model.py index f8cbd5df67e7..054250e781d5 100644 --- a/www/iridium/files/patch-tools_json__schema__compiler_model.py +++ b/www/iridium/files/patch-tools_json__schema__compiler_model.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/model.py.orig 2019-03-11 22:01:18 UTC +--- tools/json_schema_compiler/model.py.orig 2019-12-16 21:51:07 UTC +++ tools/json_schema_compiler/model.py -@@ -602,7 +602,7 @@ class Platforms(object): +@@ -605,7 +605,7 @@ class Platforms(object): """ CHROMEOS = _PlatformInfo("chromeos") CHROMEOS_TOUCH = _PlatformInfo("chromeos_touch") diff --git a/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn index e2bf7a5b6725..ac82f274b479 100644 --- a/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn +++ b/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn @@ -1,11 +1,11 @@ ---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2019-03-11 22:01:18 UTC +--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2020-03-16 18:40:43 UTC +++ tools/perf/chrome_telemetry_build/BUILD.gn -@@ -40,7 +40,7 @@ group("telemetry_chrome_test") { +@@ -46,7 +46,7 @@ group("telemetry_chrome_test") { data_deps += [ "//chrome:reorder_imports" ] } - if (is_linux) { + if (is_linux && !is_bsd) { - data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] - } - + data_deps += [ + "//third_party/breakpad:dump_syms($host_toolchain)", + "//third_party/crashpad/crashpad/tools:crashpad_database_util", diff --git a/www/iridium/files/patch-tools_variations_fieldtrial__to__struct.py b/www/iridium/files/patch-tools_variations_fieldtrial__to__struct.py index d9ad340d66d8..940d72d03d24 100644 --- a/www/iridium/files/patch-tools_variations_fieldtrial__to__struct.py +++ b/www/iridium/files/patch-tools_variations_fieldtrial__to__struct.py @@ -1,10 +1,10 @@ ---- tools/variations/fieldtrial_to_struct.py.orig 2019-03-11 22:01:18 UTC +--- tools/variations/fieldtrial_to_struct.py.orig 2020-03-16 18:40:14 UTC +++ tools/variations/fieldtrial_to_struct.py -@@ -24,6 +24,7 @@ finally: - _platforms = [ - 'android', - 'android_webview', -+ 'freebsd', - 'chromeos', - 'fuchsia', - 'ios', +@@ -35,6 +35,7 @@ _platforms = [ + 'android_weblayer', + 'android_webview', + 'chromeos', ++ 'freebsd', + 'fuchsia', + 'ios', + 'linux', diff --git a/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc b/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc index a40bc4c2c4bd..40534eb32dbb 100644 --- a/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc +++ b/www/iridium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc @@ -1,4 +1,4 @@ ---- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2019-03-11 22:01:19 UTC +--- ui/base/dragdrop/os_exchange_data_provider_factory.cc.orig 2019-07-24 18:59:18 UTC +++ ui/base/dragdrop/os_exchange_data_provider_factory.cc @@ -8,7 +8,7 @@ @@ -9,8 +9,8 @@ #include "ui/base/dragdrop/os_exchange_data_provider_aura.h" #elif defined(OS_MACOSX) #include "ui/base/dragdrop/os_exchange_data_provider_builder_mac.h" -@@ -42,7 +42,7 @@ OSExchangeDataProviderFactory::CreateProvider() { - +@@ -23,7 +23,7 @@ std::unique_ptr<OSExchangeData::Provider> + OSExchangeDataProviderFactory::CreateProvider() { #if defined(USE_X11) return std::make_unique<OSExchangeDataProviderAuraX11>(); -#elif defined(OS_LINUX) diff --git a/www/iridium/files/patch-ui_base_ime_ime__engine__handler__interface.h b/www/iridium/files/patch-ui_base_ime_ime__engine__handler__interface.h deleted file mode 100644 index 4157662ca703..000000000000 --- a/www/iridium/files/patch-ui_base_ime_ime__engine__handler__interface.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/base/ime/ime_engine_handler_interface.h.orig 2019-03-11 22:01:19 UTC -+++ ui/base/ime/ime_engine_handler_interface.h -@@ -166,7 +166,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandlerInterface { - virtual void SetMirroringEnabled(bool mirroring_enabled) = 0; - virtual void SetCastingEnabled(bool casting_enabled) = 0; - --#elif defined(OS_LINUX) || defined(OS_WIN) -+#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) - - // Get the id of the IME extension. - virtual std::string GetExtensionId() const = 0; diff --git a/www/iridium/files/patch-ui_base_ime_input__method__initializer.cc b/www/iridium/files/patch-ui_base_ime_init_input__method__initializer.cc index 57a89929eca5..8f3c47ebd01b 100644 --- a/www/iridium/files/patch-ui_base_ime_input__method__initializer.cc +++ b/www/iridium/files/patch-ui_base_ime_init_input__method__initializer.cc @@ -1,5 +1,5 @@ ---- ui/base/ime/input_method_initializer.cc.orig 2019-03-11 22:01:19 UTC -+++ ui/base/ime/input_method_initializer.cc +--- ui/base/ime/init/input_method_initializer.cc.orig 2019-06-04 18:55:49 UTC ++++ ui/base/ime/init/input_method_initializer.cc @@ -8,7 +8,7 @@ #if defined(OS_CHROMEOS) @@ -32,7 +32,7 @@ #if defined(OS_CHROMEOS) IMEBridge::Shutdown(); -#elif defined(USE_AURA) && defined(OS_LINUX) -+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) ++#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) const LinuxInputMethodContextFactory* factory = LinuxInputMethodContextFactory::instance(); CHECK(!factory || factory == g_linux_input_method_context_factory_for_testing) diff --git a/www/iridium/files/patch-ui_base_resource_resource__bundle.cc b/www/iridium/files/patch-ui_base_resource_resource__bundle.cc index c7c978f465e1..91e1320a26f5 100644 --- a/www/iridium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/iridium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2019-03-11 22:01:19 UTC +--- ui/base/resource/resource_bundle.cc.orig 2020-03-16 18:40:15 UTC +++ ui/base/resource/resource_bundle.cc -@@ -692,7 +692,7 @@ void ResourceBundle::ReloadFonts() { +@@ -822,7 +822,7 @@ void ResourceBundle::ReloadFonts() { } ScaleFactor ResourceBundle::GetMaxScaleFactor() const { @@ -9,7 +9,7 @@ return max_scale_factor_; #else return GetSupportedScaleFactors().back(); -@@ -745,7 +745,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele +@@ -875,7 +875,7 @@ void ResourceBundle::InitSharedInstance(Delegate* dele // On platforms other than iOS, 100P is always a supported scale factor. // For Windows we have a separate case in this function. supported_scale_factors.push_back(SCALE_FACTOR_100P); diff --git a/www/iridium/files/patch-ui_base_ui__base__features.cc b/www/iridium/files/patch-ui_base_ui__base__features.cc index 37754d5c96d4..aa850d8e1146 100644 --- a/www/iridium/files/patch-ui_base_ui__base__features.cc +++ b/www/iridium/files/patch-ui_base_ui__base__features.cc @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.cc.orig 2019-03-11 22:01:19 UTC +--- ui/base/ui_base_features.cc.orig 2020-03-16 18:40:43 UTC +++ ui/base/ui_base_features.cc -@@ -111,7 +111,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo +@@ -113,7 +113,7 @@ const base::Feature kEnableAutomaticUiAdjustmentsForTo "EnableAutomaticUiAdjustmentsForTouch", base::FEATURE_ENABLED_BY_DEFAULT}; #endif // defined(OS_WIN) || defined(OS_CHROMEOS) @@ -9,12 +9,12 @@ // Enables stylus appearing as touch when in contact with digitizer. const base::Feature kDirectManipulationStylus = { "DirectManipulationStylus", -@@ -121,7 +121,7 @@ const base::Feature kDirectManipulationStylus = { +@@ -123,7 +123,7 @@ const base::Feature kDirectManipulationStylus = { base::FEATURE_DISABLED_BY_DEFAULT #endif }; -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - const base::Feature kMash = {"Mash", base::FEATURE_DISABLED_BY_DEFAULT}; - + // Disable the FormControlsRefresh feature for all platforms. See + // crbug.com/1057669. diff --git a/www/iridium/files/patch-ui_base_ui__base__features.h b/www/iridium/files/patch-ui_base_ui__base__features.h index b82729f15f25..d86c205b8c2e 100644 --- a/www/iridium/files/patch-ui_base_ui__base__features.h +++ b/www/iridium/files/patch-ui_base_ui__base__features.h @@ -1,14 +1,15 @@ ---- ui/base/ui_base_features.h.orig 2019-03-11 22:01:19 UTC +--- ui/base/ui_base_features.h.orig 2020-03-16 18:40:43 UTC +++ ui/base/ui_base_features.h -@@ -46,9 +46,9 @@ UI_BASE_EXPORT bool IsUsingWMPointerForTouch(); - UI_BASE_EXPORT extern const base::Feature kEnableAutomaticUiAdjustmentsForTouch; +@@ -61,10 +61,10 @@ COMPONENT_EXPORT(UI_BASE_FEATURES) + extern const base::Feature kEnableAutomaticUiAdjustmentsForTouch; #endif // defined(OS_WIN) || defined(OS_CHROMEOS) -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - UI_BASE_EXPORT extern const base::Feature kDirectManipulationStylus; + COMPONENT_EXPORT(UI_BASE_FEATURES) + extern const base::Feature kDirectManipulationStylus; -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) - // Used to have ash (Chrome OS system UI) run in its own process. - // TODO(jamescook): Make flag only available in Chrome OS. + // Used to enable the new controls UI. + COMPONENT_EXPORT(UI_BASE_FEATURES) diff --git a/www/iridium/files/patch-ui_base_webui_web__ui__util.cc b/www/iridium/files/patch-ui_base_webui_web__ui__util.cc index d60216d5b592..422ea71485b9 100644 --- a/www/iridium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/iridium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- ui/base/webui/web_ui_util.cc.orig 2019-03-11 22:01:19 UTC +--- ui/base/webui/web_ui_util.cc.orig 2020-03-16 18:40:15 UTC +++ ui/base/webui/web_ui_util.cc -@@ -217,7 +217,7 @@ std::string GetFontFamily() { +@@ -236,7 +236,7 @@ std::string GetFontFamily() { // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced // into Ozone: crbug.com/320050 diff --git a/www/iridium/files/patch-ui_base_x_x11__shm__image__pool__base.cc b/www/iridium/files/patch-ui_base_x_x11__shm__image__pool__base.cc new file mode 100644 index 000000000000..7546426f2036 --- /dev/null +++ b/www/iridium/files/patch-ui_base_x_x11__shm__image__pool__base.cc @@ -0,0 +1,43 @@ +--- ui/base/x/x11_shm_image_pool_base.cc.orig 2020-03-16 18:40:43 UTC ++++ ui/base/x/x11_shm_image_pool_base.cc +@@ -16,6 +16,7 @@ + #include "base/environment.h" + #include "base/location.h" + #include "base/strings/string_util.h" ++#include "base/system/sys_info.h" + #include "base/threading/thread_task_runner_handle.h" + #include "build/build_config.h" + #include "net/base/url_util.h" +@@ -44,10 +45,14 @@ constexpr float kShmResizeShrinkThreshold = + 1.0f / (kShmResizeThreshold * kShmResizeThreshold); + + std::size_t MaxShmSegmentSizeImpl() { ++#if defined(OS_BSD) ++ return base::SysInfo::MaxSharedMemorySize(); ++#else + struct shminfo info; + if (shmctl(0, IPC_INFO, reinterpret_cast<struct shmid_ds*>(&info)) == -1) + return 0; + return info.shmmax; ++#endif + } + + std::size_t MaxShmSegmentSize() { +@@ -199,7 +204,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_ + shmctl(state.shminfo_.shmid, IPC_RMID, nullptr); + return false; + } +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // On Linux, a shmid can still be attached after IPC_RMID if otherwise + // kept alive. Detach before XShmAttach to prevent a memory leak in case + // the process dies. +@@ -209,7 +214,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_ + if (!XShmAttach(display_, &state.shminfo_)) + return false; + state.shmem_attached_to_server_ = true; +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + // The Linux-specific shmctl behavior above may not be portable, so we're + // forced to do IPC_RMID after the server has attached to the segment. + // XShmAttach is asynchronous, so we must also sync. diff --git a/www/iridium/files/patch-ui_compositor_compositor.cc b/www/iridium/files/patch-ui_compositor_compositor.cc new file mode 100644 index 000000000000..f89ddbcf2b9f --- /dev/null +++ b/www/iridium/files/patch-ui_compositor_compositor.cc @@ -0,0 +1,11 @@ +--- ui/compositor/compositor.cc.orig 2020-03-16 18:40:43 UTC ++++ ui/compositor/compositor.cc +@@ -669,7 +669,7 @@ void Compositor::OnFrameTokenChanged(uint32_t frame_to + NOTREACHED(); + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void Compositor::OnCompleteSwapWithNewSize(const gfx::Size& size) { + for (auto& observer : observer_list_) + observer.OnCompositingCompleteSwapWithNewSize(this, size); diff --git a/www/iridium/files/patch-ui_compositor_compositor.h b/www/iridium/files/patch-ui_compositor_compositor.h new file mode 100644 index 000000000000..89e662bc3e66 --- /dev/null +++ b/www/iridium/files/patch-ui_compositor_compositor.h @@ -0,0 +1,11 @@ +--- ui/compositor/compositor.h.orig 2020-03-16 18:40:43 UTC ++++ ui/compositor/compositor.h +@@ -380,7 +380,7 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerT + void OnFirstSurfaceActivation(const viz::SurfaceInfo& surface_info) override; + void OnFrameTokenChanged(uint32_t frame_token) override; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void OnCompleteSwapWithNewSize(const gfx::Size& size); + #endif + diff --git a/www/iridium/files/patch-ui_compositor_compositor__observer.h b/www/iridium/files/patch-ui_compositor_compositor__observer.h new file mode 100644 index 000000000000..deab6a8328f8 --- /dev/null +++ b/www/iridium/files/patch-ui_compositor_compositor__observer.h @@ -0,0 +1,16 @@ +--- ui/compositor/compositor_observer.h.orig 2019-12-17 19:56:41 UTC ++++ ui/compositor/compositor_observer.h +@@ -42,11 +42,11 @@ class COMPOSITOR_EXPORT CompositorObserver { + // Called when a child of the compositor is resizing. + virtual void OnCompositingChildResizing(Compositor* compositor) {} + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // Called when a swap with new size is completed. + virtual void OnCompositingCompleteSwapWithNewSize(ui::Compositor* compositor, + const gfx::Size& size) {} +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + // Called at the top of the compositor's destructor, to give observers a + // chance to remove themselves. diff --git a/www/iridium/files/patch-ui_compositor_host_host__context__factory__private.cc b/www/iridium/files/patch-ui_compositor_host_host__context__factory__private.cc new file mode 100644 index 000000000000..b7be4b020629 --- /dev/null +++ b/www/iridium/files/patch-ui_compositor_host_host__context__factory__private.cc @@ -0,0 +1,11 @@ +--- ui/compositor/host/host_context_factory_private.cc.orig 2020-03-16 18:40:43 UTC ++++ ui/compositor/host/host_context_factory_private.cc +@@ -29,7 +29,7 @@ namespace { + + static const char* kBrowser = "Browser"; + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + class HostDisplayClient : public viz::HostDisplayClient { + public: + explicit HostDisplayClient(ui::Compositor* compositor) diff --git a/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc b/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc index 9b27e63463b8..df1fa86b3c0d 100644 --- a/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc +++ b/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc @@ -1,6 +1,6 @@ ---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2019-03-11 22:01:19 UTC +--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2019-09-09 21:55:46 UTC +++ ui/events/devices/x11/device_data_manager_x11.cc -@@ -828,6 +828,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK +@@ -826,6 +826,8 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK } void DeviceDataManagerX11::DisableDevice(int deviceid) { @@ -9,7 +9,7 @@ blocked_devices_.set(deviceid, true); // TODO(rsadam@): Support blocking touchscreen devices. std::vector<InputDevice> keyboards = GetKeyboardDevices(); -@@ -838,6 +840,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid) +@@ -836,6 +838,7 @@ void DeviceDataManagerX11::DisableDevice(int deviceid) keyboards.erase(it); DeviceDataManager::OnKeyboardDevicesUpdated(keyboards); } diff --git a/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.cc b/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.cc index ae795aaebad6..2bae1687515b 100644 --- a/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.cc +++ b/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.cc @@ -1,11 +1,11 @@ ---- ui/events/keycodes/dom/keycode_converter.cc.orig 2019-03-11 22:01:19 UTC +--- ui/events/keycodes/dom/keycode_converter.cc.orig 2020-03-16 18:40:15 UTC +++ ui/events/keycodes/dom/keycode_converter.cc -@@ -19,7 +19,7 @@ namespace { - // and DOM Level 3 |code| strings. +@@ -20,7 +20,7 @@ namespace { #if defined(OS_WIN) - #define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, win, code} + #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ + { usb, win, code } -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) - #define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, xkb, code} + #define DOM_CODE(usb, evdev, xkb, win, mac, code, id) \ + { usb, xkb, code } #elif defined(OS_MACOSX) - #define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, mac, code} diff --git a/www/iridium/files/patch-ui_gfx_BUILD.gn b/www/iridium/files/patch-ui_gfx_BUILD.gn index d9c4ad8f22e7..be500c1b94d5 100644 --- a/www/iridium/files/patch-ui_gfx_BUILD.gn +++ b/www/iridium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/BUILD.gn.orig 2020-03-16 18:40:43 UTC +++ ui/gfx/BUILD.gn -@@ -532,7 +532,7 @@ jumbo_source_set("memory_buffer_sources") { +@@ -578,7 +578,7 @@ jumbo_source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/iridium/files/patch-ui_gfx_canvas__skia.cc b/www/iridium/files/patch-ui_gfx_canvas__skia.cc index 55e37cb92698..5d99916e4eb1 100644 --- a/www/iridium/files/patch-ui_gfx_canvas__skia.cc +++ b/www/iridium/files/patch-ui_gfx_canvas__skia.cc @@ -1,6 +1,6 @@ ---- ui/gfx/canvas_skia.cc.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/canvas_skia.cc.orig 2020-02-03 21:53:13 UTC +++ ui/gfx/canvas_skia.cc -@@ -209,7 +209,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin +@@ -206,7 +206,7 @@ void Canvas::DrawStringRectWithFlags(const base::strin Range range = StripAcceleratorChars(flags, &adjusted_text); bool elide_text = ((flags & NO_ELLIPSIS) == 0); diff --git a/www/iridium/files/patch-ui_gfx_font__fallback__linux.cc b/www/iridium/files/patch-ui_gfx_font__fallback__linux.cc index 9a275a8e8fa3..26597a5d4cb2 100644 --- a/www/iridium/files/patch-ui_gfx_font__fallback__linux.cc +++ b/www/iridium/files/patch-ui_gfx_font__fallback__linux.cc @@ -1,8 +1,8 @@ ---- ui/gfx/font_fallback_linux.cc.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/font_fallback_linux.cc.orig 2019-12-16 21:51:34 UTC +++ ui/gfx/font_fallback_linux.cc -@@ -15,6 +15,10 @@ - #include "base/memory/ptr_util.h" - #include "ui/gfx/font.h" +@@ -24,6 +24,10 @@ + #include "ui/gfx/linux/fontconfig_util.h" + #include "ui/gfx/platform_font.h" +#if defined(OS_BSD) +#include <unistd.h> diff --git a/www/iridium/files/patch-ui_gfx_font__names__testing.cc b/www/iridium/files/patch-ui_gfx_font__names__testing.cc new file mode 100644 index 000000000000..2c268488ae30 --- /dev/null +++ b/www/iridium/files/patch-ui_gfx_font__names__testing.cc @@ -0,0 +1,29 @@ +--- ui/gfx/font_names_testing.cc.orig 2020-04-06 08:38:05 UTC ++++ ui/gfx/font_names_testing.cc +@@ -22,7 +22,7 @@ Note that we have to support the full range from Jelly + dessert. + */ + +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) + const char kTestFontName[] = "Arimo"; + #elif defined(OS_ANDROID) + const char kTestFontName[] = "sans-serif"; +@@ -30,7 +30,7 @@ const char kTestFontName[] = "sans-serif"; + const char kTestFontName[] = "Arial"; + #endif + +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) + const char kSymbolFontName[] = "DejaVu Sans"; + #elif defined(OS_ANDROID) + const char kSymbolFontName[] = "monospace"; +@@ -40,7 +40,7 @@ const char kSymbolFontName[] = "Segoe UI Symbol"; + const char kSymbolFontName[] = "Symbol"; + #endif + +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) + const char kCJKFontName[] = "Noto Sans CJK JP"; + #elif defined(OS_ANDROID) + const char kCJKFontName[] = "serif"; diff --git a/www/iridium/files/patch-ui_gfx_font__render__params.h b/www/iridium/files/patch-ui_gfx_font__render__params.h index de06f9dd7cc9..5f0bb35c60b5 100644 --- a/www/iridium/files/patch-ui_gfx_font__render__params.h +++ b/www/iridium/files/patch-ui_gfx_font__render__params.h @@ -1,4 +1,4 @@ ---- ui/gfx/font_render_params.h.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/font_render_params.h.orig 2019-07-24 18:59:22 UTC +++ ui/gfx/font_render_params.h @@ -111,13 +111,13 @@ GFX_EXPORT FontRenderParams GetFontRenderParams( const FontRenderParamsQuery& query, @@ -11,8 +11,8 @@ GFX_EXPORT void ClearFontRenderParamsCacheForTest(); #endif --#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) -+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) +-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_FUCHSIA) // Gets the device scale factor to query the FontRenderParams. GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor(); - diff --git a/www/iridium/files/patch-ui_gfx_font__util.cc b/www/iridium/files/patch-ui_gfx_font__util.cc new file mode 100644 index 000000000000..70270c4ee997 --- /dev/null +++ b/www/iridium/files/patch-ui_gfx_font__util.cc @@ -0,0 +1,25 @@ +--- ui/gfx/font_util.cc.orig 2019-12-17 19:58:26 UTC ++++ ui/gfx/font_util.cc +@@ -6,7 +6,7 @@ + + #include "build/build_config.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include <fontconfig/fontconfig.h> + #include "ui/gfx/linux/fontconfig_util.h" + #endif +@@ -24,11 +24,11 @@ void InitializeFonts() { + // background (resources have not yet been granted to cast) since it prevents + // the long delay the user would have seen on first rendering. + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Ensures the config is created on this thread. + FcConfig* config = GetGlobalFontConfig(); + DCHECK(config); +-#endif // OS_LINUX ++#endif // OS_LINUX || OS_BSD + + #if defined(OS_WIN) + gfx::win::InitializeDirectWrite(); diff --git a/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.cc b/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.cc new file mode 100644 index 000000000000..fe42d4a3bace --- /dev/null +++ b/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.cc @@ -0,0 +1,11 @@ +--- ui/gfx/gpu_memory_buffer.cc.orig 2019-12-17 19:59:38 UTC ++++ ui/gfx/gpu_memory_buffer.cc +@@ -28,7 +28,7 @@ GpuMemoryBufferHandle GpuMemoryBufferHandle::Clone() c + handle.region = region.Duplicate(); + handle.offset = offset; + handle.stride = stride; +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) + handle.native_pixmap_handle = CloneHandleForIPC(native_pixmap_handle); + #elif defined(OS_MACOSX) && !defined(OS_IOS) + NOTIMPLEMENTED(); diff --git a/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h index 8090f7bcd79c..a05a77674080 100644 --- a/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h +++ b/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h @@ -1,11 +1,11 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/gpu_memory_buffer.h.orig 2020-02-03 21:53:13 UTC +++ ui/gfx/gpu_memory_buffer.h -@@ -16,7 +16,7 @@ +@@ -15,7 +15,7 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/gfx_export.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(USE_OZONE) || defined(OS_LINUX) ++#if defined(USE_OZONE) || defined(OS_LINUX) || defined(OS_BSD) #include "ui/gfx/native_pixmap_handle.h" #elif defined(OS_MACOSX) && !defined(OS_IOS) #include "ui/gfx/mac/io_surface.h" @@ -13,8 +13,8 @@ base::UnsafeSharedMemoryRegion region; uint32_t offset; int32_t stride; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // TODO(crbug.com/863011): convert this to a scoped handle. +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) NativePixmapHandle native_pixmap_handle; #elif defined(OS_MACOSX) && !defined(OS_IOS) + ScopedRefCountedIOSurfaceMachPort mach_port; diff --git a/www/iridium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h b/www/iridium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h index 1d215a19459a..22be111486c5 100644 --- a/www/iridium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h +++ b/www/iridium/files/patch-ui_gfx_ipc_gfx__param__traits__macros.h @@ -1,4 +1,4 @@ ---- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/ipc/gfx_param_traits_macros.h.orig 2019-10-21 19:07:29 UTC +++ ui/gfx/ipc/gfx_param_traits_macros.h @@ -18,7 +18,7 @@ #include "ui/gfx/selection_bound.h" @@ -13,17 +13,32 @@ IPC_STRUCT_TRAITS_MEMBER(region) IPC_STRUCT_TRAITS_MEMBER(offset) IPC_STRUCT_TRAITS_MEMBER(stride) --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle) #elif defined(OS_MACOSX) IPC_STRUCT_TRAITS_MEMBER(mach_port) -@@ -66,7 +66,7 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) +@@ -66,12 +66,12 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) IPC_STRUCT_TRAITS_MEMBER(id) IPC_STRUCT_TRAITS_END() --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_FUCHSIA) || defined(OS_BSD) IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapPlane) IPC_STRUCT_TRAITS_MEMBER(stride) IPC_STRUCT_TRAITS_MEMBER(offset) + IPC_STRUCT_TRAITS_MEMBER(size) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + IPC_STRUCT_TRAITS_MEMBER(fd) + #elif defined(OS_FUCHSIA) + IPC_STRUCT_TRAITS_MEMBER(vmo) +@@ -80,7 +80,7 @@ IPC_STRUCT_TRAITS_END() + + IPC_STRUCT_TRAITS_BEGIN(gfx::NativePixmapHandle) + IPC_STRUCT_TRAITS_MEMBER(planes) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + IPC_STRUCT_TRAITS_MEMBER(modifier) + #endif + #if defined(OS_FUCHSIA) diff --git a/www/iridium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc b/www/iridium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc index 3efa8ffce8ef..1741c4d863e8 100644 --- a/www/iridium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc +++ b/www/iridium/files/patch-ui_gfx_linux_client__native__pixmap__dmabuf.cc @@ -1,4 +1,4 @@ ---- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/linux/client_native_pixmap_dmabuf.cc.orig 2020-03-16 18:40:43 UTC +++ ui/gfx/linux/client_native_pixmap_dmabuf.cc @@ -5,7 +5,9 @@ #include "ui/gfx/linux/client_native_pixmap_dmabuf.h" @@ -10,9 +10,9 @@ #include <stddef.h> #include <sys/ioctl.h> #include <sys/mman.h> -@@ -18,11 +20,7 @@ - #include "base/trace_event/trace_event.h" - #include "build/build_config.h" +@@ -26,11 +28,7 @@ + #include "ui/gfx/buffer_format_util.h" + #include "ui/gfx/switches.h" -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -#include <linux/dma-buf.h> diff --git a/www/iridium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc b/www/iridium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc deleted file mode 100644 index 66b1f30c3c79..000000000000 --- a/www/iridium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- ui/gfx/mojo/buffer_types_struct_traits.cc.orig 2019-03-11 22:01:19 UTC -+++ ui/gfx/mojo/buffer_types_struct_traits.cc -@@ -28,7 +28,7 @@ bool StructTraits<gfx::mojom::BufferUsageAndFormatData - return data.ReadUsage(&out->usage) && data.ReadFormat(&out->format); - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - std::vector<mojo::ScopedHandle> - StructTraits<gfx::mojom::NativePixmapHandleDataView, gfx::NativePixmapHandle>:: - fds(const gfx::NativePixmapHandle& pixmap_handle) { -@@ -55,7 +55,7 @@ bool StructTraits< - } - return data.ReadPlanes(&out->planes); - } --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits< - gfx::mojom::GpuMemoryBufferHandleDataView, -@@ -68,7 +68,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra - return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle( - std::move(handle.region)); - case gfx::NATIVE_PIXMAP: --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle( - handle.native_pixmap_handle); - #else -@@ -144,7 +144,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat - out->type = gfx::SHARED_MEMORY_BUFFER; - out->region = std::move(platform_handle->get_shared_memory_handle()); - return true; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag:: - NATIVE_PIXMAP_HANDLE: - out->type = gfx::NATIVE_PIXMAP; diff --git a/www/iridium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h b/www/iridium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h deleted file mode 100644 index 08db910bf200..000000000000 --- a/www/iridium/files/patch-ui_gfx_mojo_buffer__types__struct__traits.h +++ /dev/null @@ -1,20 +0,0 @@ ---- ui/gfx/mojo/buffer_types_struct_traits.h.orig 2019-03-11 22:01:19 UTC -+++ ui/gfx/mojo/buffer_types_struct_traits.h -@@ -189,7 +189,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV - } - }; - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - template <> - struct StructTraits<gfx::mojom::NativePixmapPlaneDataView, - gfx::NativePixmapPlane> { -@@ -229,7 +229,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData - static bool Read(gfx::mojom::NativePixmapHandleDataView data, - gfx::NativePixmapHandle* out); - }; --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - template <> - struct StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView, diff --git a/www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc b/www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc new file mode 100644 index 000000000000..a2a977047d43 --- /dev/null +++ b/www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc @@ -0,0 +1,75 @@ +--- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2019-10-30 16:33:03 UTC ++++ ui/gfx/mojom/buffer_types_mojom_traits.cc +@@ -24,15 +24,15 @@ bool StructTraits<gfx::mojom::BufferUsageAndFormatData + return data.ReadUsage(&out->usage) && data.ReadFormat(&out->format); + } + +-#if defined(OS_LINUX) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) + mojo::ScopedHandle StructTraits< + gfx::mojom::NativePixmapPlaneDataView, + gfx::NativePixmapPlane>::buffer_handle(gfx::NativePixmapPlane& plane) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + return mojo::WrapPlatformFile(plane.fd.release()); + #elif defined(OS_FUCHSIA) + return mojo::WrapPlatformHandle(mojo::PlatformHandle(std::move(plane.vmo))); +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + } + + bool StructTraits< +@@ -45,7 +45,7 @@ bool StructTraits< + + mojo::PlatformHandle handle = + mojo::UnwrapPlatformHandle(data.TakeBufferHandle()); +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (!handle.is_fd()) + return false; + out->fd = handle.TakeFD(); +@@ -53,7 +53,7 @@ bool StructTraits< + if (!handle.is_handle()) + return false; + out->vmo = zx::vmo(handle.TakeHandle()); +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + return true; + } +@@ -62,7 +62,7 @@ bool StructTraits< + gfx::mojom::NativePixmapHandleDataView, + gfx::NativePixmapHandle>::Read(gfx::mojom::NativePixmapHandleDataView data, + gfx::NativePixmapHandle* out) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + out->modifier = data.modifier(); + #endif + +@@ -75,7 +75,7 @@ bool StructTraits< + + return data.ReadPlanes(&out->planes); + } +-#endif // defined(OS_LINUX) || defined(USE_OZONE) ++#endif // defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) + + gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits< + gfx::mojom::GpuMemoryBufferHandleDataView, +@@ -88,7 +88,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra + return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle( + std::move(handle.region)); + case gfx::NATIVE_PIXMAP: +-#if defined(OS_LINUX) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) + return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle( + std::move(handle.native_pixmap_handle)); + #else +@@ -164,7 +164,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat + out->type = gfx::SHARED_MEMORY_BUFFER; + out->region = std::move(platform_handle->get_shared_memory_handle()); + return true; +-#if defined(OS_LINUX) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) + case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag:: + NATIVE_PIXMAP_HANDLE: + out->type = gfx::NATIVE_PIXMAP; diff --git a/www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.h b/www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.h new file mode 100644 index 000000000000..b7e56d150e01 --- /dev/null +++ b/www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.h @@ -0,0 +1,29 @@ +--- ui/gfx/mojom/buffer_types_mojom_traits.h.orig 2019-12-16 21:51:08 UTC ++++ ui/gfx/mojom/buffer_types_mojom_traits.h +@@ -194,7 +194,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV + } + }; + +-#if defined(OS_LINUX) || defined(USE_OZONE) ++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) + template <> + struct StructTraits<gfx::mojom::NativePixmapPlaneDataView, + gfx::NativePixmapPlane> { +@@ -220,7 +220,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData + return pixmap_handle.planes; + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + static uint64_t modifier(const gfx::NativePixmapHandle& pixmap_handle) { + return pixmap_handle.modifier; + } +@@ -244,7 +244,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData + static bool Read(gfx::mojom::NativePixmapHandleDataView data, + gfx::NativePixmapHandle* out); + }; +-#endif // defined(OS_LINUX) || defined(USE_OZONE) ++#endif // defined(OS_LINUX) || defined(OS_BSD) || defined(USE_OZONE) + + template <> + struct StructTraits<gfx::mojom::GpuMemoryBufferHandleDataView, diff --git a/www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc b/www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc index 2d50ce0b11f4..20952718c93d 100644 --- a/www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc +++ b/www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc @@ -1,8 +1,8 @@ ---- ui/gfx/native_pixmap_handle.cc.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/native_pixmap_handle.cc.orig 2020-02-24 18:39:44 UTC +++ ui/gfx/native_pixmap_handle.cc -@@ -4,14 +4,14 @@ +@@ -8,11 +8,15 @@ - #include "ui/gfx/native_pixmap_handle.h" + #include "build/build_config.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) @@ -10,19 +10,55 @@ #include "base/posix/eintr_wrapper.h" #endif ++#if defined(OS_BSD) ++#include <unistd.h> ++#endif ++ + #if defined(OS_FUCHSIA) + #include <lib/zx/vmo.h> + #include "base/fuchsia/fuchsia_logging.h" +@@ -20,7 +24,7 @@ + namespace gfx { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - static_assert(NativePixmapPlane::kNoModifier == DRM_FORMAT_MOD_INVALID, - "gfx::NativePixmapPlane::kNoModifier should be an alias for" + static_assert(NativePixmapHandle::kNoModifier == DRM_FORMAT_MOD_INVALID, + "gfx::NativePixmapHandle::kNoModifier should be an alias for" "DRM_FORMAT_MOD_INVALID"); -@@ -36,7 +36,7 @@ NativePixmapHandle::NativePixmapHandle(const NativePix - - NativePixmapHandle::~NativePixmapHandle() {} - +@@ -31,7 +35,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of + NativePixmapPlane::NativePixmapPlane(int stride, + int offset, + uint64_t size -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) + , + base::ScopedFD fd + #elif defined(OS_FUCHSIA) +@@ -42,7 +46,7 @@ NativePixmapPlane::NativePixmapPlane(int stride, + : stride(stride), + offset(offset), + size(size) +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + , + fd(std::move(fd)) + #elif defined(OS_FUCHSIA) +@@ -70,7 +74,7 @@ NativePixmapHandle& NativePixmapHandle::operator=(Nati NativePixmapHandle CloneHandleForIPC(const NativePixmapHandle& handle) { NativePixmapHandle clone; - std::vector<base::ScopedFD> scoped_fds; + for (auto& plane : handle.planes) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + DCHECK(plane.fd.is_valid()); + base::ScopedFD fd_dup(HANDLE_EINTR(dup(plane.fd.get()))); + if (!fd_dup.is_valid()) { +@@ -96,7 +100,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma + #endif + } + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + clone.modifier = handle.modifier; + #endif + diff --git a/www/iridium/files/patch-ui_gfx_native__pixmap__handle.h b/www/iridium/files/patch-ui_gfx_native__pixmap__handle.h index ac73c77b8cf9..6306e267fbeb 100644 --- a/www/iridium/files/patch-ui_gfx_native__pixmap__handle.h +++ b/www/iridium/files/patch-ui_gfx_native__pixmap__handle.h @@ -1,28 +1,38 @@ ---- ui/gfx/native_pixmap_handle.h.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/native_pixmap_handle.h.orig 2019-10-21 19:07:29 UTC +++ ui/gfx/native_pixmap_handle.h -@@ -13,7 +13,7 @@ +@@ -15,7 +15,7 @@ #include "build/build_config.h" #include "ui/gfx/gfx_export.h" -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - #include "base/file_descriptor_posix.h" + #include "base/files/scoped_file.h" #endif -@@ -54,14 +54,14 @@ struct GFX_EXPORT NativePixmapHandle { - - ~NativePixmapHandle(); +@@ -32,7 +32,7 @@ struct GFX_EXPORT NativePixmapPlane { + NativePixmapPlane(int stride, + int offset, + uint64_t size +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + , + base::ScopedFD fd + #elif defined(OS_FUCHSIA) +@@ -53,7 +53,7 @@ struct GFX_EXPORT NativePixmapPlane { + // This is necessary to map the buffers. + uint64_t size; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // File descriptors for the underlying memory objects (usually dmabufs). - std::vector<base::FileDescriptor> fds; - #endif + // File descriptor for the underlying memory object (usually dmabuf). + base::ScopedFD fd; + #elif defined(OS_FUCHSIA) +@@ -82,7 +82,7 @@ struct GFX_EXPORT NativePixmapHandle { + std::vector<NativePixmapPlane> planes; - }; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - // Returns an instance of |handle| which can be sent over IPC. This duplicates - // the file-handles, so that the IPC code take ownership of them, without - // invalidating |handle|. + // The modifier is retrieved from GBM library and passed to EGL driver. + // Generally it's platform specific, and we don't need to modify it in + // Chromium code. Also one per plane per entry. diff --git a/www/iridium/files/patch-ui_gfx_render__text.cc b/www/iridium/files/patch-ui_gfx_render__text.cc index a805803da0a8..446317a3101a 100644 --- a/www/iridium/files/patch-ui_gfx_render__text.cc +++ b/www/iridium/files/patch-ui_gfx_render__text.cc @@ -1,6 +1,6 @@ ---- ui/gfx/render_text.cc.orig 2019-03-11 22:01:19 UTC +--- ui/gfx/render_text.cc.orig 2020-03-16 18:40:43 UTC +++ ui/gfx/render_text.cc -@@ -934,32 +934,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse +@@ -1169,32 +1169,33 @@ void RenderText::SetDisplayOffset(int horizontal_offse const int extra_content = GetContentWidth() - display_rect_.width(); const int cursor_width = cursor_enabled_ ? 1 : 0; diff --git a/www/iridium/files/patch-ui_gl_BUILD.gn b/www/iridium/files/patch-ui_gl_BUILD.gn index 36b25afba995..39f08eacf39a 100644 --- a/www/iridium/files/patch-ui_gl_BUILD.gn +++ b/www/iridium/files/patch-ui_gl_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gl/BUILD.gn.orig 2019-03-11 22:01:19 UTC +--- ui/gl/BUILD.gn.orig 2020-03-16 18:40:43 UTC +++ ui/gl/BUILD.gn -@@ -212,7 +212,7 @@ jumbo_component("gl") { +@@ -233,7 +233,7 @@ jumbo_component("gl") { ] } diff --git a/www/iridium/files/patch-ui_gl_generate__bindings.py b/www/iridium/files/patch-ui_gl_generate__bindings.py index e9bb6663cf9d..c3ea0a6c23a3 100644 --- a/www/iridium/files/patch-ui_gl_generate__bindings.py +++ b/www/iridium/files/patch-ui_gl_generate__bindings.py @@ -1,6 +1,6 @@ ---- ui/gl/generate_bindings.py.orig 2019-03-11 22:01:19 UTC +--- ui/gl/generate_bindings.py.orig 2020-03-16 18:40:43 UTC +++ ui/gl/generate_bindings.py -@@ -2624,6 +2624,9 @@ GLX_FUNCTIONS = [ +@@ -2777,6 +2777,9 @@ GLX_FUNCTIONS = [ 'arguments': 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' 'int32_t* denominator' }, diff --git a/www/iridium/files/patch-ui_gl_gl__bindings__autogen__glx.cc b/www/iridium/files/patch-ui_gl_gl__bindings__autogen__glx.cc index d94fc0f3246f..4aeda03a0414 100644 --- a/www/iridium/files/patch-ui_gl_gl__bindings__autogen__glx.cc +++ b/www/iridium/files/patch-ui_gl_gl__bindings__autogen__glx.cc @@ -1,4 +1,4 @@ ---- ui/gl/gl_bindings_autogen_glx.cc.orig 2019-03-11 22:01:19 UTC +--- ui/gl/gl_bindings_autogen_glx.cc.orig 2020-02-24 18:39:44 UTC +++ ui/gl/gl_bindings_autogen_glx.cc @@ -115,6 +115,8 @@ void DriverGLX::InitializeExtensionBindings() { @@ -32,7 +32,7 @@ void GLXApiBase::glXGetSelectedEventFn(Display* dpy, GLXDrawable drawable, unsigned long* mask) { -@@ -646,6 +657,11 @@ bool TraceGLXApi::glXGetMscRateOMLFn(Display* dpy, +@@ -647,6 +658,11 @@ bool TraceGLXApi::glXGetMscRateOMLFn(Display* dpy, return glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator); } @@ -44,7 +44,7 @@ void TraceGLXApi::glXGetSelectedEventFn(Display* dpy, GLXDrawable drawable, unsigned long* mask) { -@@ -1068,6 +1084,14 @@ bool DebugGLXApi::glXGetMscRateOMLFn(Display* dpy, +@@ -1068,6 +1084,14 @@ bool LogGLXApi::glXGetMscRateOMLFn(Display* dpy, << static_cast<const void*>(denominator) << ")"); bool result = glx_api_->glXGetMscRateOMLFn(dpy, drawable, numerator, denominator); @@ -52,7 +52,7 @@ + return result; +} + -+__GLXextFuncPtr DebugGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) { ++__GLXextFuncPtr LogGLXApi::glXGetProcAddressARBFn(const GLubyte* procName) { + GL_SERVICE_LOG("glXGetProcAddressARB" + << "(" << static_cast<const void*>(procName) << ")"); + __GLXextFuncPtr result = glx_api_->glXGetProcAddressARBFn(procName); diff --git a/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.cc b/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.cc index 72ae09b4d8c1..7295d4c6df5e 100644 --- a/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.cc +++ b/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.cc @@ -1,4 +1,4 @@ ---- ui/gl/sync_control_vsync_provider.cc.orig 2019-03-11 22:01:19 UTC +--- ui/gl/sync_control_vsync_provider.cc.orig 2019-04-30 22:23:42 UTC +++ ui/gl/sync_control_vsync_provider.cc @@ -11,7 +11,7 @@ #include "base/trace_event/trace_event.h" @@ -27,7 +27,7 @@ // The actual clock used for the system time returned by glXGetSyncValuesOML // is unspecified. In practice, the clock used is likely to be either // CLOCK_REALTIME or CLOCK_MONOTONIC, so we compare the returned time to the -@@ -157,11 +157,11 @@ bool SyncControlVSyncProvider::GetVSyncParametersIfAva +@@ -156,11 +156,11 @@ bool SyncControlVSyncProvider::GetVSyncParametersIfAva return true; #else return false; diff --git a/www/iridium/files/patch-ui_message__center_public_cpp_message__center__constants.h b/www/iridium/files/patch-ui_message__center_public_cpp_message__center__constants.h index a6db114882bc..8f993bfbfbc6 100644 --- a/www/iridium/files/patch-ui_message__center_public_cpp_message__center__constants.h +++ b/www/iridium/files/patch-ui_message__center_public_cpp_message__center__constants.h @@ -1,6 +1,6 @@ ---- ui/message_center/public/cpp/message_center_constants.h.orig 2019-03-11 22:01:19 UTC +--- ui/message_center/public/cpp/message_center_constants.h.orig 2019-06-04 18:55:50 UTC +++ ui/message_center/public/cpp/message_center_constants.h -@@ -101,7 +101,7 @@ const int kButtonHorizontalPadding = 16; // In DIPs. +@@ -105,7 +105,7 @@ const int kButtonHorizontalPadding = 16; // In DIPs. const int kButtonIconTopPadding = 11; // In DIPs. const int kButtonIconToTitlePadding = 16; // In DIPs. diff --git a/www/iridium/files/patch-ui_message__center_views_message__popup__view.cc b/www/iridium/files/patch-ui_message__center_views_message__popup__view.cc index 94960ecb60cb..7037f8a47604 100644 --- a/www/iridium/files/patch-ui_message__center_views_message__popup__view.cc +++ b/www/iridium/files/patch-ui_message__center_views_message__popup__view.cc @@ -1,11 +1,11 @@ ---- ui/message_center/views/message_popup_view.cc.orig 2019-03-11 22:01:19 UTC +--- ui/message_center/views/message_popup_view.cc.orig 2019-12-16 21:51:34 UTC +++ ui/message_center/views/message_popup_view.cc -@@ -114,7 +114,7 @@ void MessagePopupView::AutoCollapse() { +@@ -101,7 +101,7 @@ void MessagePopupView::AutoCollapse() { void MessagePopupView::Show() { views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); - params.keep_on_top = true; + params.z_order = ui::ZOrderLevel::kFloatingWindow; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) - params.opacity = views::Widget::InitParams::OPAQUE_WINDOW; - #else - params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + // Make the widget explicitly activatable as TYPE_POPUP is not activatable by + // default but we need focus for the inline reply textarea. + params.activatable = views::Widget::InitParams::ACTIVATABLE_YES; diff --git a/www/iridium/files/patch-ui_native__theme_native__theme.h b/www/iridium/files/patch-ui_native__theme_native__theme.h index 188ebfb75cfa..af4951e7fb10 100644 --- a/www/iridium/files/patch-ui_native__theme_native__theme.h +++ b/www/iridium/files/patch-ui_native__theme_native__theme.h @@ -1,6 +1,6 @@ ---- ui/native_theme/native_theme.h.orig 2019-03-11 22:01:19 UTC +--- ui/native_theme/native_theme.h.orig 2019-10-21 19:07:29 UTC +++ ui/native_theme/native_theme.h -@@ -48,7 +48,7 @@ class NATIVE_THEME_EXPORT NativeTheme { +@@ -49,7 +49,7 @@ class NATIVE_THEME_EXPORT NativeTheme { // The part to be painted / sized. enum Part { kCheckbox, diff --git a/www/iridium/files/patch-ui_native__theme_native__theme__base.cc b/www/iridium/files/patch-ui_native__theme_native__theme__base.cc index 81633414c0a8..96f69fe1f796 100644 --- a/www/iridium/files/patch-ui_native__theme_native__theme__base.cc +++ b/www/iridium/files/patch-ui_native__theme_native__theme__base.cc @@ -1,11 +1,11 @@ ---- ui/native_theme/native_theme_base.cc.orig 2019-03-11 22:01:19 UTC +--- ui/native_theme/native_theme_base.cc.orig 2020-03-16 18:40:43 UTC +++ ui/native_theme/native_theme_base.cc -@@ -172,7 +172,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, +@@ -256,7 +256,7 @@ void NativeThemeBase::Paint(cc::PaintCanvas* canvas, case kCheckbox: - PaintCheckbox(canvas, state, rect, extra.button); + PaintCheckbox(canvas, state, rect, extra.button, color_scheme); break; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) case kFrameTopArea: - PaintFrameTopArea(canvas, state, rect, extra.frame_top_area); - break; + PaintFrameTopArea(canvas, state, rect, extra.frame_top_area, + color_scheme); diff --git a/www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h b/www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h new file mode 100644 index 000000000000..78b9f0444781 --- /dev/null +++ b/www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h @@ -0,0 +1,20 @@ +--- ui/platform_window/platform_window_init_properties.h.orig 2020-02-24 18:40:16 UTC ++++ ui/platform_window/platform_window_init_properties.h +@@ -41,7 +41,7 @@ enum class PlatformWindowOpacity { + + class WorkspaceExtensionDelegate; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + class X11ExtensionDelegate; + #endif + +@@ -82,7 +82,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo + + WorkspaceExtensionDelegate* workspace_extension_delegate = nullptr; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + bool prefer_dark_theme = false; + gfx::ImageSkia* icon = nullptr; + base::Optional<int> background_color; diff --git a/www/iridium/files/patch-ui_strings_app__locale__settings.grd b/www/iridium/files/patch-ui_strings_app__locale__settings.grd index 85b2669a3adb..9341a0bc5305 100644 --- a/www/iridium/files/patch-ui_strings_app__locale__settings.grd +++ b/www/iridium/files/patch-ui_strings_app__locale__settings.grd @@ -1,6 +1,6 @@ ---- ui/strings/app_locale_settings.grd.orig 2019-03-11 22:01:19 UTC +--- ui/strings/app_locale_settings.grd.orig 2020-03-16 18:40:15 UTC +++ ui/strings/app_locale_settings.grd -@@ -187,7 +187,7 @@ +@@ -216,7 +216,7 @@ 75% </message> </if> diff --git a/www/iridium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc b/www/iridium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc index 784570afe3fd..4cdcd2b4bfd1 100644 --- a/www/iridium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc +++ b/www/iridium/files/patch-ui_views_bubble_bubble__dialog__delegate__view.cc @@ -1,6 +1,6 @@ ---- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2019-03-11 22:01:19 UTC +--- ui/views/bubble/bubble_dialog_delegate_view.cc.orig 2020-03-16 18:40:43 UTC +++ ui/views/bubble/bubble_dialog_delegate_view.cc -@@ -112,7 +112,7 @@ Widget* BubbleDialogDelegateView::CreateBubble( +@@ -174,7 +174,7 @@ Widget* BubbleDialogDelegateView::CreateBubble( bubble_delegate->SetAnchorView(bubble_delegate->GetAnchorView()); Widget* bubble_widget = CreateBubbleWidget(bubble_delegate); diff --git a/www/iridium/files/patch-ui_views_controls_label.cc b/www/iridium/files/patch-ui_views_controls_label.cc index b1f04455a0f4..f6f9790bdbae 100644 --- a/www/iridium/files/patch-ui_views_controls_label.cc +++ b/www/iridium/files/patch-ui_views_controls_label.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/label.cc.orig 2019-03-11 22:01:19 UTC +--- ui/views/controls/label.cc.orig 2020-02-03 21:53:40 UTC +++ ui/views/controls/label.cc -@@ -542,7 +542,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event +@@ -695,7 +695,7 @@ bool Label::OnMousePressed(const ui::MouseEvent& event GetFocusManager()->SetFocusedView(this); } @@ -9,12 +9,12 @@ if (event.IsOnlyMiddleMouseButton() && GetFocusManager() && !had_focus) GetFocusManager()->SetFocusedView(this); #endif -@@ -727,7 +727,7 @@ bool Label::PasteSelectionClipboard() { +@@ -880,7 +880,7 @@ bool Label::PasteSelectionClipboard() { } void Label::UpdateSelectionClipboard() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - if (!obscured()) { - ui::ScopedClipboardWriter(ui::CLIPBOARD_TYPE_SELECTION) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + if (!GetObscured()) { + ui::ScopedClipboardWriter(ui::ClipboardBuffer::kSelection) .WriteText(GetSelectedText()); diff --git a/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc b/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc index 974edeb7d427..f22c358d52d8 100644 --- a/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2019-03-11 22:01:19 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2020-03-16 18:40:43 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -59,7 +59,7 @@ +@@ -60,7 +60,7 @@ #include "base/win/win_util.h" #endif @@ -9,10 +9,10 @@ #include "base/strings/utf_string_conversions.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -162,14 +162,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke - case ui::VKEY_BACK: - if (!control) +@@ -183,14 +183,14 @@ ui::TextEditCommand GetCommandForKeyEvent(const ui::Ke + #endif return ui::TextEditCommand::DELETE_BACKWARD; + } -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // Only erase by line break on Linux and ChromeOS. @@ -26,7 +26,7 @@ // Only erase by line break on Linux and ChromeOS. if (shift && control) return ui::TextEditCommand::DELETE_TO_END_OF_LINE; -@@ -228,7 +228,7 @@ bool IsControlKeyModifier(int flags) { +@@ -258,7 +258,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -35,7 +35,7 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -682,7 +682,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e +@@ -730,7 +730,7 @@ bool Textfield::OnMousePressed(const ui::MouseEvent& e #endif } @@ -44,7 +44,7 @@ if (!handled && !had_focus && event.IsOnlyMiddleMouseButton()) RequestFocusWithPointer(ui::EventPointerType::POINTER_TYPE_MOUSE); #endif -@@ -726,7 +726,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -776,7 +776,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event if (!textfield) return handled; @@ -53,7 +53,7 @@ ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -894,7 +894,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo +@@ -923,7 +923,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo } bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { @@ -62,12 +62,12 @@ // Skip any accelerator handling that conflicts with custom keybindings. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = ui::GetTextEditKeyBindingsDelegate(); -@@ -2076,7 +2076,7 @@ bool Textfield::PasteSelectionClipboard() { +@@ -2182,7 +2182,7 @@ bool Textfield::PasteSelectionClipboard() { } void Textfield::UpdateSelectionClipboard() { -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) if (text_input_type_ != ui::TEXT_INPUT_TYPE_PASSWORD) { - ui::ScopedClipboardWriter(ui::CLIPBOARD_TYPE_SELECTION) + ui::ScopedClipboardWriter(ui::ClipboardBuffer::kSelection) .WriteText(GetSelectedText()); diff --git a/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc b/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc index ec9c9de96153..af036b2cf5d1 100644 --- a/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc +++ b/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc @@ -1,11 +1,11 @@ ---- ui/views/corewm/tooltip_aura.cc.orig 2019-03-11 22:01:19 UTC +--- ui/views/corewm/tooltip_aura.cc.orig 2019-12-16 21:51:34 UTC +++ ui/views/corewm/tooltip_aura.cc -@@ -34,7 +34,7 @@ const int kCursorOffsetY = 15; +@@ -43,7 +43,7 @@ constexpr int kVerticalPaddingBottom = 5; // TODO(varkha): Update if native widget can be transparent on Linux. bool CanUseTranslucentTooltipWidget() { --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) +-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_WIN) || defined(OS_BSD) return false; #else return true; diff --git a/www/iridium/files/patch-ui_views_examples_widget__example.cc b/www/iridium/files/patch-ui_views_examples_widget__example.cc index 8f0e0596f493..ae3eee7d03ac 100644 --- a/www/iridium/files/patch-ui_views_examples_widget__example.cc +++ b/www/iridium/files/patch-ui_views_examples_widget__example.cc @@ -1,6 +1,6 @@ ---- ui/views/examples/widget_example.cc.orig 2019-03-11 22:01:19 UTC +--- ui/views/examples/widget_example.cc.orig 2020-02-03 21:53:14 UTC +++ ui/views/examples/widget_example.cc -@@ -79,7 +79,7 @@ void WidgetExample::CreateExampleView(View* container) +@@ -70,7 +70,7 @@ void WidgetExample::CreateExampleView(View* container) BuildButton(container, "Popup widget", POPUP); BuildButton(container, "Dialog widget", DIALOG); BuildButton(container, "Modal Dialog", MODAL_DIALOG); diff --git a/www/iridium/files/patch-ui_views_selection__controller.cc b/www/iridium/files/patch-ui_views_selection__controller.cc index f921809afa5b..9504c67a2803 100644 --- a/www/iridium/files/patch-ui_views_selection__controller.cc +++ b/www/iridium/files/patch-ui_views_selection__controller.cc @@ -1,6 +1,6 @@ ---- ui/views/selection_controller.cc.orig 2019-03-11 22:01:19 UTC +--- ui/views/selection_controller.cc.orig 2019-12-16 21:51:09 UTC +++ ui/views/selection_controller.cc -@@ -20,7 +20,7 @@ SelectionController::SelectionController(SelectionCont +@@ -22,7 +22,7 @@ SelectionController::SelectionController(SelectionCont delegate_(delegate), handles_selection_clipboard_(false) { // On Linux, update the selection clipboard on a text selection. diff --git a/www/iridium/files/patch-ui_views_style_platform__style.cc b/www/iridium/files/patch-ui_views_style_platform__style.cc index 2c76de33fe03..28a000e3e6de 100644 --- a/www/iridium/files/patch-ui_views_style_platform__style.cc +++ b/www/iridium/files/patch-ui_views_style_platform__style.cc @@ -1,11 +1,11 @@ ---- ui/views/style/platform_style.cc.orig 2019-03-11 22:01:19 UTC +--- ui/views/style/platform_style.cc.orig 2020-02-03 21:53:14 UTC +++ ui/views/style/platform_style.cc -@@ -18,7 +18,7 @@ +@@ -74,7 +74,7 @@ gfx::Range PlatformStyle::RangeToDeleteBackwards(const - #if defined(OS_CHROMEOS) - #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) - #define DESKTOP_LINUX - #endif + #endif // OS_MACOSX +-#if !BUILDFLAG(ENABLE_DESKTOP_AURA) || !defined(OS_LINUX) ++#if !BUILDFLAG(ENABLE_DESKTOP_AURA) || (!defined(OS_LINUX) && !defined(OS_BSD)) + // static + std::unique_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder( + LabelButton* button) { diff --git a/www/iridium/files/patch-ui_views_views__delegate.cc b/www/iridium/files/patch-ui_views_views__delegate.cc index 52b9c44aa3e8..6ed6c077584f 100644 --- a/www/iridium/files/patch-ui_views_views__delegate.cc +++ b/www/iridium/files/patch-ui_views_views__delegate.cc @@ -1,11 +1,11 @@ ---- ui/views/views_delegate.cc.orig 2019-03-11 22:01:19 UTC +--- ui/views/views_delegate.cc.orig 2020-02-03 21:53:14 UTC +++ ui/views/views_delegate.cc @@ -85,7 +85,7 @@ HICON ViewsDelegate::GetSmallWindowIcon() const { bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const { return false; } --#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD) +-#elif defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA) ++#elif (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA) gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const { return nullptr; } diff --git a/www/iridium/files/patch-ui_views_views__delegate.h b/www/iridium/files/patch-ui_views_views__delegate.h index d0fd56aee4ef..b5bdee958617 100644 --- a/www/iridium/files/patch-ui_views_views__delegate.h +++ b/www/iridium/files/patch-ui_views_views__delegate.h @@ -1,11 +1,11 @@ ---- ui/views/views_delegate.h.orig 2019-03-11 22:01:19 UTC +--- ui/views/views_delegate.h.orig 2020-02-03 21:53:14 UTC +++ ui/views/views_delegate.h -@@ -146,7 +146,7 @@ class VIEWS_EXPORT ViewsDelegate { +@@ -131,7 +131,7 @@ class VIEWS_EXPORT ViewsDelegate { // Returns true if the window passed in is in the Windows 8 metro // environment. virtual bool IsWindowInMetro(gfx::NativeWindow window) const; --#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_FREEBSD) +-#elif defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA) ++#elif (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA) virtual gfx::ImageSkia* GetDefaultWindowIcon() const; #endif diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index 9d48115a485a..ab44393b52fb 100644 --- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,20 +1,11 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2019-03-17 17:58:04 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2020-03-16 18:40:43 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -89,7 +89,7 @@ void DesktopWindowTreeHostPlatform::OnNativeWidgetCrea - const Widget::InitParams& params) { - native_widget_delegate_->OnNativeWidgetCreated(); - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // Setup a non_client_window_event_filter, which handles resize/move, double - // click and other events. - DCHECK(!non_client_window_event_filter_); -@@ -540,7 +540,7 @@ void DesktopWindowTreeHostPlatform::Relayout() { - } - - void DesktopWindowTreeHostPlatform::RemoveNonClientEventFilter() { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - if (!non_client_window_event_filter_) - return; +@@ -747,7 +747,7 @@ void DesktopWindowTreeHostPlatform::AddAdditionalInitP + // DesktopWindowTreeHost: + // Linux subclasses this host and adds some Linux specific bits. +-#if !defined(OS_LINUX) ++#if !defined(OS_LINUX) && !defined(OS_BSD) + // static + DesktopWindowTreeHost* DesktopWindowTreeHost::Create( + internal::NativeWidgetDelegate* native_widget_delegate, diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h deleted file mode 100644 index 5cd4277bdb55..000000000000 --- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h.orig 2019-03-17 17:59:02 UTC -+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h -@@ -119,7 +119,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform - - bool is_active_ = false; - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - // A handler for events intended for non client area. - std::unique_ptr<WindowEventFilter> non_client_window_event_filter_; - #endif diff --git a/www/iridium/files/patch-ui_views_widget_native__widget__aura.cc b/www/iridium/files/patch-ui_views_widget_native__widget__aura.cc new file mode 100644 index 000000000000..61706964d7c0 --- /dev/null +++ b/www/iridium/files/patch-ui_views_widget_native__widget__aura.cc @@ -0,0 +1,27 @@ +--- ui/views/widget/native_widget_aura.cc.orig 2020-03-16 18:40:43 UTC ++++ ui/views/widget/native_widget_aura.cc +@@ -64,7 +64,7 @@ + #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h" + #endif + +-#if BUILDFLAG(ENABLE_DESKTOP_AURA) && defined(OS_LINUX) ++#if BUILDFLAG(ENABLE_DESKTOP_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) + #include "ui/views/linux_ui/linux_ui.h" + #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h" + #endif +@@ -1099,13 +1099,13 @@ void Widget::CloseAllSecondaryWidgets() { + EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, 0); + #endif + +-#if BUILDFLAG(ENABLE_DESKTOP_AURA) && defined(OS_LINUX) ++#if BUILDFLAG(ENABLE_DESKTOP_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) + DesktopWindowTreeHostLinux::CleanUpWindowList(CloseWindow); + #endif + } + + const ui::NativeTheme* Widget::GetNativeTheme() const { +-#if BUILDFLAG(ENABLE_DESKTOP_AURA) && defined(OS_LINUX) ++#if BUILDFLAG(ENABLE_DESKTOP_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) + const LinuxUI* linux_ui = LinuxUI::instance(); + if (linux_ui) { + ui::NativeTheme* native_theme = diff --git a/www/iridium/files/patch-ui_views_window_custom__frame__view.cc b/www/iridium/files/patch-ui_views_window_custom__frame__view.cc index a5b874437720..4c35d22da5da 100644 --- a/www/iridium/files/patch-ui_views_window_custom__frame__view.cc +++ b/www/iridium/files/patch-ui_views_window_custom__frame__view.cc @@ -1,6 +1,6 @@ ---- ui/views/window/custom_frame_view.cc.orig 2019-03-11 22:01:19 UTC +--- ui/views/window/custom_frame_view.cc.orig 2019-09-09 21:55:47 UTC +++ ui/views/window/custom_frame_view.cc -@@ -305,7 +305,7 @@ int CustomFrameView::NonClientTopBorderHeight() const +@@ -287,7 +287,7 @@ int CustomFrameView::NonClientTopBorderHeight() const int CustomFrameView::CaptionButtonY() const { // Maximized buttons start at window top so that even if their images aren't // drawn flush with the screen edge, they still obey Fitts' Law. diff --git a/www/iridium/files/patch-ui_views_window_dialog__delegate.cc b/www/iridium/files/patch-ui_views_window_dialog__delegate.cc index d3c99fcca7c6..b92881838304 100644 --- a/www/iridium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/iridium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,11 +1,11 @@ ---- ui/views/window/dialog_delegate.cc.orig 2019-03-11 22:01:19 UTC +--- ui/views/window/dialog_delegate.cc.orig 2020-02-03 21:53:40 UTC +++ ui/views/window/dialog_delegate.cc -@@ -64,7 +64,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInit - params.bounds = bounds; - DialogDelegate* dialog = delegate->AsDialogDelegate(); +@@ -59,7 +59,7 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDeleg --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // static + bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { +-#if defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA) // The new style doesn't support unparented dialogs on Linux desktop. - if (dialog) - dialog->supports_custom_frame_ &= parent != NULL; + return parent != nullptr; + #elif defined(OS_WIN) diff --git a/www/iridium/files/patch-ui_views_window_frame__background.cc b/www/iridium/files/patch-ui_views_window_frame__background.cc index b4784f5e246b..18a363a65e8f 100644 --- a/www/iridium/files/patch-ui_views_window_frame__background.cc +++ b/www/iridium/files/patch-ui_views_window_frame__background.cc @@ -1,11 +1,11 @@ ---- ui/views/window/frame_background.cc.orig 2019-03-11 22:01:19 UTC +--- ui/views/window/frame_background.cc.orig 2020-02-03 21:53:14 UTC +++ ui/views/window/frame_background.cc -@@ -122,7 +122,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv +@@ -107,7 +107,7 @@ void FrameBackground::PaintMaximized(gfx::Canvas* canv const View* view) const { // Fill the top with the frame color first so we have a constant background // for areas not covered by the theme image. --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) +-#if defined(OS_LINUX) && BUILDFLAG(ENABLE_DESKTOP_AURA) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(ENABLE_DESKTOP_AURA) auto* native_theme = view->GetNativeTheme(); ui::NativeTheme::ExtraParams params; params.frame_top_area.use_custom_frame = use_custom_frame_; diff --git a/www/iridium/files/patch-ui_webui_resources_js_cr.js b/www/iridium/files/patch-ui_webui_resources_js_cr.js index 9f4e8730e896..2df5b1190a27 100644 --- a/www/iridium/files/patch-ui_webui_resources_js_cr.js +++ b/www/iridium/files/patch-ui_webui_resources_js_cr.js @@ -1,8 +1,8 @@ ---- ui/webui/resources/js/cr.js.orig 2019-03-11 22:01:19 UTC +--- ui/webui/resources/js/cr.js.orig 2019-12-16 21:51:34 UTC +++ ui/webui/resources/js/cr.js -@@ -463,6 +463,11 @@ var cr = cr || function(global) { - get doc() { - return document; +@@ -437,6 +437,11 @@ var cr = cr || function(global) { + get isMac() { + return /Mac/.test(navigator.platform); }, + + /** Whether this is on *BSD. */ @@ -10,5 +10,5 @@ + return /BSD/.test(navigator.userAgent); + }, - /** Whether we are using a Mac or not. */ - get isMac() { + /** Whether this is on the Windows platform or not. */ + get isWindows() { diff --git a/www/iridium/files/patch-ui_webui_resources_js_icon.js b/www/iridium/files/patch-ui_webui_resources_js_icon.js index e102e257ce76..26d3260b5cff 100644 --- a/www/iridium/files/patch-ui_webui_resources_js_icon.js +++ b/www/iridium/files/patch-ui_webui_resources_js_icon.js @@ -1,6 +1,6 @@ ---- ui/webui/resources/js/icon.js.orig 2019-03-11 22:01:19 UTC +--- ui/webui/resources/js/icon.js.orig 2019-10-21 19:07:29 UTC +++ ui/webui/resources/js/icon.js -@@ -14,7 +14,7 @@ cr.define('cr.icon', function() { +@@ -16,7 +16,7 @@ cr.define('cr.icon', function() { // supports SCALE_FACTOR_100P on all non-iOS platforms. supportedScaleFactors.push(1); } diff --git a/www/iridium/files/patch-v8_BUILD.gn b/www/iridium/files/patch-v8_BUILD.gn index 8e9be5b72ff6..0fe25aa48094 100644 --- a/www/iridium/files/patch-v8_BUILD.gn +++ b/www/iridium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2019-03-11 22:08:08 UTC +--- v8/BUILD.gn.orig 2020-03-16 18:42:16 UTC +++ v8/BUILD.gn -@@ -3160,7 +3160,7 @@ v8_component("v8_libbase") { +@@ -3616,7 +3616,7 @@ v8_component("v8_libbase") { } } @@ -9,7 +9,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -3180,6 +3180,12 @@ v8_component("v8_libbase") { +@@ -3636,6 +3636,12 @@ v8_component("v8_libbase") { "dl", "rt", ] @@ -22,9 +22,9 @@ } else if (is_android) { if (current_toolchain == host_toolchain) { libs = [ -@@ -3384,6 +3390,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapsho - "src/snapshot/embedded-file-writer.h", +@@ -3891,6 +3897,7 @@ if (current_toolchain == v8_snapshot_toolchain) { "src/snapshot/mksnapshot.cc", + "src/snapshot/snapshot-empty.cc", ] + libs = ["execinfo"] diff --git a/www/iridium/files/patch-v8_include_v8config.h b/www/iridium/files/patch-v8_include_v8config.h new file mode 100644 index 000000000000..18b8adbb56b8 --- /dev/null +++ b/www/iridium/files/patch-v8_include_v8config.h @@ -0,0 +1,21 @@ +--- v8/include/v8config.h.orig 2020-03-03 18:55:34 UTC ++++ v8/include/v8config.h +@@ -273,7 +273,18 @@ + # define V8_HAS_ATTRIBUTE_WARN_UNUSED_RESULT \ + (__has_attribute(warn_unused_result)) + ++// Work around Clang bug present in 9.0.1, at least. ++// ++// Clang stores alignment as a 32-bit unsigned integer, but V8 only uses ++// V8_ASSUME_ALIGNED() for a 4GB (2^32) alignment ++// (kPtrComprIsolateRootAlignment). As such, the alignment overflows and ++// becomes zero, triggering an internal Clang assertion that alignment must not ++// be zero. ++#if 0 + # define V8_HAS_BUILTIN_ASSUME_ALIGNED (__has_builtin(__builtin_assume_aligned)) ++#else ++# define V8_HAS_BUILTIN_ASSUME_ALIGNED 0 ++#endif + # define V8_HAS_BUILTIN_BSWAP16 (__has_builtin(__builtin_bswap16)) + # define V8_HAS_BUILTIN_BSWAP32 (__has_builtin(__builtin_bswap32)) + # define V8_HAS_BUILTIN_BSWAP64 (__has_builtin(__builtin_bswap64)) diff --git a/www/iridium/files/patch-v8_src_api.cc b/www/iridium/files/patch-v8_src_api.cc deleted file mode 100644 index 19e538ee0a8f..000000000000 --- a/www/iridium/files/patch-v8_src_api.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- v8/src/api.cc.orig 2019-03-11 22:08:08 UTC -+++ v8/src/api.cc -@@ -107,7 +107,7 @@ - #include "src/wasm/wasm-result.h" - #include "src/wasm/wasm-serialization.h" - --#if V8_OS_LINUX || V8_OS_MACOSX -+#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_OPENBSD || V8_OS_FREEBSD - #include <signal.h> - #include "include/v8-wasm-trap-handler-posix.h" - #include "src/trap-handler/handler-inside-posix.h" -@@ -5759,7 +5759,7 @@ bool v8::V8::Initialize() { - return true; - } - --#if V8_OS_LINUX || V8_OS_MACOSX -+#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_OPENBSD || V8_OS_FREEBSD - bool TryHandleWebAssemblyTrapPosix(int sig_code, siginfo_t* info, - void* context) { - #if V8_TARGET_ARCH_X64 && !V8_OS_ANDROID diff --git a/www/iridium/files/patch-v8_src_api_api.cc b/www/iridium/files/patch-v8_src_api_api.cc new file mode 100644 index 000000000000..f32636389a90 --- /dev/null +++ b/www/iridium/files/patch-v8_src_api_api.cc @@ -0,0 +1,11 @@ +--- v8/src/api/api.cc.orig 2020-03-16 18:42:16 UTC ++++ v8/src/api/api.cc +@@ -5657,7 +5657,7 @@ bool v8::V8::Initialize() { + return true; + } + +-#if V8_OS_LINUX || V8_OS_MACOSX ++#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_OPENBSD || V8_OS_FREEBSD + bool TryHandleWebAssemblyTrapPosix(int sig_code, siginfo_t* info, + void* context) { + #if V8_TARGET_ARCH_X64 && !V8_OS_ANDROID diff --git a/www/iridium/files/patch-v8_src_base_cpu.cc b/www/iridium/files/patch-v8_src_base_cpu.cc index 90464f2308d7..c11e6a384aa0 100644 --- a/www/iridium/files/patch-v8_src_base_cpu.cc +++ b/www/iridium/files/patch-v8_src_base_cpu.cc @@ -1,6 +1,6 @@ ---- v8/src/base/cpu.cc.orig 2019-03-11 22:08:08 UTC +--- v8/src/base/cpu.cc.orig 2019-12-16 21:56:22 UTC +++ v8/src/base/cpu.cc -@@ -424,6 +424,7 @@ CPU::CPU() +@@ -422,6 +422,7 @@ CPU::CPU() #if V8_OS_LINUX @@ -8,7 +8,7 @@ CPUInfo cpu_info; // Extract implementor from the "CPU implementer" field. -@@ -457,6 +458,7 @@ CPU::CPU() +@@ -455,6 +456,7 @@ CPU::CPU() } delete[] part; } diff --git a/www/iridium/files/patch-v8_src_base_platform_platform-freebsd.cc b/www/iridium/files/patch-v8_src_base_platform_platform-freebsd.cc new file mode 100644 index 000000000000..14e3ac15e039 --- /dev/null +++ b/www/iridium/files/patch-v8_src_base_platform_platform-freebsd.cc @@ -0,0 +1,13 @@ +--- v8/src/base/platform/platform-freebsd.cc.orig 2020-03-24 16:12:11 UTC ++++ v8/src/base/platform/platform-freebsd.cc +@@ -81,8 +81,8 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib + lib_name = std::string(path); + } + result.push_back(SharedLibraryAddress( +- lib_name, reinterpret_cast<uintptr_t>(map->kve_start), +- reinterpret_cast<uintptr_t>(map->kve_end))); ++ lib_name, static_cast<uintptr_t>(map->kve_start), ++ static_cast<uintptr_t>(map->kve_end))); + } + + start += ssize; diff --git a/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc b/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc index 51a51dce2cf6..e60a94f246f1 100644 --- a/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,6 +1,6 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2019-04-05 00:55:20 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2020-02-03 21:55:00 UTC +++ v8/src/base/platform/platform-posix.cc -@@ -376,7 +376,7 @@ bool OS::DiscardSystemPages(void* address, size_t size +@@ -427,7 +427,7 @@ bool OS::DiscardSystemPages(void* address, size_t size // static bool OS::HasLazyCommits() { @@ -9,7 +9,7 @@ return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -501,6 +501,12 @@ int OS::GetCurrentThreadId() { +@@ -558,6 +558,12 @@ int OS::GetCurrentThreadId() { return static_cast<int>(syscall(__NR_gettid)); #elif V8_OS_ANDROID return static_cast<int>(gettid()); diff --git a/www/iridium/files/patch-v8_src_external-reference-table.cc b/www/iridium/files/patch-v8_src_external-reference-table.cc deleted file mode 100644 index 9ca737217419..000000000000 --- a/www/iridium/files/patch-v8_src_external-reference-table.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- v8/src/external-reference-table.cc.orig 2019-03-17 16:08:28 UTC -+++ v8/src/external-reference-table.cc -@@ -9,7 +9,7 @@ - #include "src/external-reference.h" - #include "src/ic/stub-cache.h" - --#if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID) -+#if defined(DEBUG) && (defined(V8_OS_LINUX) || defined(V8_OS_FREEBSD)) && !defined(V8_OS_ANDROID) - #define SYMBOLIZE_FUNCTION - #include <execinfo.h> - #include <vector> diff --git a/www/iridium/files/patch-v8_src_log-utils.h b/www/iridium/files/patch-v8_src_log-utils.h deleted file mode 100644 index 67b92cd174d1..000000000000 --- a/www/iridium/files/patch-v8_src_log-utils.h +++ /dev/null @@ -1,11 +0,0 @@ ---- v8/src/log-utils.h.orig 2019-03-11 22:08:08 UTC -+++ v8/src/log-utils.h -@@ -16,6 +16,8 @@ - #include "src/flags.h" - #include "src/ostreams.h" - -+#include <stdarg.h> -+ - namespace v8 { - namespace internal { - diff --git a/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc b/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc deleted file mode 100644 index dd1ea4153ede..000000000000 --- a/www/iridium/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/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.h b/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.h deleted file mode 100644 index 3e8c86402c73..000000000000 --- a/www/iridium/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/iridium/files/patch-v8_src_trap-handler_trap-handler.h b/www/iridium/files/patch-v8_src_trap-handler_trap-handler.h deleted file mode 100644 index 1d2e48b14832..000000000000 --- a/www/iridium/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 diff --git a/www/iridium/files/patch-weblayer_app_content__main__delegate__impl.cc b/www/iridium/files/patch-weblayer_app_content__main__delegate__impl.cc new file mode 100644 index 000000000000..ef8149182926 --- /dev/null +++ b/www/iridium/files/patch-weblayer_app_content__main__delegate__impl.cc @@ -0,0 +1,11 @@ +--- weblayer/app/content_main_delegate_impl.cc.orig 2020-03-17 10:35:42 UTC ++++ weblayer/app/content_main_delegate_impl.cc +@@ -146,7 +146,7 @@ bool ContentMainDelegateImpl::BasicStartupComplete(int + } + + void ContentMainDelegateImpl::PreSandboxStartup() { +-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) ++#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + // Create an instance of the CPU class to parse /proc/cpuinfo and cache + // cpu_brand info. + base::CPU cpu_info; diff --git a/www/iridium/files/patch-weblayer_browser_browser__main__parts__impl.cc b/www/iridium/files/patch-weblayer_browser_browser__main__parts__impl.cc new file mode 100644 index 000000000000..ca6a91a131c6 --- /dev/null +++ b/www/iridium/files/patch-weblayer_browser_browser__main__parts__impl.cc @@ -0,0 +1,20 @@ +--- weblayer/browser/browser_main_parts_impl.cc.orig 2020-03-16 18:40:43 UTC ++++ weblayer/browser/browser_main_parts_impl.cc +@@ -41,7 +41,7 @@ + #if defined(USE_AURA) && defined(USE_X11) + #include "ui/events/devices/x11/touch_factory_x11.h" // nogncheck + #endif +-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX) ++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) + #include "ui/base/ime/init/input_method_initializer.h" + #endif + +@@ -109,7 +109,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { + #if defined(USE_X11) + ui::SetDefaultX11ErrorHandlers(); + #endif +-#if defined(USE_AURA) && defined(OS_LINUX) ++#if defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) + ui::InitializeInputMethodForTesting(); + #endif + #if defined(OS_ANDROID) diff --git a/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc b/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc new file mode 100644 index 000000000000..cdb4c7b0f2a0 --- /dev/null +++ b/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc @@ -0,0 +1,38 @@ +--- weblayer/browser/content_browser_client_impl.cc.orig 2020-03-16 18:40:43 UTC ++++ weblayer/browser/content_browser_client_impl.cc +@@ -72,7 +72,7 @@ + #include "weblayer/browser/safe_browsing/safe_browsing_service.h" + #endif + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + #include "content/public/common/content_descriptors.h" + #endif + +@@ -247,7 +247,7 @@ ContentBrowserClientImpl::CreateNetworkContext( + + void ContentBrowserClientImpl::OnNetworkServiceCreated( + network::mojom::NetworkService* network_service) { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + network::mojom::CryptConfigPtr config = network::mojom::CryptConfig::New(); + content::GetNetworkService()->SetCryptConfig(std::move(config)); + #endif +@@ -426,7 +426,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe + } + #endif + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + void ContentBrowserClientImpl::GetAdditionalMappedFilesForChildProcess( + const base::CommandLine& command_line, + int child_process_id, +@@ -460,7 +460,7 @@ void ContentBrowserClientImpl::GetAdditionalMappedFile + mappings->Share(service_manager::kCrashDumpSignal, crash_signal_fd); + #endif // defined(OS_ANDROID) + } +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + + #if defined(OS_ANDROID) + bool ContentBrowserClientImpl::ShouldOverrideUrlLoading( diff --git a/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.h b/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.h new file mode 100644 index 000000000000..41c6b7a9b08d --- /dev/null +++ b/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.h @@ -0,0 +1,17 @@ +--- weblayer/browser/content_browser_client_impl.h.orig 2020-03-16 18:40:43 UTC ++++ weblayer/browser/content_browser_client_impl.h +@@ -85,12 +85,12 @@ class ContentBrowserClientImpl : public content::Conte + service_manager::BinderMapWithContext<content::RenderFrameHost*>* map) + override; + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + void GetAdditionalMappedFilesForChildProcess( + const base::CommandLine& command_line, + int child_process_id, + content::PosixFileDescriptorInfo* mappings) override; +-#endif // defined(OS_LINUX) || defined(OS_ANDROID) ++#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + + #if defined(OS_ANDROID) + bool ShouldOverrideUrlLoading(int frame_tree_node_id, diff --git a/www/iridium/files/patch-weblayer_browser_system__network__context__manager.cc b/www/iridium/files/patch-weblayer_browser_system__network__context__manager.cc new file mode 100644 index 000000000000..4ac2c36b5362 --- /dev/null +++ b/www/iridium/files/patch-weblayer_browser_system__network__context__manager.cc @@ -0,0 +1,11 @@ +--- weblayer/browser/system_network_context_manager.cc.orig 2020-03-17 10:36:11 UTC ++++ weblayer/browser/system_network_context_manager.cc +@@ -102,7 +102,7 @@ SystemNetworkContextManager::CreateSystemNetworkContex + + network_context_params->context_name = std::string("system"); + network_context_params->primary_network_context = true; +-#if defined(OS_LINUX) || defined(OS_WIN) ++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD) + // We're not configuring the cookie encryption on these platforms yet. + network_context_params->enable_encrypted_cookies = false; + #endif diff --git a/www/iridium/files/patch-weblayer_common_weblayer__paths.cc b/www/iridium/files/patch-weblayer_common_weblayer__paths.cc new file mode 100644 index 000000000000..54019d8cc261 --- /dev/null +++ b/www/iridium/files/patch-weblayer_common_weblayer__paths.cc @@ -0,0 +1,20 @@ +--- weblayer/common/weblayer_paths.cc.orig 2020-03-16 18:40:15 UTC ++++ weblayer/common/weblayer_paths.cc +@@ -17,7 +17,7 @@ + + #if defined(OS_WIN) + #include "base/base_paths_win.h" +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + #include "base/nix/xdg_util.h" + #endif + +@@ -35,7 +35,7 @@ bool GetDefaultUserDataDirectory(base::FilePath* resul + return false; + *result = result->AppendASCII("weblayer"); + return true; +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + std::unique_ptr<base::Environment> env(base::Environment::Create()); + base::FilePath config_dir(base::nix::GetXDGDirectory( + env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir)); diff --git a/www/iridium/files/sndio_input.cc b/www/iridium/files/sndio_input.cc index 4a00d8ac1083..6c7bc8b8025b 100644 --- a/www/iridium/files/sndio_input.cc +++ b/www/iridium/files/sndio_input.cc @@ -2,169 +2,200 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "media/audio/sndio/sndio_input.h" - -#include <stddef.h> - #include "base/bind.h" #include "base/logging.h" #include "base/macros.h" #include "base/message_loop/message_loop.h" +#include "media/base/audio_timestamp_helper.h" #include "media/audio/openbsd/audio_manager_openbsd.h" #include "media/audio/audio_manager.h" +#include "media/audio/sndio/sndio_input.h" namespace media { static const SampleFormat kSampleFormat = kSampleFormatS16; -void sndio_in_onmove(void *arg, int delta) { - NOTIMPLEMENTED(); +void SndioAudioInputStream::OnMoveCallback(void *arg, int delta) +{ SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg); - self->hw_delay_ = delta - self->params_.GetBytesPerFrame(kSampleFormat); + self->hw_delay += delta; } -void *sndio_in_threadstart(void *arg) { - NOTIMPLEMENTED(); +void *SndioAudioInputStream::ThreadEntry(void *arg) { SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg); - self->ReadAudio(); + self->ThreadLoop(); return NULL; } -SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* audio_manager, - const std::string& device_name, - const AudioParameters& params) - : audio_manager_(audio_manager), - device_name_(device_name), - params_(params), - bytes_per_buffer_(params.GetBytesPerBuffer(kSampleFormat)), - buffer_duration_(base::TimeDelta::FromMicroseconds( - params.frames_per_buffer() * base::Time::kMicrosecondsPerSecond / - static_cast<float>(params.sample_rate()))), - callback_(NULL), - device_handle_(NULL), - read_callback_behind_schedule_(false), - audio_bus_(AudioBus::Create(params)) { +SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager, + const std::string& device_name, + const AudioParameters& params) + : manager(manager), + params(params), + audio_bus(AudioBus::Create(params)), + state(kClosed) { } -SndioAudioInputStream::~SndioAudioInputStream() {} +SndioAudioInputStream::~SndioAudioInputStream() { + if (state != kClosed) + Close(); +} bool SndioAudioInputStream::Open() { struct sio_par par; int sig; - if (device_handle_) - return false; // Already open. + if (state != kClosed) + return false; - if (params_.format() != AudioParameters::AUDIO_PCM_LINEAR && - params_.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) { + if (params.format() != AudioParameters::AUDIO_PCM_LINEAR && + params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) { LOG(WARNING) << "Unsupported audio format."; return false; } sio_initpar(&par); - par.rate = params_.sample_rate(); - par.pchan = params_.channels(); - par.bits = SampleFormatToBytesPerChannel(kSampleFormat); + par.rate = params.sample_rate(); + par.rchan = params.channels(); + par.bits = SampleFormatToBitsPerChannel(kSampleFormat); par.bps = par.bits / 8; par.sig = sig = par.bits != 8 ? 1 : 0; par.le = SIO_LE_NATIVE; - par.appbufsz = params_.frames_per_buffer(); - sndio_rec_bufsz_ = par.bufsz; - sndio_rec_bufsize_ = par.round * par.bps * par.rchan; + par.appbufsz = params.frames_per_buffer(); - device_handle_ = sio_open(SIO_DEVANY, SIO_REC, 0); + hdl = sio_open(SIO_DEVANY, SIO_REC, 0); - if (device_handle_ == NULL) { + if (hdl == NULL) { LOG(ERROR) << "Couldn't open audio device."; return false; } - if (!sio_setpar(device_handle_, &par) || !sio_getpar(device_handle_, &par)) { + if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) { LOG(ERROR) << "Couldn't set audio parameters."; goto bad_close; } - if (par.rate != (unsigned int)params_.sample_rate() || - par.pchan != (unsigned int)params_.channels() || - par.bits != (unsigned int)SampleFormatToBytesPerChannel(kSampleFormat) || + if (par.rate != (unsigned int)params.sample_rate() || + par.rchan != (unsigned int)params.channels() || + par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) || par.sig != (unsigned int)sig || (par.bps > 1 && par.le != SIO_LE_NATIVE) || (par.bits != par.bps * 8)) { LOG(ERROR) << "Unsupported audio parameters."; goto bad_close; } - sio_onmove(device_handle_, sndio_in_onmove, this); - - audio_buffer_.reset(new uint8_t[bytes_per_buffer_]); - + state = kStopped; + buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)]; + sio_onmove(hdl, &OnMoveCallback, this); return true; bad_close: - sio_close(device_handle_); + sio_close(hdl); return false; } -void SndioAudioInputStream::Start(AudioInputCallback* callback) { - DCHECK(!callback_ && callback); - callback_ = callback; - StartAgc(); +void SndioAudioInputStream::Start(AudioInputCallback* cb) { - // We start reading data half |buffer_duration_| later than when the - // buffer might have got filled, to accommodate some delays in the audio - // driver. This could also give us a smooth read sequence going forward. - base::TimeDelta delay = buffer_duration_ + buffer_duration_ / 2; - next_read_time_ = base::TimeTicks::Now() + delay; - if (pthread_create(&thread_, NULL, sndio_in_threadstart, this) != 0) - LOG(ERROR) << "Failed to create real-time thread."; -} + StartAgc(); -void SndioAudioInputStream::ReadAudio() { - NOTIMPLEMENTED(); + state = kRunning; + hw_delay = 0; + callback = cb; + sio_start(hdl); + if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) { + LOG(ERROR) << "Failed to create real-time thread for recording."; + sio_stop(hdl); + state = kStopped; + } } void SndioAudioInputStream::Stop() { - if (!device_handle_ || !callback_) - return; - StopAgc(); + if (state == kStopped) + return; - pthread_join(thread_, NULL); - sio_stop(device_handle_); + state = kStopWait; + pthread_join(thread, NULL); + sio_stop(hdl); + state = kStopped; - callback_ = NULL; + StopAgc(); } void SndioAudioInputStream::Close() { - if (device_handle_) { - sio_close(device_handle_); - audio_buffer_.reset(); - device_handle_ = NULL; - } - audio_manager_->ReleaseInputStream(this); + if (state == kClosed) + return; + + if (state == kRunning) + Stop(); + + state = kClosed; + delete [] buffer; + sio_close(hdl); + + manager->ReleaseInputStream(this); } double SndioAudioInputStream::GetMaxVolume() { - return static_cast<double>(SIO_MAXVOL); + // Not supported + return 0.0; } void SndioAudioInputStream::SetVolume(double volume) { - NOTIMPLEMENTED(); + // Not supported. Do nothing. } double SndioAudioInputStream::GetVolume() { - long current_volume = 0; - return static_cast<double>(current_volume); + // Not supported. + return 0.0; } bool SndioAudioInputStream::IsMuted() { + // Not supported. return false; } void SndioAudioInputStream::SetOutputDeviceForAec( const std::string& output_device_id) { -// Not supported. Do nothing. + // Not supported. +} + +void SndioAudioInputStream::ThreadLoop(void) { + size_t todo, n; + char *data; + unsigned int nframes; + double normalized_volume = 0.0; + + nframes = audio_bus->frames(); + + while (state == kRunning && !sio_eof(hdl)) { + + GetAgcVolume(&normalized_volume); + + // read one block + todo = nframes * params.GetBytesPerFrame(kSampleFormat); + data = buffer; + while (todo > 0) { + n = sio_read(hdl, data, todo); + if (n == 0) + return; // unrecoverable I/O error + todo -= n; + data += n; + } + hw_delay -= nframes; + + // convert frames count to TimeDelta + const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, + params.sample_rate()); + + // push into bus + audio_bus->FromInterleaved(buffer, nframes, SampleFormatToBytesPerChannel(kSampleFormat)); + + // invoke callback + callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.); + } } } // namespace media diff --git a/www/iridium/files/sndio_input.h b/www/iridium/files/sndio_input.h index 2f3fca97a3a3..d868e0469db5 100644 --- a/www/iridium/files/sndio_input.h +++ b/www/iridium/files/sndio_input.h @@ -22,19 +22,7 @@ namespace media { class AudioManagerBase; -// call-backs invoked from C libraries, thus requiring C linkage -extern "C" { - // Invoked (on the real-time thread) at each sound card clock tick - void sndio_in_onmove(void *arg, int delta); - // Invoked (on the real-time thread) whenever the volume changes - void sndio_in_onvol(void *arg, unsigned int vol); - // Real-time thread entry point - void *sndio_in_threadstart(void *arg); -} - -// Provides an input stream for audio capture based on the SNDIO PCM interface. -// This object is not thread safe and all methods should be invoked in the -// thread that created the object. +// Implementation of AudioOutputStream using sndio(7) class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> { public: // Pass this to the constructor if you want to attempt auto-selection @@ -61,45 +49,39 @@ class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> { bool IsMuted() override; void SetOutputDeviceForAec(const std::string& output_device_id) override; - // C-linkage call-backs are friends to access private data - friend void sndio_in_onmove(void *arg, int delta); - friend void sndio_in_onvol(void *arg, unsigned int vol); - friend void *sndio_in_threadstart(void *arg); - private: - // Logs the error and invokes any registered callbacks. - void HandleError(const char* method, int error); - - // Reads one or more buffers of audio from the device, passes on to the - // registered callback and schedules the next read. - void ReadAudio(); - - // Recovers from any device errors if possible. - bool Recover(int error); - - // Non-refcounted pointer back to the audio manager. - // The AudioManager indirectly holds on to stream objects, so we don't - // want circular references. Additionally, stream objects live on the audio - // thread, which is owned by the audio manager and we don't want to addref - // the manager from that thread. - AudioManagerBase* audio_manager_; - std::string device_name_; - AudioParameters params_; - int bytes_per_buffer_; - base::TimeDelta buffer_duration_; // Length of each recorded buffer. - AudioInputCallback* callback_; // Valid during a recording session. - base::TimeTicks next_read_time_; // Scheduled time for next read callback. - struct sio_hdl* device_handle_; // Handle to the SNDIO PCM recording device. - std::unique_ptr<uint8_t[]> audio_buffer_; // Buffer used for reading audio data. - bool read_callback_behind_schedule_; - std::unique_ptr<AudioBus> audio_bus_; - - int hw_delay_; - int sndio_rec_bufsize_; - int sndio_rec_bufsz_; - - // High priority thread running RealTimeThread() - pthread_t thread_; + + enum StreamState { + kClosed, // Not opened yet + kStopped, // Device opened, but not started yet + kRunning, // Started, device playing + kStopWait // Stopping, waiting for the real-time thread to exit + }; + + // C-style call-backs + static void OnMoveCallback(void *arg, int delta); + static void* ThreadEntry(void *arg); + + // Continuously moves data from the device to the consumer + void ThreadLoop(); + // Our creator, the audio manager needs to be notified when we close. + AudioManagerBase* manager; + // Parameters of the source + AudioParameters params; + // We store data here for consumer + std::unique_ptr<AudioBus> audio_bus; + // Call-back that consumes recorded data + AudioInputCallback* callback; // Valid during a recording session. + // Handle of the audio device + struct sio_hdl* hdl; + // Current state of the stream + enum StreamState state; + // High priority thread running ThreadLoop() + pthread_t thread; + // Number of frames buffered in the hardware + int hw_delay; + // Temporary buffer where data is stored sndio-compatible format + char* buffer; DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream); }; diff --git a/www/iridium/files/sndio_output.cc b/www/iridium/files/sndio_output.cc index e9053d34b8aa..a6719f9aac8d 100644 --- a/www/iridium/files/sndio_output.cc +++ b/www/iridium/files/sndio_output.cc @@ -13,22 +13,22 @@ namespace media { static const SampleFormat kSampleFormat = kSampleFormatS16; -void sndio_onmove(void *arg, int delta) { +void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) { SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg); - self->hw_delay = delta; + self->hw_delay -= delta; } -void sndio_onvol(void *arg, unsigned int vol) { +void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) { SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg); self->vol = vol; } -void *sndio_threadstart(void *arg) { +void *SndioAudioOutputStream::ThreadEntry(void *arg) { SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg); - self->RealTimeThread(); + self->ThreadLoop(); return NULL; } @@ -37,7 +37,6 @@ SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params, : manager(manager), params(params), audio_bus(AudioBus::Create(params)), - bytes_per_frame(params.GetBytesPerFrame(kSampleFormat)), state(kClosed), mutex(PTHREAD_MUTEX_INITIALIZER) { } @@ -87,8 +86,8 @@ bool SndioAudioOutputStream::Open() { volpending = 0; vol = 0; buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)]; - sio_onmove(hdl, sndio_onmove, this); - sio_onvol(hdl, sndio_onvol, this); + sio_onmove(hdl, &OnMoveCallback, this); + sio_onvol(hdl, &OnVolCallback, this); return true; bad_close: sio_close(hdl); @@ -111,7 +110,7 @@ void SndioAudioOutputStream::Start(AudioSourceCallback* callback) { hw_delay = 0; source = callback; sio_start(hdl); - if (pthread_create(&thread, NULL, sndio_threadstart, this) != 0) { + if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) { LOG(ERROR) << "Failed to create real-time thread."; sio_stop(hdl); state = kStopped; @@ -140,8 +139,12 @@ void SndioAudioOutputStream::GetVolume(double* v) { pthread_mutex_unlock(&mutex); } -void SndioAudioOutputStream::RealTimeThread(void) { - int avail, count; +// This stream is always used with sub second buffer sizes, where it's +// sufficient to simply always flush upon Start(). +void SndioAudioOutputStream::Flush() {} + +void SndioAudioOutputStream::ThreadLoop(void) { + int avail, count, result; while (state == kRunning) { // Update volume if needed @@ -153,7 +156,8 @@ void SndioAudioOutputStream::RealTimeThread(void) { pthread_mutex_unlock(&mutex); // Get data to play - const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, params.sample_rate() * 1000); + const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, + params.sample_rate()); count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get()); audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer); if (count == 0) { @@ -165,8 +169,8 @@ void SndioAudioOutputStream::RealTimeThread(void) { // Submit data to the device avail = count * params.GetBytesPerFrame(kSampleFormat); - count = sio_write(hdl, buffer, avail); - if (count == 0) { + result = sio_write(hdl, buffer, avail); + if (result == 0) { LOG(WARNING) << "Audio device disconnected."; break; } diff --git a/www/iridium/files/sndio_output.h b/www/iridium/files/sndio_output.h index 4bc644d9a3ff..ead220ca96e7 100644 --- a/www/iridium/files/sndio_output.h +++ b/www/iridium/files/sndio_output.h @@ -12,22 +12,10 @@ #include "base/time/time.h" #include "media/audio/audio_io.h" - namespace media { -class AudioParameters; class AudioManagerBase; -// call-backs invoked from C libraries, thus requiring C linkage -extern "C" { - // Invoked (on the real-time thread) at each sound card clock tick - void sndio_onmove(void *arg, int delta); - // Invoked (on the real-time thread) whenever the volume changes - void sndio_onvol(void *arg, unsigned int vol); - // Real-time thread entry point - void *sndio_threadstart(void *arg); -} - // Implementation of AudioOutputStream using sndio(7) class SndioAudioOutputStream : public AudioOutputStream { public: @@ -37,14 +25,14 @@ class SndioAudioOutputStream : public AudioOutputStream { virtual ~SndioAudioOutputStream(); // Implementation of AudioOutputStream. - virtual bool Open() override; - virtual void Close() override; - virtual void Start(AudioSourceCallback* callback) override; - virtual void Stop() override; - virtual void SetVolume(double volume) override; - virtual void GetVolume(double* volume) override; + bool Open() override; + void Close() override; + void Start(AudioSourceCallback* callback) override; + void Stop() override; + void SetVolume(double volume) override; + void GetVolume(double* volume) override; + void Flush() override; - // C-linkage call-backs are friends to access private data friend void sndio_onmove(void *arg, int delta); friend void sndio_onvol(void *arg, unsigned int vol); friend void *sndio_threadstart(void *arg); @@ -56,22 +44,28 @@ class SndioAudioOutputStream : public AudioOutputStream { kRunning, // Started, device playing kStopWait // Stopping, waiting for the real-time thread to exit }; - // Continuously moves data from the audio bus to the device - void RealTimeThread(void); + + // C-style call-backs + static void OnMoveCallback(void *arg, int delta); + static void OnVolCallback(void *arg, unsigned int vol); + static void* ThreadEntry(void *arg); + + // Continuously moves data from the producer to the device + void ThreadLoop(void); + // Our creator, the audio manager needs to be notified when we close. AudioManagerBase* manager; // Parameters of the source AudioParameters params; // Source stores data here std::unique_ptr<AudioBus> audio_bus; - int bytes_per_frame; // Call-back that produces data to play AudioSourceCallback* source; // Handle of the audio device struct sio_hdl* hdl; // Current state of the stream enum StreamState state; - // High priority thread running RealTimeThread() + // High priority thread running ThreadLoop() pthread_t thread; // Protects vol, volpending and hw_delay pthread_mutex_t mutex; @@ -79,7 +73,7 @@ class SndioAudioOutputStream : public AudioOutputStream { int vol; // Set to 1 if volumes must be refreshed in the realtime thread int volpending; - // Number of bytes buffered in the hardware + // Number of frames buffered in the hardware int hw_delay; // Temporary buffer where data is stored sndio-compatible format char* buffer; diff --git a/www/iridium/pkg-plist b/www/iridium/pkg-plist index 3d13f5a1534c..d71c983aceb2 100644 --- a/www/iridium/pkg-plist +++ b/www/iridium/pkg-plist @@ -6,6 +6,7 @@ bin/iridium %%DATADIR%%/icudtl.dat %%DATADIR%%/libEGL.so %%DATADIR%%/libGLESv2.so +%%DATADIR%%/libVkICD_mock_icd.so %%DATADIR%%/locales/am.pak %%DATADIR%%/locales/am.pak.info %%DATADIR%%/locales/ar.pak @@ -113,7 +114,6 @@ bin/iridium %%DATADIR%%/locales/zh-TW.pak %%DATADIR%%/locales/zh-TW.pak.info %%DATADIR%%/mksnapshot -%%DATADIR%%/natives_blob.bin %%DATADIR%%/product_logo_48.png %%DATADIR%%/protoc %%DATADIR%%/resources.pak @@ -125,11 +125,11 @@ bin/iridium %%DATADIR%%/resources/inspector/Images/accelerometer-right.png %%DATADIR%%/resources/inspector/Images/accelerometer-top.png %%DATADIR%%/resources/inspector/Images/audits_logo.svg -%%DATADIR%%/resources/inspector/Images/breakpoint.png -%%DATADIR%%/resources/inspector/Images/breakpointConditional.png -%%DATADIR%%/resources/inspector/Images/breakpointConditional_2x.png -%%DATADIR%%/resources/inspector/Images/breakpoint_2x.png +%%DATADIR%%/resources/inspector/Images/breakpoint.svg +%%DATADIR%%/resources/inspector/Images/breakpointConditional.svg +%%DATADIR%%/resources/inspector/Images/checkboxCheckmark.svg %%DATADIR%%/resources/inspector/Images/checker.png +%%DATADIR%%/resources/inspector/Images/chevrons.svg %%DATADIR%%/resources/inspector/Images/chromeDisabledSelect.png %%DATADIR%%/resources/inspector/Images/chromeDisabledSelect_2x.png %%DATADIR%%/resources/inspector/Images/chromeLeft.png @@ -137,14 +137,12 @@ bin/iridium %%DATADIR%%/resources/inspector/Images/chromeRight.png %%DATADIR%%/resources/inspector/Images/chromeSelect.png %%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png -%%DATADIR%%/resources/inspector/Images/errorWave.png -%%DATADIR%%/resources/inspector/Images/errorWave_2x.png +%%DATADIR%%/resources/inspector/Images/cssoverview_icons_2x.png +%%DATADIR%%/resources/inspector/Images/errorWave.svg %%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg %%DATADIR%%/resources/inspector/Images/ic_warning_black_18dp.svg -%%DATADIR%%/resources/inspector/Images/largeIcons.png -%%DATADIR%%/resources/inspector/Images/largeIcons_2x.png -%%DATADIR%%/resources/inspector/Images/mediumIcons.png -%%DATADIR%%/resources/inspector/Images/mediumIcons_2x.png +%%DATADIR%%/resources/inspector/Images/largeIcons.svg +%%DATADIR%%/resources/inspector/Images/mediumIcons.svg %%DATADIR%%/resources/inspector/Images/navigationControls.png %%DATADIR%%/resources/inspector/Images/navigationControls_2x.png %%DATADIR%%/resources/inspector/Images/nodeIcon.png @@ -153,6 +151,7 @@ bin/iridium %%DATADIR%%/resources/inspector/Images/profileIcon.png %%DATADIR%%/resources/inspector/Images/profileSmallIcon.png %%DATADIR%%/resources/inspector/Images/radioDot.png +%%DATADIR%%/resources/inspector/Images/radioDot-dark-theme.png %%DATADIR%%/resources/inspector/Images/resizeDiagonal.png %%DATADIR%%/resources/inspector/Images/resizeDiagonal_2x.png %%DATADIR%%/resources/inspector/Images/resizeHorizontal.png @@ -168,42 +167,269 @@ bin/iridium %%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.png %%DATADIR%%/resources/inspector/Images/searchNext.png %%DATADIR%%/resources/inspector/Images/searchPrev.png -%%DATADIR%%/resources/inspector/Images/securityIcons.png -%%DATADIR%%/resources/inspector/Images/securityIcons_2x.png -%%DATADIR%%/resources/inspector/Images/smallIcons.png -%%DATADIR%%/resources/inspector/Images/smallIcons_2x.png +%%DATADIR%%/resources/inspector/Images/securityIcons.svg +%%DATADIR%%/resources/inspector/Images/smallIcons.svg %%DATADIR%%/resources/inspector/Images/speech.png %%DATADIR%%/resources/inspector/Images/toolbarResizerVertical.png %%DATADIR%%/resources/inspector/Images/touchCursor.png %%DATADIR%%/resources/inspector/Images/touchCursor_2x.png -%%DATADIR%%/resources/inspector/Images/treeoutlineTriangles.png -%%DATADIR%%/resources/inspector/Images/treeoutlineTriangles_2x.png +%%DATADIR%%/resources/inspector/Images/treeoutlineTriangles.svg %%DATADIR%%/resources/inspector/Images/whatsnew.png %%DATADIR%%/resources/inspector/InspectorBackendCommands.js %%DATADIR%%/resources/inspector/SupportedCSSProperties.js %%DATADIR%%/resources/inspector/Tests.js -%%DATADIR%%/resources/inspector/accessibility/ARIAProperties.js %%DATADIR%%/resources/inspector/accessibility/accessibility_module.js +%%DATADIR%%/resources/inspector/accessibility/accessibility-legacy.js +%%DATADIR%%/resources/inspector/accessibility/accessibility.js +%%DATADIR%%/resources/inspector/accessibility/AccessibilityModel.js +%%DATADIR%%/resources/inspector/accessibility/AccessibilityNodeView.js +%%DATADIR%%/resources/inspector/accessibility/AccessibilitySidebarView.js +%%DATADIR%%/resources/inspector/accessibility/AccessibilityStrings.js +%%DATADIR%%/resources/inspector/accessibility/AccessibilitySubPane.js +%%DATADIR%%/resources/inspector/accessibility/ARIAAttributesView.js +%%DATADIR%%/resources/inspector/accessibility/ARIAMetadata.js +%%DATADIR%%/resources/inspector/accessibility/ARIAProperties.js +%%DATADIR%%/resources/inspector/accessibility/AXBreadcrumbsPane.js %%DATADIR%%/resources/inspector/accessibility_test_runner/accessibility_test_runner_module.js %%DATADIR%%/resources/inspector/animation/animation_module.js +%%DATADIR%%/resources/inspector/animation/animation-legacy.js +%%DATADIR%%/resources/inspector/animation/animation.js +%%DATADIR%%/resources/inspector/animation/AnimationGroupPreviewUI.js +%%DATADIR%%/resources/inspector/animation/AnimationModel.js +%%DATADIR%%/resources/inspector/animation/AnimationScreenshotPopover.js +%%DATADIR%%/resources/inspector/animation/AnimationTimeline.js +%%DATADIR%%/resources/inspector/animation/AnimationUI.js %%DATADIR%%/resources/inspector/application_test_runner/application_test_runner_module.js -%%DATADIR%%/resources/inspector/audits2/audits2_module.js -%%DATADIR%%/resources/inspector/audits2_test_runner/audits2_test_runner_module.js -%%DATADIR%%/resources/inspector/audits2_worker.js -%%DATADIR%%/resources/inspector/audits2_worker/audits2_worker_module.js +%%DATADIR%%/resources/inspector/audits/audits_module.js +%%DATADIR%%/resources/inspector/audits/audits-legacy.js +%%DATADIR%%/resources/inspector/audits/audits.js +%%DATADIR%%/resources/inspector/audits/AuditsController.js +%%DATADIR%%/resources/inspector/audits/AuditsPanel.js +%%DATADIR%%/resources/inspector/audits/AuditsProtocolService.js +%%DATADIR%%/resources/inspector/audits/AuditsReportRenderer.js +%%DATADIR%%/resources/inspector/audits/AuditsReportSelector.js +%%DATADIR%%/resources/inspector/audits/AuditsStartView.js +%%DATADIR%%/resources/inspector/audits/AuditsStatusView.js +%%DATADIR%%/resources/inspector/audits/lighthouse/report-generator.js +%%DATADIR%%/resources/inspector/audits/lighthouse/report.js +%%DATADIR%%/resources/inspector/audits/RadioSetting.js +%%DATADIR%%/resources/inspector/audits_test_runner/audits_test_runner_module.js +%%DATADIR%%/resources/inspector/audits_worker.js +%%DATADIR%%/resources/inspector/audits_worker/audits_worker_module.js +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ar-XB.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ar.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/bg.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ca.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/cs.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/da.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/de.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/el.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/en-GB.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/en-US.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/en-XA.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/en-XL.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/es-419.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/es.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/fi.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/fil.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/fr.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/he.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/hi.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/hr.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/hu.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/id.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/it.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ja.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ko.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/lt.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/lv.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/nl.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/no.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/pl.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/pt-PT.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/pt.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ro.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ru.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/sk.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/sl.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/sr-Latn.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/sr.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/sv.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/ta.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/te.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/th.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/tr.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/uk.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/vi.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/zh-HK.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/zh-TW.json +%%DATADIR%%/resources/inspector/audits_worker/lighthouse/locales/zh.json +%%DATADIR%%/resources/inspector/axe_core_test_runner/axe_core_test_runner_module.js %%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner_module.js +%%DATADIR%%/resources/inspector/bindings/bindings.js +%%DATADIR%%/resources/inspector/bindings/bindings-legacy.js +%%DATADIR%%/resources/inspector/bindings/BlackboxManager.js +%%DATADIR%%/resources/inspector/bindings/BreakpointManager.js +%%DATADIR%%/resources/inspector/bindings/CompilerScriptMapping.js +%%DATADIR%%/resources/inspector/bindings/ContentProviderBasedProject.js +%%DATADIR%%/resources/inspector/bindings/CSSWorkspaceBinding.js +%%DATADIR%%/resources/inspector/bindings/DebuggerLanguagePlugins.js +%%DATADIR%%/resources/inspector/bindings/DebuggerWorkspaceBinding.js +%%DATADIR%%/resources/inspector/bindings/DefaultScriptMapping.js +%%DATADIR%%/resources/inspector/bindings/FileUtils.js +%%DATADIR%%/resources/inspector/bindings/LiveLocation.js +%%DATADIR%%/resources/inspector/bindings/NetworkProject.js +%%DATADIR%%/resources/inspector/bindings/PresentationConsoleMessageHelper.js +%%DATADIR%%/resources/inspector/bindings/ResourceMapping.js +%%DATADIR%%/resources/inspector/bindings/ResourceScriptMapping.js +%%DATADIR%%/resources/inspector/bindings/ResourceUtils.js +%%DATADIR%%/resources/inspector/bindings/SASSSourceMapping.js +%%DATADIR%%/resources/inspector/bindings/StylesSourceMapping.js +%%DATADIR%%/resources/inspector/bindings/TempFile.js +%%DATADIR%%/resources/inspector/bindings/language_plugins/CXXDWARFLanguagePlugin.js %%DATADIR%%/resources/inspector/browser_debugger/browser_debugger_module.js +%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger-legacy.js +%%DATADIR%%/resources/inspector/browser_debugger/browser_debugger.js +%%DATADIR%%/resources/inspector/browser_debugger/DOMBreakpointsSidebarPane.js +%%DATADIR%%/resources/inspector/browser_debugger/EventListenerBreakpointsSidebarPane.js +%%DATADIR%%/resources/inspector/browser_debugger/ObjectEventListenersSidebarPane.js +%%DATADIR%%/resources/inspector/browser_debugger/XHRBreakpointsSidebarPane.js +%%DATADIR%%/resources/inspector/browser_sdk/browser_sdk.js +%%DATADIR%%/resources/inspector/browser_sdk/browser_sdk-legacy.js +%%DATADIR%%/resources/inspector/browser_sdk/LogManager.js %%DATADIR%%/resources/inspector/changes/changes_module.js +%%DATADIR%%/resources/inspector/changes/changes-legacy.js +%%DATADIR%%/resources/inspector/changes/changes.js +%%DATADIR%%/resources/inspector/changes/ChangesHighlighter.js +%%DATADIR%%/resources/inspector/changes/ChangesSidebar.js +%%DATADIR%%/resources/inspector/changes/ChangesTextEditor.js +%%DATADIR%%/resources/inspector/changes/ChangesView.js +%%DATADIR%%/resources/inspector/cm_headless/cm_headless.js +%%DATADIR%%/resources/inspector/cm_headless/headlesscodemirror.js +%%DATADIR%%/resources/inspector/cm_modes/clike.js +%%DATADIR%%/resources/inspector/cm_modes/clojure.js %%DATADIR%%/resources/inspector/cm/cm_module.js +%%DATADIR%%/resources/inspector/cm/active-line.js +%%DATADIR%%/resources/inspector/cm/brace-fold.js +%%DATADIR%%/resources/inspector/cm/closebrackets.js +%%DATADIR%%/resources/inspector/cm/cm.js +%%DATADIR%%/resources/inspector/cm/codemirror.js +%%DATADIR%%/resources/inspector/cm/comment.js +%%DATADIR%%/resources/inspector/cm/foldcode.js +%%DATADIR%%/resources/inspector/cm/foldgutter.js +%%DATADIR%%/resources/inspector/cm/mark-selection.js +%%DATADIR%%/resources/inspector/cm/matchbrackets.js +%%DATADIR%%/resources/inspector/cm/multiplex.js +%%DATADIR%%/resources/inspector/cm/overlay.js %%DATADIR%%/resources/inspector/cm_modes/cm_modes_module.js +%%DATADIR%%/resources/inspector/cm_modes/cm_modes.js +%%DATADIR%%/resources/inspector/cm_modes/coffeescript.js +%%DATADIR%%/resources/inspector/cm_modes/DefaultCodeMirrorMimeMode.js +%%DATADIR%%/resources/inspector/cm_modes/jsx.js +%%DATADIR%%/resources/inspector/cm_modes/livescript.js +%%DATADIR%%/resources/inspector/cm_modes/markdown.js +%%DATADIR%%/resources/inspector/cm_modes/php.js +%%DATADIR%%/resources/inspector/cm_modes/python.js +%%DATADIR%%/resources/inspector/cm_modes/shell.js +%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_cm.js +%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_headless.js +%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes_module.js +%%DATADIR%%/resources/inspector/cm_web_modes/cm_web_modes.js +%%DATADIR%%/resources/inspector/cm_web_modes/css.js +%%DATADIR%%/resources/inspector/cm_web_modes/htmlembedded.js +%%DATADIR%%/resources/inspector/cm_web_modes/htmlmixed.js +%%DATADIR%%/resources/inspector/cm_web_modes/javascript.js +%%DATADIR%%/resources/inspector/cm_web_modes/xml.js %%DATADIR%%/resources/inspector/color_picker/color_picker_module.js +%%DATADIR%%/resources/inspector/color_picker/color_picker-legacy.js +%%DATADIR%%/resources/inspector/color_picker/color_picker.js +%%DATADIR%%/resources/inspector/color_picker/ContrastDetails.js +%%DATADIR%%/resources/inspector/color_picker/ContrastInfo.js +%%DATADIR%%/resources/inspector/color_picker/ContrastOverlay.js +%%DATADIR%%/resources/inspector/color_picker/Spectrum.js +%%DATADIR%%/resources/inspector/common/App.js +%%DATADIR%%/resources/inspector/common/AppProvider.js +%%DATADIR%%/resources/inspector/common/CharacterIdMap.js +%%DATADIR%%/resources/inspector/common/Color.js +%%DATADIR%%/resources/inspector/common/common.js +%%DATADIR%%/resources/inspector/common/common-legacy.js +%%DATADIR%%/resources/inspector/common/Console.js +%%DATADIR%%/resources/inspector/common/ContentProvider.js +%%DATADIR%%/resources/inspector/common/EventTarget.js +%%DATADIR%%/resources/inspector/common/JavaScriptMetaData.js +%%DATADIR%%/resources/inspector/common/Linkifier.js +%%DATADIR%%/resources/inspector/common/Object.js +%%DATADIR%%/resources/inspector/common/ParsedURL.js +%%DATADIR%%/resources/inspector/common/Progress.js +%%DATADIR%%/resources/inspector/common/QueryParamHandler.js +%%DATADIR%%/resources/inspector/common/ResourceType.js +%%DATADIR%%/resources/inspector/common/Revealer.js +%%DATADIR%%/resources/inspector/common/Runnable.js +%%DATADIR%%/resources/inspector/common/SegmentedRange.js +%%DATADIR%%/resources/inspector/common/Settings.js +%%DATADIR%%/resources/inspector/common/StaticContentProvider.js +%%DATADIR%%/resources/inspector/common/StringOutputStream.js +%%DATADIR%%/resources/inspector/common/TextDictionary.js +%%DATADIR%%/resources/inspector/common/Throttler.js +%%DATADIR%%/resources/inspector/common/Trie.js +%%DATADIR%%/resources/inspector/common/UIString.js +%%DATADIR%%/resources/inspector/common/Worker.js +%%DATADIR%%/resources/inspector/components/components.js +%%DATADIR%%/resources/inspector/components/components-legacy.js +%%DATADIR%%/resources/inspector/components/DockController.js +%%DATADIR%%/resources/inspector/components/ImagePreview.js +%%DATADIR%%/resources/inspector/components/JSPresentationUtils.js +%%DATADIR%%/resources/inspector/components/Linkifier.js +%%DATADIR%%/resources/inspector/components/Reload.js +%%DATADIR%%/resources/inspector/components/TargetDetachedDialog.js +%%DATADIR%%/resources/inspector/console_counters/console_counters.js +%%DATADIR%%/resources/inspector/console_counters/console_counters-legacy.js +%%DATADIR%%/resources/inspector/console_counters/WarningErrorCounter.js %%DATADIR%%/resources/inspector/console/console_module.js +%%DATADIR%%/resources/inspector/console/console-legacy.js +%%DATADIR%%/resources/inspector/console/console.js +%%DATADIR%%/resources/inspector/console/ConsoleContextSelector.js +%%DATADIR%%/resources/inspector/console/ConsoleFilter.js +%%DATADIR%%/resources/inspector/console/ConsolePanel.js +%%DATADIR%%/resources/inspector/console/ConsolePinPane.js +%%DATADIR%%/resources/inspector/console/ConsolePrompt.js +%%DATADIR%%/resources/inspector/console/ConsoleSidebar.js +%%DATADIR%%/resources/inspector/console/ConsoleView.js +%%DATADIR%%/resources/inspector/console/ConsoleViewMessage.js +%%DATADIR%%/resources/inspector/console/ConsoleViewport.js %%DATADIR%%/resources/inspector/console_test_runner/console_test_runner_module.js %%DATADIR%%/resources/inspector/cookie_table/cookie_table_module.js +%%DATADIR%%/resources/inspector/cookie_table/cookie_table-legacy.js +%%DATADIR%%/resources/inspector/cookie_table/cookie_table.js +%%DATADIR%%/resources/inspector/cookie_table/CookiesTable.js %%DATADIR%%/resources/inspector/coverage/coverage_module.js +%%DATADIR%%/resources/inspector/coverage/coverage-legacy.js +%%DATADIR%%/resources/inspector/coverage/coverage.js +%%DATADIR%%/resources/inspector/coverage/CoverageDecorationManager.js +%%DATADIR%%/resources/inspector/coverage/CoverageListView.js +%%DATADIR%%/resources/inspector/coverage/CoverageModel.js +%%DATADIR%%/resources/inspector/coverage/CoverageView.js %%DATADIR%%/resources/inspector/coverage_test_runner/coverage_test_runner_module.js %%DATADIR%%/resources/inspector/cpu_profiler_test_runner/cpu_profiler_test_runner_module.js +%%DATADIR%%/resources/inspector/css_overview/css_overview_module.js +%%DATADIR%%/resources/inspector/css_overview/css_overview-legacy.js +%%DATADIR%%/resources/inspector/css_overview/css_overview.js +%%DATADIR%%/resources/inspector/css_overview/CSSOverviewCompletedView.js +%%DATADIR%%/resources/inspector/css_overview/CSSOverviewController.js +%%DATADIR%%/resources/inspector/css_overview/CSSOverviewModel.js +%%DATADIR%%/resources/inspector/css_overview/CSSOverviewPanel.js +%%DATADIR%%/resources/inspector/css_overview/CSSOverviewProcessingView.js +%%DATADIR%%/resources/inspector/css_overview/CSSOverviewSidebarPanel.js +%%DATADIR%%/resources/inspector/css_overview/CSSOverviewStartView.js +%%DATADIR%%/resources/inspector/css_overview/CSSOverviewUnusedDeclarations.js +%%DATADIR%%/resources/inspector/dagre_layout/dagre_layout_module.js %%DATADIR%%/resources/inspector/data_grid/data_grid_module.js +%%DATADIR%%/resources/inspector/data_grid/data_grid-legacy.js +%%DATADIR%%/resources/inspector/data_grid/data_grid.js +%%DATADIR%%/resources/inspector/data_grid/DataGrid.js +%%DATADIR%%/resources/inspector/data_grid/ShowMoreDataGridNode.js +%%DATADIR%%/resources/inspector/data_grid/SortableDataGrid.js +%%DATADIR%%/resources/inspector/data_grid/ViewportDataGrid.js %%DATADIR%%/resources/inspector/data_grid_test_runner/data_grid_test_runner_module.js %%DATADIR%%/resources/inspector/device_mode_test_runner/device_mode_test_runner_module.js %%DATADIR%%/resources/inspector/devices/devices_module.js @@ -211,9 +437,42 @@ bin/iridium %%DATADIR%%/resources/inspector/devtools_app.js %%DATADIR%%/resources/inspector/devtools_compatibility.js %%DATADIR%%/resources/inspector/devtools_extension_api.js +%%DATADIR%%/resources/inspector/diff/diff_match_patch.js %%DATADIR%%/resources/inspector/diff/diff_module.js +%%DATADIR%%/resources/inspector/diff/diff-legacy.js +%%DATADIR%%/resources/inspector/diff/diff.js +%%DATADIR%%/resources/inspector/diff/DiffWrapper.js +%%DATADIR%%/resources/inspector/dom_extension/dom_extension.js +%%DATADIR%%/resources/inspector/dom_extension/DOMExtension.js %%DATADIR%%/resources/inspector/elements/elements_module.js +%%DATADIR%%/resources/inspector/elements/elements-legacy.js +%%DATADIR%%/resources/inspector/elements/elements.js +%%DATADIR%%/resources/inspector/elements/ClassesPaneWidget.js +%%DATADIR%%/resources/inspector/elements/ColorSwatchPopoverIcon.js +%%DATADIR%%/resources/inspector/elements/ComputedStyleModel.js +%%DATADIR%%/resources/inspector/elements/ComputedStyleWidget.js +%%DATADIR%%/resources/inspector/elements/DOMLinkifier.js +%%DATADIR%%/resources/inspector/elements/DOMPath.js +%%DATADIR%%/resources/inspector/elements/ElementsBreadcrumbs.js +%%DATADIR%%/resources/inspector/elements/ElementsPanel.js +%%DATADIR%%/resources/inspector/elements/ElementsSidebarPane.js +%%DATADIR%%/resources/inspector/elements/ElementStatePaneWidget.js +%%DATADIR%%/resources/inspector/elements/ElementsTreeElement.js +%%DATADIR%%/resources/inspector/elements/ElementsTreeElementHighlighter.js +%%DATADIR%%/resources/inspector/elements/ElementsTreeOutline.js +%%DATADIR%%/resources/inspector/elements/EventListenersWidget.js +%%DATADIR%%/resources/inspector/elements/InspectElementModeController.js +%%DATADIR%%/resources/inspector/elements/MarkerDecorator.js +%%DATADIR%%/resources/inspector/elements/MetricsSidebarPane.js +%%DATADIR%%/resources/inspector/elements/NodeStackTraceWidget.js +%%DATADIR%%/resources/inspector/elements/PlatformFontsWidget.js +%%DATADIR%%/resources/inspector/elements/PropertiesWidget.js +%%DATADIR%%/resources/inspector/elements/StylePropertyHighlighter.js +%%DATADIR%%/resources/inspector/elements/StylePropertyTreeElement.js +%%DATADIR%%/resources/inspector/elements/StylesSidebarPane.js %%DATADIR%%/resources/inspector/elements_test_runner/elements_test_runner_module.js +%%DATADIR%%/resources/inspector/emulated_devices/MotoG4-landscape.svg +%%DATADIR%%/resources/inspector/emulated_devices/MotoG4-portrait.svg %%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-landscape.svg %%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-portrait.svg %%DATADIR%%/resources/inspector/emulated_devices/Nexus6P-landscape.svg @@ -251,75 +510,587 @@ bin/iridium %%DATADIR%%/resources/inspector/emulated_devices/iPhone6-portrait.svg %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg +%%DATADIR%%/resources/inspector/emulation/AdvancedApp.js +%%DATADIR%%/resources/inspector/emulation/DeviceModeModel.js +%%DATADIR%%/resources/inspector/emulation/DeviceModeToolbar.js +%%DATADIR%%/resources/inspector/emulation/DeviceModeView.js +%%DATADIR%%/resources/inspector/emulation/DeviceModeWrapper.js +%%DATADIR%%/resources/inspector/emulation/DevicesSettingsTab.js +%%DATADIR%%/resources/inspector/emulation/EmulatedDevices.js +%%DATADIR%%/resources/inspector/emulation/emulation-legacy.js +%%DATADIR%%/resources/inspector/emulation/emulation.js +%%DATADIR%%/resources/inspector/emulation/GeolocationsSettingsTab.js +%%DATADIR%%/resources/inspector/emulation/InspectedPagePlaceholder.js +%%DATADIR%%/resources/inspector/emulation/MediaQueryInspector.js +%%DATADIR%%/resources/inspector/emulation/SensorsView.js %%DATADIR%%/resources/inspector/event_listeners/event_listeners_module.js +%%DATADIR%%/resources/inspector/event_listeners/event_listeners-legacy.js +%%DATADIR%%/resources/inspector/event_listeners/event_listeners.js +%%DATADIR%%/resources/inspector/event_listeners/EventListenersUtils.js +%%DATADIR%%/resources/inspector/event_listeners/EventListenersView.js %%DATADIR%%/resources/inspector/extensions_test_runner/extensions_test_runner_module.js -%%DATADIR%%/resources/inspector/formatter_worker.js +%%DATADIR%%/resources/inspector/extensions/ExtensionAPI.js +%%DATADIR%%/resources/inspector/extensions/ExtensionPanel.js +%%DATADIR%%/resources/inspector/extensions/extensions-legacy.js +%%DATADIR%%/resources/inspector/extensions/extensions.js +%%DATADIR%%/resources/inspector/extensions/ExtensionServer.js +%%DATADIR%%/resources/inspector/extensions/ExtensionTraceProvider.js +%%DATADIR%%/resources/inspector/extensions/ExtensionView.js +%%DATADIR%%/resources/inspector/formatter_worker_entrypoint.js +%%DATADIR%%/resources/inspector/formatter_worker/acorn/acorn.js +%%DATADIR%%/resources/inspector/formatter_worker/acorn/acorn_loose.js +%%DATADIR%%/resources/inspector/formatter_worker/AcornTokenizer.js +%%DATADIR%%/resources/inspector/formatter_worker/CSSFormatter.js +%%DATADIR%%/resources/inspector/formatter_worker/CSSRuleParser.js +%%DATADIR%%/resources/inspector/formatter_worker/ESTreeWalker.js +%%DATADIR%%/resources/inspector/formatter_worker/FormattedContentBuilder.js +%%DATADIR%%/resources/inspector/formatter_worker/formatter_worker.js +%%DATADIR%%/resources/inspector/formatter_worker/formatter_worker-legacy.js +%%DATADIR%%/resources/inspector/formatter_worker/FormatterWorker.js +%%DATADIR%%/resources/inspector/formatter_worker/HTMLFormatter.js +%%DATADIR%%/resources/inspector/formatter_worker/IdentityFormatter.js +%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptFormatter.js +%%DATADIR%%/resources/inspector/formatter_worker/JavaScriptOutline.js +%%DATADIR%%/resources/inspector/formatter_worker/RelaxedJSONParser.js %%DATADIR%%/resources/inspector/formatter/formatter_module.js +%%DATADIR%%/resources/inspector/formatter/formatter-legacy.js +%%DATADIR%%/resources/inspector/formatter/formatter.js +%%DATADIR%%/resources/inspector/formatter/FormatterWorkerPool.js +%%DATADIR%%/resources/inspector/formatter/ScriptFormatter.js +%%DATADIR%%/resources/inspector/formatter/SourceFormatter.js %%DATADIR%%/resources/inspector/har_importer/har_importer_module.js +%%DATADIR%%/resources/inspector/har_importer/har_importer-legacy.js +%%DATADIR%%/resources/inspector/har_importer/har_importer.js +%%DATADIR%%/resources/inspector/har_importer/HARFormat.js +%%DATADIR%%/resources/inspector/har_importer/HARImporter.js %%DATADIR%%/resources/inspector/heap_profiler_test_runner/heap_profiler_test_runner_module.js %%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model_module.js -%%DATADIR%%/resources/inspector/heap_snapshot_worker.js +%%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model-legacy.js +%%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model.js +%%DATADIR%%/resources/inspector/heap_snapshot_model/HeapSnapshotModel.js +%%DATADIR%%/resources/inspector/heap_snapshot_worker_entrypoint.js +%%DATADIR%%/resources/inspector/heap_snapshot_worker/AllocationProfile.js %%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker_module.js +%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker-legacy.js +%%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker.js +%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshot.js +%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotLoader.js +%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorker.js +%%DATADIR%%/resources/inspector/heap_snapshot_worker/HeapSnapshotWorkerDispatcher.js %%DATADIR%%/resources/inspector/help/help_module.js +%%DATADIR%%/resources/inspector/help/help-legacy.js +%%DATADIR%%/resources/inspector/help/help.js +%%DATADIR%%/resources/inspector/help/HelpImpl.js +%%DATADIR%%/resources/inspector/help/ReleaseNoteText.js +%%DATADIR%%/resources/inspector/help/ReleaseNoteView.js +%%DATADIR%%/resources/inspector/host/host.js +%%DATADIR%%/resources/inspector/host/host-legacy.js +%%DATADIR%%/resources/inspector/host/InspectorFrontendHost.js +%%DATADIR%%/resources/inspector/host/InspectorFrontendHostAPI.js +%%DATADIR%%/resources/inspector/host/Platform.js +%%DATADIR%%/resources/inspector/host/ResourceLoader.js +%%DATADIR%%/resources/inspector/host/UserMetrics.js +%%DATADIR%%/resources/inspector/inline_editor/BezierEditor.js +%%DATADIR%%/resources/inspector/inline_editor/BezierUI.js +%%DATADIR%%/resources/inspector/inline_editor/ColorSwatch.js +%%DATADIR%%/resources/inspector/inline_editor/CSSShadowEditor.js +%%DATADIR%%/resources/inspector/inline_editor/CSSShadowModel.js %%DATADIR%%/resources/inspector/inline_editor/inline_editor_module.js +%%DATADIR%%/resources/inspector/inline_editor/inline_editor-legacy.js +%%DATADIR%%/resources/inspector/inline_editor/inline_editor.js +%%DATADIR%%/resources/inspector/inline_editor/SwatchPopoverHelper.js +%%DATADIR%%/resources/inspector/input/input_module.js +%%DATADIR%%/resources/inspector/input/input-legacy.js +%%DATADIR%%/resources/inspector/input/input.js +%%DATADIR%%/resources/inspector/input/InputModel.js +%%DATADIR%%/resources/inspector/input/InputTimeline.js +%%DATADIR%%/resources/inspector/inspector_main/inspector_main.js +%%DATADIR%%/resources/inspector/inspector_main/inspector_main-legacy.js +%%DATADIR%%/resources/inspector/inspector_main/InspectorMain.js +%%DATADIR%%/resources/inspector/inspector_main/RenderingOptions.js %%DATADIR%%/resources/inspector/inspector.html %%DATADIR%%/resources/inspector/inspector.js %%DATADIR%%/resources/inspector/integration_test_runner.html %%DATADIR%%/resources/inspector/integration_test_runner.js %%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata_module.js +%%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata-legacy.js +%%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata.js +%%DATADIR%%/resources/inspector/javascript_metadata/JavaScriptMetadata.js +%%DATADIR%%/resources/inspector/javascript_metadata/NativeFunctions.js %%DATADIR%%/resources/inspector/js_app.html %%DATADIR%%/resources/inspector/js_app.js +%%DATADIR%%/resources/inspector/js_main/js_main.js +%%DATADIR%%/resources/inspector/js_main/js_main-legacy.js +%%DATADIR%%/resources/inspector/js_main/JsMain.js %%DATADIR%%/resources/inspector/js_profiler/js_profiler_module.js %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer_module.js +%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer-legacy.js +%%DATADIR%%/resources/inspector/layer_viewer/layer_viewer.js +%%DATADIR%%/resources/inspector/layer_viewer/LayerDetailsView.js +%%DATADIR%%/resources/inspector/layer_viewer/Layers3DView.js +%%DATADIR%%/resources/inspector/layer_viewer/LayerTreeOutline.js +%%DATADIR%%/resources/inspector/layer_viewer/LayerViewHost.js +%%DATADIR%%/resources/inspector/layer_viewer/PaintProfilerView.js +%%DATADIR%%/resources/inspector/layer_viewer/TransformController.js %%DATADIR%%/resources/inspector/layers/layers_module.js +%%DATADIR%%/resources/inspector/layers/layers-legacy.js +%%DATADIR%%/resources/inspector/layers/layers.js +%%DATADIR%%/resources/inspector/layers/LayerPaintProfilerView.js +%%DATADIR%%/resources/inspector/layers/LayersPanel.js +%%DATADIR%%/resources/inspector/layers/LayerTreeModel.js %%DATADIR%%/resources/inspector/layers_test_runner/layers_test_runner_module.js +%%DATADIR%%/resources/inspector/main/ExecutionContextSelector.js +%%DATADIR%%/resources/inspector/main/main-legacy.js +%%DATADIR%%/resources/inspector/main/main.js +%%DATADIR%%/resources/inspector/main/MainImpl.js +%%DATADIR%%/resources/inspector/main/SimpleApp.js +%%DATADIR%%/resources/inspector/media/media_module.js +%%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling.js +%%DATADIR%%/resources/inspector/mobile_throttling/mobile_throttling-legacy.js +%%DATADIR%%/resources/inspector/mobile_throttling/MobileThrottlingSelector.js +%%DATADIR%%/resources/inspector/mobile_throttling/NetworkPanelIndicator.js +%%DATADIR%%/resources/inspector/mobile_throttling/NetworkThrottlingSelector.js +%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingManager.js +%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingPresets.js +%%DATADIR%%/resources/inspector/mobile_throttling/ThrottlingSettingsTab.js %%DATADIR%%/resources/inspector/ndb_app.html %%DATADIR%%/resources/inspector/ndb_app.js %%DATADIR%%/resources/inspector/network/network_module.js +%%DATADIR%%/resources/inspector/network/network-legacy.js +%%DATADIR%%/resources/inspector/network/network.js +%%DATADIR%%/resources/inspector/network/BinaryResourceView.js +%%DATADIR%%/resources/inspector/network/BlockedURLsPane.js +%%DATADIR%%/resources/inspector/network/EventSourceMessagesView.js +%%DATADIR%%/resources/inspector/network/HARWriter.js +%%DATADIR%%/resources/inspector/network/NetworkConfigView.js +%%DATADIR%%/resources/inspector/network/NetworkDataGridNode.js +%%DATADIR%%/resources/inspector/network/NetworkFrameGrouper.js +%%DATADIR%%/resources/inspector/network/NetworkItemView.js +%%DATADIR%%/resources/inspector/network/NetworkLogView.js +%%DATADIR%%/resources/inspector/network/NetworkLogViewColumns.js +%%DATADIR%%/resources/inspector/network/NetworkManageCustomHeadersView.js +%%DATADIR%%/resources/inspector/network/NetworkOverview.js +%%DATADIR%%/resources/inspector/network/NetworkPanel.js +%%DATADIR%%/resources/inspector/network/NetworkSearchScope.js +%%DATADIR%%/resources/inspector/network/NetworkTimeCalculator.js +%%DATADIR%%/resources/inspector/network/NetworkWaterfallColumn.js +%%DATADIR%%/resources/inspector/network/RequestCookiesView.js +%%DATADIR%%/resources/inspector/network/RequestHeadersView.js +%%DATADIR%%/resources/inspector/network/RequestHTMLView.js +%%DATADIR%%/resources/inspector/network/RequestInitiatorView.js +%%DATADIR%%/resources/inspector/network/RequestPreviewView.js +%%DATADIR%%/resources/inspector/network/RequestResponseView.js +%%DATADIR%%/resources/inspector/network/RequestTimingView.js +%%DATADIR%%/resources/inspector/network/ResourceWebSocketFrameView.js +%%DATADIR%%/resources/inspector/network/SignedExchangeInfoView.js %%DATADIR%%/resources/inspector/network_test_runner/network_test_runner_module.js %%DATADIR%%/resources/inspector/node_app.html %%DATADIR%%/resources/inspector/node_app.js %%DATADIR%%/resources/inspector/node_debugger/node_debugger_module.js +%%DATADIR%%/resources/inspector/node_main/node_main-legacy.js +%%DATADIR%%/resources/inspector/node_main/node_main.js +%%DATADIR%%/resources/inspector/node_main/NodeConnectionsPanel.js +%%DATADIR%%/resources/inspector/node_main/NodeMain.js %%DATADIR%%/resources/inspector/object_ui/object_ui_module.js +%%DATADIR%%/resources/inspector/object_ui/object_ui-legacy.js +%%DATADIR%%/resources/inspector/object_ui/object_ui.js +%%DATADIR%%/resources/inspector/object_ui/CustomPreviewComponent.js +%%DATADIR%%/resources/inspector/object_ui/JavaScriptAutocomplete.js +%%DATADIR%%/resources/inspector/object_ui/ObjectPopoverHelper.js +%%DATADIR%%/resources/inspector/object_ui/ObjectPropertiesSection.js +%%DATADIR%%/resources/inspector/object_ui/RemoteObjectPreviewFormatter.js +%%DATADIR%%/resources/inspector/object_ui/JavaScriptREPL.js %%DATADIR%%/resources/inspector/perf_ui/perf_ui_module.js +%%DATADIR%%/resources/inspector/perf_ui/perf_ui-legacy.js +%%DATADIR%%/resources/inspector/perf_ui/perf_ui.js +%%DATADIR%%/resources/inspector/perf_ui/ChartViewport.js +%%DATADIR%%/resources/inspector/perf_ui/FilmStripView.js +%%DATADIR%%/resources/inspector/perf_ui/FlameChart.js +%%DATADIR%%/resources/inspector/perf_ui/GCActionDelegate.js +%%DATADIR%%/resources/inspector/perf_ui/LineLevelProfile.js +%%DATADIR%%/resources/inspector/perf_ui/LiveHeapProfile.js +%%DATADIR%%/resources/inspector/perf_ui/NetworkPriorities.js +%%DATADIR%%/resources/inspector/perf_ui/OverviewGrid.js +%%DATADIR%%/resources/inspector/perf_ui/PieChart.js +%%DATADIR%%/resources/inspector/perf_ui/TimelineGrid.js +%%DATADIR%%/resources/inspector/perf_ui/TimelineOverviewPane.js %%DATADIR%%/resources/inspector/performance_monitor/performance_monitor_module.js +%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor-legacy.js +%%DATADIR%%/resources/inspector/performance_monitor/performance_monitor.js +%%DATADIR%%/resources/inspector/performance_monitor/PerformanceMonitor.js %%DATADIR%%/resources/inspector/performance_test_runner/performance_test_runner_module.js -%%DATADIR%%/resources/inspector/product_registry_impl/product_registry_impl_module.js +%%DATADIR%%/resources/inspector/persistence/Automapping.js +%%DATADIR%%/resources/inspector/persistence/EditFileSystemView.js +%%DATADIR%%/resources/inspector/persistence/FileSystemWorkspaceBinding.js +%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystem.js +%%DATADIR%%/resources/inspector/persistence/IsolatedFileSystemManager.js +%%DATADIR%%/resources/inspector/persistence/NetworkPersistenceManager.js +%%DATADIR%%/resources/inspector/persistence/persistence.js +%%DATADIR%%/resources/inspector/persistence/persistence-legacy.js +%%DATADIR%%/resources/inspector/persistence/PersistenceActions.js +%%DATADIR%%/resources/inspector/persistence/PersistenceImpl.js +%%DATADIR%%/resources/inspector/persistence/PersistenceUtils.js +%%DATADIR%%/resources/inspector/persistence/PlatformFileSystem.js +%%DATADIR%%/resources/inspector/persistence/WorkspaceSettingsTab.js +%%DATADIR%%/resources/inspector/platform/platform.js +%%DATADIR%%/resources/inspector/platform/utilities.js %%DATADIR%%/resources/inspector/profiler/profiler_module.js +%%DATADIR%%/resources/inspector/profiler/profiler-legacy.js +%%DATADIR%%/resources/inspector/profiler/profiler.js +%%DATADIR%%/resources/inspector/profiler/BottomUpProfileDataGrid.js +%%DATADIR%%/resources/inspector/profiler/ChildrenProvider.js +%%DATADIR%%/resources/inspector/profiler/CPUProfileFlameChart.js +%%DATADIR%%/resources/inspector/profiler/CPUProfileView.js +%%DATADIR%%/resources/inspector/profiler/HeapProfilerPanel.js +%%DATADIR%%/resources/inspector/profiler/HeapProfileView.js +%%DATADIR%%/resources/inspector/profiler/HeapSnapshotDataGrids.js +%%DATADIR%%/resources/inspector/profiler/HeapSnapshotGridNodes.js +%%DATADIR%%/resources/inspector/profiler/HeapSnapshotProxy.js +%%DATADIR%%/resources/inspector/profiler/HeapSnapshotView.js +%%DATADIR%%/resources/inspector/profiler/HeapTimelineOverview.js +%%DATADIR%%/resources/inspector/profiler/IsolateSelector.js +%%DATADIR%%/resources/inspector/profiler/LiveHeapProfileView.js +%%DATADIR%%/resources/inspector/profiler/ProfileDataGrid.js +%%DATADIR%%/resources/inspector/profiler/ProfileHeader.js +%%DATADIR%%/resources/inspector/profiler/ProfileLauncherView.js +%%DATADIR%%/resources/inspector/profiler/ProfileSidebarTreeElement.js +%%DATADIR%%/resources/inspector/profiler/ProfilesPanel.js +%%DATADIR%%/resources/inspector/profiler/ProfileTypeRegistry.js +%%DATADIR%%/resources/inspector/profiler/ProfileView.js +%%DATADIR%%/resources/inspector/profiler/TopDownProfileDataGrid.js %%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor_module.js +%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor-legacy.js +%%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor.js +%%DATADIR%%/resources/inspector/protocol_monitor/ProtocolMonitor.js +%%DATADIR%%/resources/inspector/protocol/InspectorBackend.js +%%DATADIR%%/resources/inspector/protocol/NodeURL.js +%%DATADIR%%/resources/inspector/protocol/protocol.js +%%DATADIR%%/resources/inspector/protocol/protocol-legacy.js %%DATADIR%%/resources/inspector/quick_open/quick_open_module.js +%%DATADIR%%/resources/inspector/quick_open/quick_open-legacy.js +%%DATADIR%%/resources/inspector/quick_open/quick_open.js +%%DATADIR%%/resources/inspector/quick_open/CommandMenu.js +%%DATADIR%%/resources/inspector/quick_open/FilteredListWidget.js +%%DATADIR%%/resources/inspector/quick_open/HelpQuickOpen.js +%%DATADIR%%/resources/inspector/quick_open/QuickOpen.js %%DATADIR%%/resources/inspector/resources/resources_module.js +%%DATADIR%%/resources/inspector/resources/resources-legacy.js +%%DATADIR%%/resources/inspector/resources/resources.js +%%DATADIR%%/resources/inspector/resources/ApplicationCacheItemsView.js +%%DATADIR%%/resources/inspector/resources/ApplicationCacheModel.js +%%DATADIR%%/resources/inspector/resources/ApplicationPanelSidebar.js +%%DATADIR%%/resources/inspector/resources/AppManifestView.js +%%DATADIR%%/resources/inspector/resources/BackgroundServiceModel.js +%%DATADIR%%/resources/inspector/resources/BackgroundServiceView.js +%%DATADIR%%/resources/inspector/resources/ClearStorageView.js +%%DATADIR%%/resources/inspector/resources/CookieItemsView.js +%%DATADIR%%/resources/inspector/resources/DatabaseModel.js +%%DATADIR%%/resources/inspector/resources/DatabaseQueryView.js +%%DATADIR%%/resources/inspector/resources/DatabaseTableView.js +%%DATADIR%%/resources/inspector/resources/DOMStorageItemsView.js +%%DATADIR%%/resources/inspector/resources/DOMStorageModel.js +%%DATADIR%%/resources/inspector/resources/IndexedDBModel.js +%%DATADIR%%/resources/inspector/resources/IndexedDBViews.js +%%DATADIR%%/resources/inspector/resources/ResourcesPanel.js +%%DATADIR%%/resources/inspector/resources/ServiceWorkerCacheViews.js +%%DATADIR%%/resources/inspector/resources/ServiceWorkersView.js +%%DATADIR%%/resources/inspector/resources/StorageItemsView.js +%%DATADIR%%/resources/inspector/root.js +%%DATADIR%%/resources/inspector/Runtime.js +%%DATADIR%%/resources/inspector/screencast/InputModel.js +%%DATADIR%%/resources/inspector/screencast/screencast.js +%%DATADIR%%/resources/inspector/screencast/screencast-legacy.js +%%DATADIR%%/resources/inspector/screencast/ScreencastApp.js +%%DATADIR%%/resources/inspector/screencast/ScreencastView.js %%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner_module.js +%%DATADIR%%/resources/inspector/sdk/ChildTargetManager.js +%%DATADIR%%/resources/inspector/sdk/CompilerSourceMappingContentProvider.js +%%DATADIR%%/resources/inspector/sdk/Connections.js +%%DATADIR%%/resources/inspector/sdk/ConsoleModel.js +%%DATADIR%%/resources/inspector/sdk/Cookie.js +%%DATADIR%%/resources/inspector/sdk/CookieModel.js +%%DATADIR%%/resources/inspector/sdk/CookieParser.js +%%DATADIR%%/resources/inspector/sdk/CPUProfileDataModel.js +%%DATADIR%%/resources/inspector/sdk/CPUProfilerModel.js +%%DATADIR%%/resources/inspector/sdk/CSSMatchedStyles.js +%%DATADIR%%/resources/inspector/sdk/CSSMedia.js +%%DATADIR%%/resources/inspector/sdk/CSSMetadata.js +%%DATADIR%%/resources/inspector/sdk/CSSModel.js +%%DATADIR%%/resources/inspector/sdk/CSSProperty.js +%%DATADIR%%/resources/inspector/sdk/CSSRule.js +%%DATADIR%%/resources/inspector/sdk/CSSStyleDeclaration.js +%%DATADIR%%/resources/inspector/sdk/CSSStyleSheetHeader.js +%%DATADIR%%/resources/inspector/sdk/DebuggerModel.js +%%DATADIR%%/resources/inspector/sdk/DOMDebuggerModel.js +%%DATADIR%%/resources/inspector/sdk/DOMModel.js +%%DATADIR%%/resources/inspector/sdk/EmulationModel.js +%%DATADIR%%/resources/inspector/sdk/FilmStripModel.js +%%DATADIR%%/resources/inspector/sdk/HARLog.js +%%DATADIR%%/resources/inspector/sdk/HeapProfilerModel.js +%%DATADIR%%/resources/inspector/sdk/IsolateManager.js +%%DATADIR%%/resources/inspector/sdk/IssuesModel.js +%%DATADIR%%/resources/inspector/sdk/LayerTreeBase.js +%%DATADIR%%/resources/inspector/sdk/LogModel.js +%%DATADIR%%/resources/inspector/sdk/NetworkLog.js +%%DATADIR%%/resources/inspector/sdk/NetworkManager.js +%%DATADIR%%/resources/inspector/sdk/NetworkRequest.js +%%DATADIR%%/resources/inspector/sdk/OverlayModel.js +%%DATADIR%%/resources/inspector/sdk/PaintProfiler.js +%%DATADIR%%/resources/inspector/sdk/PerformanceMetricsModel.js +%%DATADIR%%/resources/inspector/sdk/ProfileTreeModel.js +%%DATADIR%%/resources/inspector/sdk/RemoteObject.js +%%DATADIR%%/resources/inspector/sdk/Resource.js +%%DATADIR%%/resources/inspector/sdk/ResourceTreeModel.js +%%DATADIR%%/resources/inspector/sdk/RuntimeModel.js +%%DATADIR%%/resources/inspector/sdk/ScreenCaptureModel.js +%%DATADIR%%/resources/inspector/sdk/Script.js +%%DATADIR%%/resources/inspector/sdk/sdk.js +%%DATADIR%%/resources/inspector/sdk/sdk-legacy.js +%%DATADIR%%/resources/inspector/sdk/SDKModel.js +%%DATADIR%%/resources/inspector/sdk/SecurityOriginManager.js +%%DATADIR%%/resources/inspector/sdk/ServerTiming.js +%%DATADIR%%/resources/inspector/sdk/ServiceWorkerCacheModel.js +%%DATADIR%%/resources/inspector/sdk/ServiceWorkerManager.js +%%DATADIR%%/resources/inspector/sdk/SourceMap.js +%%DATADIR%%/resources/inspector/sdk/SourceMapManager.js +%%DATADIR%%/resources/inspector/sdk/TracingManager.js +%%DATADIR%%/resources/inspector/sdk/TracingModel.js +%%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map_bg.wasm +%%DATADIR%%/resources/inspector/sdk/wasm_source_map/pkg/wasm_source_map.js %%DATADIR%%/resources/inspector/search/search_module.js +%%DATADIR%%/resources/inspector/search/search-legacy.js +%%DATADIR%%/resources/inspector/search/search.js +%%DATADIR%%/resources/inspector/search/SearchConfig.js +%%DATADIR%%/resources/inspector/search/SearchResultsPane.js +%%DATADIR%%/resources/inspector/search/SearchView.js %%DATADIR%%/resources/inspector/security/security_module.js +%%DATADIR%%/resources/inspector/security/security-legacy.js +%%DATADIR%%/resources/inspector/security/security.js +%%DATADIR%%/resources/inspector/security/SecurityModel.js +%%DATADIR%%/resources/inspector/security/SecurityPanel.js %%DATADIR%%/resources/inspector/security_test_runner/security_test_runner_module.js +%%DATADIR%%/resources/inspector/services/ServiceManager.js +%%DATADIR%%/resources/inspector/services/services.js +%%DATADIR%%/resources/inspector/services/services-legacy.js %%DATADIR%%/resources/inspector/settings/settings_module.js +%%DATADIR%%/resources/inspector/settings/settings-legacy.js +%%DATADIR%%/resources/inspector/settings/settings.js +%%DATADIR%%/resources/inspector/settings/FrameworkBlackboxSettingsTab.js +%%DATADIR%%/resources/inspector/settings/SettingsScreen.js %%DATADIR%%/resources/inspector/shell.js %%DATADIR%%/resources/inspector/snippets/snippets_module.js +%%DATADIR%%/resources/inspector/snippets/snippets-legacy.js +%%DATADIR%%/resources/inspector/snippets/snippets.js +%%DATADIR%%/resources/inspector/snippets/ScriptSnippetFileSystem.js +%%DATADIR%%/resources/inspector/snippets/SnippetsQuickOpen.js %%DATADIR%%/resources/inspector/source_frame/source_frame_module.js +%%DATADIR%%/resources/inspector/source_frame/source_frame-legacy.js +%%DATADIR%%/resources/inspector/source_frame/source_frame.js +%%DATADIR%%/resources/inspector/source_frame/BinaryResourceViewFactory.js +%%DATADIR%%/resources/inspector/source_frame/FontView.js +%%DATADIR%%/resources/inspector/source_frame/ImageView.js +%%DATADIR%%/resources/inspector/source_frame/JSONView.js +%%DATADIR%%/resources/inspector/source_frame/PreviewFactory.js +%%DATADIR%%/resources/inspector/source_frame/ResourceSourceFrame.js +%%DATADIR%%/resources/inspector/source_frame/SourceCodeDiff.js +%%DATADIR%%/resources/inspector/source_frame/SourceFrame.js +%%DATADIR%%/resources/inspector/source_frame/SourcesTextEditor.js +%%DATADIR%%/resources/inspector/source_frame/XMLView.js %%DATADIR%%/resources/inspector/sources/sources_module.js +%%DATADIR%%/resources/inspector/sources/sources-legacy.js +%%DATADIR%%/resources/inspector/sources/sources.js +%%DATADIR%%/resources/inspector/sources/AddSourceMapURLDialog.js +%%DATADIR%%/resources/inspector/sources/BreakpointEditDialog.js +%%DATADIR%%/resources/inspector/sources/CallStackSidebarPane.js +%%DATADIR%%/resources/inspector/sources/CoveragePlugin.js +%%DATADIR%%/resources/inspector/sources/CSSPlugin.js +%%DATADIR%%/resources/inspector/sources/DebuggerPausedMessage.js +%%DATADIR%%/resources/inspector/sources/DebuggerPlugin.js +%%DATADIR%%/resources/inspector/sources/EditingLocationHistoryManager.js +%%DATADIR%%/resources/inspector/sources/FilePathScoreFunction.js +%%DATADIR%%/resources/inspector/sources/FilteredUISourceCodeListProvider.js +%%DATADIR%%/resources/inspector/sources/GoToLineQuickOpen.js +%%DATADIR%%/resources/inspector/sources/GutterDiffPlugin.js +%%DATADIR%%/resources/inspector/sources/InplaceFormatterEditorAction.js +%%DATADIR%%/resources/inspector/sources/JavaScriptBreakpointsSidebarPane.js +%%DATADIR%%/resources/inspector/sources/JavaScriptCompilerPlugin.js +%%DATADIR%%/resources/inspector/sources/NavigatorView.js +%%DATADIR%%/resources/inspector/sources/OpenFileQuickOpen.js +%%DATADIR%%/resources/inspector/sources/OutlineQuickOpen.js +%%DATADIR%%/resources/inspector/sources/Plugin.js +%%DATADIR%%/resources/inspector/sources/ScopeChainSidebarPane.js +%%DATADIR%%/resources/inspector/sources/ScriptFormatterEditorAction.js +%%DATADIR%%/resources/inspector/sources/ScriptOriginPlugin.js +%%DATADIR%%/resources/inspector/sources/SearchSourcesView.js +%%DATADIR%%/resources/inspector/sources/SimpleHistoryManager.js +%%DATADIR%%/resources/inspector/sources/SnippetsPlugin.js +%%DATADIR%%/resources/inspector/sources/SourceMapNamesResolver.js +%%DATADIR%%/resources/inspector/sources/SourcesNavigator.js +%%DATADIR%%/resources/inspector/sources/SourcesPanel.js +%%DATADIR%%/resources/inspector/sources/SourcesSearchScope.js +%%DATADIR%%/resources/inspector/sources/SourcesView.js +%%DATADIR%%/resources/inspector/sources/TabbedEditorContainer.js +%%DATADIR%%/resources/inspector/sources/ThreadsSidebarPane.js +%%DATADIR%%/resources/inspector/sources/UISourceCodeFrame.js +%%DATADIR%%/resources/inspector/sources/WatchExpressionsSidebarPane.js %%DATADIR%%/resources/inspector/sources_test_runner/sources_test_runner_module.js -%%DATADIR%%/resources/inspector/terminal/terminal_module.js +%%DATADIR%%/resources/inspector/test_runner/test_runner.js +%%DATADIR%%/resources/inspector/test_runner/TestRunner.js %%DATADIR%%/resources/inspector/text_editor/text_editor_module.js -%%DATADIR%%/resources/inspector/timeline/timeline_module.js +%%DATADIR%%/resources/inspector/text_editor/CodeMirrorTextEditor.js +%%DATADIR%%/resources/inspector/text_editor/CodeMirrorUtils.js +%%DATADIR%%/resources/inspector/text_editor/text_editor.js +%%DATADIR%%/resources/inspector/text_editor/text_editor-legacy.js +%%DATADIR%%/resources/inspector/text_editor/TextEditorAutocompleteController.js +%%DATADIR%%/resources/inspector/text_utils/text_utils.js +%%DATADIR%%/resources/inspector/text_utils/text_utils-legacy.js +%%DATADIR%%/resources/inspector/text_utils/Text.js +%%DATADIR%%/resources/inspector/text_utils/TextCursor.js +%%DATADIR%%/resources/inspector/text_utils/TextRange.js +%%DATADIR%%/resources/inspector/text_utils/TextUtils.js +%%DATADIR%%/resources/inspector/third_party/wasmparser/WasmDis.js +%%DATADIR%%/resources/inspector/third_party/wasmparser/WasmParser.js %%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js +%%DATADIR%%/resources/inspector/timeline_model/timeline_model-legacy.js +%%DATADIR%%/resources/inspector/timeline_model/timeline_model.js +%%DATADIR%%/resources/inspector/timeline_model/TimelineFrameModel.js +%%DATADIR%%/resources/inspector/timeline_model/TimelineIRModel.js +%%DATADIR%%/resources/inspector/timeline_model/TimelineJSProfile.js +%%DATADIR%%/resources/inspector/timeline_model/TimelineModel.js +%%DATADIR%%/resources/inspector/timeline_model/TimelineModelFilter.js +%%DATADIR%%/resources/inspector/timeline_model/TimelineProfileTree.js +%%DATADIR%%/resources/inspector/timeline_model/TracingLayerTree.js +%%DATADIR%%/resources/inspector/timeline/timeline_module.js +%%DATADIR%%/resources/inspector/timeline/timeline-legacy.js +%%DATADIR%%/resources/inspector/timeline/timeline.js +%%DATADIR%%/resources/inspector/timeline/CountersGraph.js +%%DATADIR%%/resources/inspector/timeline/EventsTimelineTreeView.js +%%DATADIR%%/resources/inspector/timeline/ExtensionTracingSession.js +%%DATADIR%%/resources/inspector/timeline/PerformanceModel.js +%%DATADIR%%/resources/inspector/timeline/TimelineController.js +%%DATADIR%%/resources/inspector/timeline/TimelineDetailsView.js +%%DATADIR%%/resources/inspector/timeline/TimelineEventOverview.js +%%DATADIR%%/resources/inspector/timeline/TimelineFilters.js +%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartDataProvider.js +%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartNetworkDataProvider.js +%%DATADIR%%/resources/inspector/timeline/TimelineFlameChartView.js +%%DATADIR%%/resources/inspector/timeline/TimelineHistoryManager.js +%%DATADIR%%/resources/inspector/timeline/TimelineLayersView.js +%%DATADIR%%/resources/inspector/timeline/TimelineLoader.js +%%DATADIR%%/resources/inspector/timeline/TimelinePaintProfilerView.js +%%DATADIR%%/resources/inspector/timeline/TimelinePanel.js +%%DATADIR%%/resources/inspector/timeline/TimelineTreeView.js +%%DATADIR%%/resources/inspector/timeline/TimelineUIUtils.js +%%DATADIR%%/resources/inspector/timeline/UIDevtoolsController.js +%%DATADIR%%/resources/inspector/timeline/UIDevtoolsUtils.js +%%DATADIR%%/resources/inspector/toolbox_bootstrap/toolbox_bootstrap.js %%DATADIR%%/resources/inspector/toolbox.html %%DATADIR%%/resources/inspector/toolbox.js +%%DATADIR%%/resources/inspector/ui/Action.js +%%DATADIR%%/resources/inspector/ui/ActionDelegate.js +%%DATADIR%%/resources/inspector/ui/ActionRegistry.js +%%DATADIR%%/resources/inspector/ui/ARIAUtils.js +%%DATADIR%%/resources/inspector/ui/Context.js +%%DATADIR%%/resources/inspector/ui/ContextFlavorListener.js +%%DATADIR%%/resources/inspector/ui/ContextMenu.js +%%DATADIR%%/resources/inspector/ui/Dialog.js +%%DATADIR%%/resources/inspector/ui/DropTarget.js +%%DATADIR%%/resources/inspector/ui/EmptyWidget.js +%%DATADIR%%/resources/inspector/ui/FilterBar.js +%%DATADIR%%/resources/inspector/ui/FilterSuggestionBuilder.js +%%DATADIR%%/resources/inspector/ui/ForwardedInputEventHandler.js +%%DATADIR%%/resources/inspector/ui/Fragment.js +%%DATADIR%%/resources/inspector/ui/Geometry.js +%%DATADIR%%/resources/inspector/ui/GlassPane.js +%%DATADIR%%/resources/inspector/ui/HistoryInput.js +%%DATADIR%%/resources/inspector/ui/Icon.js +%%DATADIR%%/resources/inspector/ui/Infobar.js +%%DATADIR%%/resources/inspector/ui/InplaceEditor.js +%%DATADIR%%/resources/inspector/ui/InspectorView.js +%%DATADIR%%/resources/inspector/ui/KeyboardShortcut.js +%%DATADIR%%/resources/inspector/ui/ListControl.js +%%DATADIR%%/resources/inspector/ui/ListModel.js +%%DATADIR%%/resources/inspector/ui/ListWidget.js +%%DATADIR%%/resources/inspector/ui/Panel.js +%%DATADIR%%/resources/inspector/ui/PopoverHelper.js +%%DATADIR%%/resources/inspector/ui/ProgressIndicator.js +%%DATADIR%%/resources/inspector/ui/RemoteDebuggingTerminatedScreen.js +%%DATADIR%%/resources/inspector/ui/ReportView.js +%%DATADIR%%/resources/inspector/ui/ResizerWidget.js +%%DATADIR%%/resources/inspector/ui/RootView.js +%%DATADIR%%/resources/inspector/ui/SearchableView.js +%%DATADIR%%/resources/inspector/ui/SegmentedButton.js +%%DATADIR%%/resources/inspector/ui/SettingsUI.js +%%DATADIR%%/resources/inspector/ui/ShortcutRegistry.js +%%DATADIR%%/resources/inspector/ui/ShortcutsScreen.js +%%DATADIR%%/resources/inspector/ui/SoftContextMenu.js +%%DATADIR%%/resources/inspector/ui/SoftDropDown.js +%%DATADIR%%/resources/inspector/ui/SplitWidget.js +%%DATADIR%%/resources/inspector/ui/SuggestBox.js +%%DATADIR%%/resources/inspector/ui/SyntaxHighlighter.js +%%DATADIR%%/resources/inspector/ui/TabbedPane.js +%%DATADIR%%/resources/inspector/ui/TargetCrashedScreen.js +%%DATADIR%%/resources/inspector/ui/TextEditor.js +%%DATADIR%%/resources/inspector/ui/TextPrompt.js +%%DATADIR%%/resources/inspector/ui/ThrottledWidget.js +%%DATADIR%%/resources/inspector/ui/Toolbar.js +%%DATADIR%%/resources/inspector/ui/Tooltip.js +%%DATADIR%%/resources/inspector/ui/Treeoutline.js +%%DATADIR%%/resources/inspector/ui/ui.js +%%DATADIR%%/resources/inspector/ui/ui-legacy.js +%%DATADIR%%/resources/inspector/ui/UIUtils.js +%%DATADIR%%/resources/inspector/ui/View.js +%%DATADIR%%/resources/inspector/ui/ViewManager.js +%%DATADIR%%/resources/inspector/ui/Widget.js +%%DATADIR%%/resources/inspector/ui/XElement.js +%%DATADIR%%/resources/inspector/ui/XLink.js +%%DATADIR%%/resources/inspector/ui/XWidget.js +%%DATADIR%%/resources/inspector/ui/ZoomManager.js +%%DATADIR%%/resources/inspector/ui/utils/append-style.js +%%DATADIR%%/resources/inspector/ui/utils/create-shadow-root-with-core-styles.js +%%DATADIR%%/resources/inspector/ui/utils/focus-changed.js +%%DATADIR%%/resources/inspector/ui/utils/inject-core-styles.js +%%DATADIR%%/resources/inspector/ui/utils/measured-scrollbar-width.js +%%DATADIR%%/resources/inspector/ui/utils/register-custom-element.js +%%DATADIR%%/resources/inspector/ui/utils/utils.js +%%DATADIR%%/resources/inspector/wasmparser_worker_entrypoint.js +%%DATADIR%%/resources/inspector/wasmparser_worker/wasmparser_worker.js +%%DATADIR%%/resources/inspector/wasmparser_worker/WasmParserWorker.js +%%DATADIR%%/resources/inspector/web_audio/web_audio_module.js +%%DATADIR%%/resources/inspector/web_audio/web_audio-legacy.js +%%DATADIR%%/resources/inspector/web_audio/web_audio.js +%%DATADIR%%/resources/inspector/web_audio/AudioContextContentBuilder.js +%%DATADIR%%/resources/inspector/web_audio/AudioContextSelector.js +%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/EdgeView.js +%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphManager.js +%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphStyle.js +%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/GraphView.js +%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeRendererUtility.js +%%DATADIR%%/resources/inspector/web_audio/graph_visualizer/NodeView.js +%%DATADIR%%/resources/inspector/web_audio/WebAudioModel.js +%%DATADIR%%/resources/inspector/web_audio/WebAudioView.js %%DATADIR%%/resources/inspector/worker_app.html %%DATADIR%%/resources/inspector/worker_app.js +%%DATADIR%%/resources/inspector/worker_main/worker_main-legacy.js +%%DATADIR%%/resources/inspector/worker_main/worker_main.js +%%DATADIR%%/resources/inspector/worker_main/WorkerMain.js %%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js +%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff-legacy.js +%%DATADIR%%/resources/inspector/workspace_diff/workspace_diff.js +%%DATADIR%%/resources/inspector/workspace_diff/WorkspaceDiff.js +%%DATADIR%%/resources/inspector/workspace/FileManager.js +%%DATADIR%%/resources/inspector/workspace/UISourceCode.js +%%DATADIR%%/resources/inspector/workspace/workspace.js +%%DATADIR%%/resources/inspector/workspace/workspace-legacy.js +%%DATADIR%%/resources/inspector/workspace/WorkspaceImpl.js %%DATADIR%%/snapshot_blob.bin +%%DATADIR%%/libvk_swiftshader.so %%DATADIR%%/swiftshader/libEGL.so %%DATADIR%%/swiftshader/libGLESv2.so %%DATADIR%%/v8_context_snapshot.bin -%%DATADIR%%/views_mus_resources.pak %%DEBUG%%%%DATADIR%%/character_data_generator -%%DEBUG%%%%DATADIR%%/libVkICD_mock_icd.so -%%DEBUG%%%%DATADIR%%/libVkLayer_core_validation.so -%%DEBUG%%%%DATADIR%%/libVkLayer_object_tracker.so -%%DEBUG%%%%DATADIR%%/libVkLayer_parameter_validation.so -%%DEBUG%%%%DATADIR%%/libVkLayer_threading.so -%%DEBUG%%%%DATADIR%%/libVkLayer_unique_objects.so +%%DEBUG%%%%DATADIR%%/libVkLayer_khronos_validation.so +%%DEBUG%%%%DATADIR%%/libvulkan.so man/man1/iridium.1.gz share/applications/iridium-browser.desktop share/icons/hicolor/128x128/apps/iridium.png |