diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2020-07-06 06:43:37 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2020-07-06 06:43:37 +0000 |
| commit | 5f34284e7c01f03ee6735e7fcd3ec5783ab11777 (patch) | |
| tree | 46cfcccc197bb0d79ee8c9868007fd48adf2470d /www/qt5-webengine | |
| parent | 5e1f836349896a33cdb608a4b696d10528aa8393 (diff) | |
| download | ports-5f34284e7c01f03ee6735e7fcd3ec5783ab11777.tar.gz ports-5f34284e7c01f03ee6735e7fcd3ec5783ab11777.zip | |
Update Qt5 to 5.15
This is a major upgrade of the Qt libraries [1], [2].
* People that use upgrading mechanisms with incomplete dependency handling
(portmaster & Co) should make sure to manually remove the existing Qt
packages to guarantee a safe upgrade. Keep in mind, that Qt does not like if
you have an incomplete upgrade.
* This version of Qt drops support for OpenSSL 1.0 -- this means that there
won't be any binary packages for Qt5 provided by the FreeBSD package builders
for FreeBSD 11.x anymore -- and the same for *all* the ports depending on
net/qt5-network [3]. If you cannot upgrade to a more recent FreeBSD
version (12.x, 13.x), you will need to build Qt5 from ports while switching
to an SSL implementation from ports.
Big thanks are due for
* kai@ for updating webengine (also mikael@)
* Felix Palmen for providing LibreSSL support patches
* adridg@ and lbartoletti@ for helping me fix the fallout
[1] https://www.qt.io/blog/qt-5.15-released
[2] https://wiki.qt.io/New_Features_in_Qt_5.15
[3] https://www.freshports.org/net/qt5-network
PR: 247010
Exp-run by: antoine
Notes
Notes:
svn path=/head/; revision=541318
Diffstat (limited to 'www/qt5-webengine')
140 files changed, 1694 insertions, 1295 deletions
diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile index e37da4f71269..db861e455bbc 100644 --- a/www/qt5-webengine/Makefile +++ b/www/qt5-webengine/Makefile @@ -18,7 +18,6 @@ PORTNAME= webengine DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt5- @@ -49,7 +48,7 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libwebp.so:graphics/webp DISTINFO_FILE= ${.CURDIR}/distinfo -QT5_VERSION= 5.14.2 +QT5_VERSION= 5.15.0 OPTIONS_SINGLE= AUDIO OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO diff --git a/www/qt5-webengine/distinfo b/www/qt5-webengine/distinfo index 927e5aeb1e1b..9228ceb422d9 100644 --- a/www/qt5-webengine/distinfo +++ b/www/qt5-webengine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1586559398 -SHA256 (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947 -SIZE (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = 242467568 +TIMESTAMP = 1590608885 +SHA256 (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df +SIZE (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = 278257432 diff --git a/www/qt5-webengine/files/patch-configure.pri b/www/qt5-webengine/files/patch-configure.pri index f153617e41fd..82636d8a2f51 100644 --- a/www/qt5-webengine/files/patch-configure.pri +++ b/www/qt5-webengine/files/patch-configure.pri @@ -1,21 +1,21 @@ ---- configure.pri.orig 2019-12-03 07:18:02 UTC +--- configure.pri.orig 2020-04-08 09:41:36 UTC +++ configure.pri @@ -114,7 +114,7 @@ defineTest(qtwebengine_platformError) { defineTest(qtConfTest_detectPlatform) { QT_FOR_CONFIG += gui-private -- !linux:!win32:!macos { -+ !linux:!win32:!macos:!unix: { +- !linux:!win32:!macos:!ios { ++ !linux:!win32:!macos:!ios:!unix: { qtwebengine_platformError("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") } else { linux:qtwebengine_isLinuxPlatformSupported() { -@@ -126,6 +126,9 @@ defineTest(qtConfTest_detectPlatform) { +@@ -125,6 +125,9 @@ defineTest(qtConfTest_detectPlatform) { + } macos:qtwebengine_isMacOsPlatformSupported() { $${1}.platform = "macos" - } ++ } + unix:qtwebengine_isLinuxPlatformSupported() { + $${1}.platform = "linux" -+ } - } - - !isEmpty(platformError) { + } + ios:qtwebengine_isMacOsPlatformSupported() { + $${1}.platform = "ios" diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.cc deleted file mode 100644 index 99737cac979c..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.cc.orig 2019-05-23 12:39:34 UTC -+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.cc -@@ -440,7 +440,7 @@ static size_t PartitionPurgePage(internal::PartitionPa - #endif - } - // Terminate the freelist chain. -- *entry_ptr = nullptr; -+ *entry_ptr = internal::PartitionFreelistEntry::Transform(nullptr); - // The freelist head is stored unmasked. - page->freelist_head = - internal::PartitionFreelistEntry::Transform(page->freelist_head); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc index 6ac7376c3b82..dd7e0c12869c 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc @@ -1,18 +1,18 @@ ---- src/3rdparty/chromium/base/debug/elf_reader.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/base/debug/elf_reader.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/base/debug/elf_reader.cc -@@ -83,6 +83,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, - reinterpret_cast<const Nhdr*>(elf_base + header.p_vaddr); +@@ -98,6 +98,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, bool found = false; - while (current_note < section_end) { + 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) { - const char* note_name = - reinterpret_cast<const char*>(current_note) + sizeof(Nhdr); -@@ -92,6 +93,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, + StringPiece note_name(current_section + sizeof(Nhdr), + current_note->n_namesz); +@@ -107,6 +108,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, break; } } +#endif - current_note = reinterpret_cast<const Nhdr*>( - reinterpret_cast<const char*>(current_note) + sizeof(Nhdr) + + size_t section_size = bits::Align(current_note->n_namesz, 4) + + bits::Align(current_note->n_descsz, 4) + diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h index 7e5329dc161c..9e7a24cdca8a 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h.orig 2017-01-26 00:49:07 UTC +--- src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h @@ -5,6 +5,10 @@ #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc index 4d7ee99e9f95..b47db51f2b94 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc @@ -1,32 +1,20 @@ ---- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/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" +@@ -43,7 +43,7 @@ #endif -@@ -68,7 +68,11 @@ wchar_t g_debug_icu_pf_filename[_MAX_PATH]; - // No need to change the filename in multiple places (gyp files, windows - // build pkg configurations, etc). 'l' stands for Little Endian. - // This variable is exported through the header file. -+#if defined(ARCH_CPU_LITTLE_ENDIAN) - const char kIcuDataFileName[] = "icudtl.dat"; -+#else -+const char kIcuDataFileName[] = "icudtb.dat"; -+#endif - #if defined(OS_ANDROID) - const char kAndroidAssetsIcuDataFileName[] = "assets/icudtl.dat"; - #endif -@@ -290,7 +294,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) && !defined(IS_CHROMECAST)) ++ (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD) + #include "third_party/icu/source/i18n/unicode/timezone.h" #endif + +@@ -293,7 +293,7 @@ void InitializeIcuTimeZone() { + fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); + icu::TimeZone::adoptDefault( + icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); +-#elif defined(OS_LINUX) && !defined(IS_CHROMECAST) ++#elif (defined(OS_LINUX) && !defined(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/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc index 261fbfd49519..d477cf109bb0 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/linux_util.cc.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/base/linux_util.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/base/linux_util.cc -@@ -111,12 +111,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/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc new file mode 100644 index 000000000000..5aa744d1575d --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc.orig 2020-04-08 09:41:36 UTC ++++ src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc +@@ -271,7 +271,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/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_protected__memory__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_protected__memory__posix.cc deleted file mode 100644 index f92921f33751..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_protected__memory__posix.cc +++ /dev/null @@ -1,31 +0,0 @@ ---- src/3rdparty/chromium/base/memory/protected_memory_posix.cc.orig 2019-11-27 21:12:25 UTC -+++ src/3rdparty/chromium/base/memory/protected_memory_posix.cc -@@ -8,9 +8,9 @@ - #include <sys/mman.h> - #include <unistd.h> - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include <sys/resource.h> --#endif // defined(OS_LINUX) -+#endif // defined(OS_LINUX) || defined(OS_BSD) - - #if defined(OS_MACOSX) && !defined(OS_IOS) - #include <mach/mach.h> -@@ -44,7 +44,7 @@ bool AutoWritableMemory::SetMemoryReadOnly(void* start - return SetMemory(start, end, PROT_READ); - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - void AssertMemoryIsReadOnly(const void* ptr) { - #if DCHECK_IS_ON() - const uintptr_t page_mask = ~(base::GetPageSize() - 1); -@@ -74,6 +74,6 @@ void AssertMemoryIsReadOnly(const void* ptr) { - DCHECK_EQ(region_info.protection, VM_PROT_READ); - #endif // DCHECK_IS_ON() - } --#endif // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) -+#endif // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_BSD) - - } // namespace base diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_register__context.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_register__context.h new file mode 100644 index 000000000000..e43368959186 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_register__context.h @@ -0,0 +1,60 @@ +--- src/3rdparty/chromium/base/profiler/register_context.h.orig 2020-04-08 09:41:36 UTC ++++ src/3rdparty/chromium/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 + +@@ -152,6 +152,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/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc new file mode 100644 index 000000000000..318762d4070a --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.cc.orig 2020-04-08 09:41:36 UTC ++++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h new file mode 100644 index 000000000000..0954d059cff0 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.h.orig 2020-04-08 09:41:36 UTC ++++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__copier__signal.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__copier__signal.cc new file mode 100644 index 000000000000..12139c160f63 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__copier__signal.cc @@ -0,0 +1,65 @@ +--- src/3rdparty/chromium/base/profiler/stack_copier_signal.cc.orig 2020-04-08 09:41:36 UTC ++++ src/3rdparty/chromium/base/profiler/stack_copier_signal.cc +@@ -4,10 +4,16 @@ + + #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> + + #include <atomic> + +@@ -35,8 +41,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 +57,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: +@@ -201,11 +216,17 @@ 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) { ++ 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/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc new file mode 100644 index 000000000000..c939a8020f99 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc @@ -0,0 +1,63 @@ +--- src/3rdparty/chromium/base/profiler/thread_delegate_posix.cc.orig 2020-04-08 09:41:36 UTC ++++ src/3rdparty/chromium/base/profiler/thread_delegate_posix.cc +@@ -3,6 +3,9 @@ + // found in the LICENSE file. + + #include <pthread.h> ++#if defined(__FreeBSD__) ++#include <pthread_np.h> ++#endif + + #include "base/process/process_handle.h" + #include "base/profiler/thread_delegate_posix.h" +@@ -17,12 +20,20 @@ namespace { + uintptr_t GetThreadStackBaseAddressImpl( + SamplingProfilerThreadToken thread_token) { + pthread_attr_t attr; ++#if defined(OS_FREEBSD) ++ 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; + pthread_attr_getstack(&attr, &address, &size); + const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size; ++#if defined(OS_FREEBSD) ++ pthread_attr_destroy(&attr); ++#endif + return base_address; + } + +@@ -88,11 +99,19 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist + for (size_t i = 19; i <= 29; ++i) + registers.push_back(reinterpret_cast<uintptr_t*>(&thread_context->regs[i])); + return registers; +-#elif defined(ARCH_CPU_X86_64) // #if defined(ARCH_CPU_ARM_FAMILY) && +- // defined(ARCH_CPU_32_BITS) ++#elif defined(ARCH_CPU_X86_64) + 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]), +@@ -100,6 +119,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/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc index 04c1e1b70841..7dbb4163a24b 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/security_unittest.cc.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/base/security_unittest.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_base_strings_string__number__conversions__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_strings_string__number__conversions__unittest.cc deleted file mode 100644 index 2c01ffc584ee..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_strings_string__number__conversions__unittest.cc +++ /dev/null @@ -1,24 +0,0 @@ ---- src/3rdparty/chromium/base/strings/string_number_conversions_unittest.cc.orig 2019-05-23 12:39:34 UTC -+++ src/3rdparty/chromium/base/strings/string_number_conversions_unittest.cc -@@ -829,12 +829,21 @@ TEST(StringNumberConversionsTest, DoubleToString) { - } - - // The following two values were seen in crashes in the wild. -+#if defined(ARCH_CPU_LITTLE_ENDIAN) - const char input_bytes[8] = {0, 0, 0, 0, '\xee', '\x6d', '\x73', '\x42'}; -+#else -+ const char input_bytes[8] = {'\x42', '\x73', '\x6d', '\xee', 0, 0, 0, 0}; -+#endif - double input = 0; - memcpy(&input, input_bytes, base::size(input_bytes)); - EXPECT_EQ("1335179083776", NumberToString(input)); -+#if defined(ARCH_CPU_LITTLE_ENDIAN) - const char input_bytes2[8] = - {0, 0, 0, '\xa0', '\xda', '\x6c', '\x73', '\x42'}; -+#else -+ const char input_bytes2[8] = -+ {'\x42', '\x73', '\x6c', '\xda', '\xa0', 0, 0, 0}; -+#endif - input = 0; - memcpy(&input, input_bytes2, base::size(input_bytes2)); - EXPECT_EQ("1334890332160", NumberToString(input)); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h new file mode 100644 index 000000000000..438382b2c2b2 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/base/synchronization/lock_impl.h.orig 2020-04-08 09:41:36 UTC ++++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h index 6ca8ef772b5a..40ecbccdbdef 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/base/system/sys_info.h.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/base/system/sys_info.h.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/base/system/sys_info.h -@@ -192,7 +192,7 @@ class BASE_EXPORT SysInfo { +@@ -188,6 +188,8 @@ class BASE_EXPORT SysInfo { + // See also SysUtils.java, method isLowEndDevice. + static bool IsLowEndDevice(); + ++ static uint64_t MaxSharedMemorySize(); ++ + private: + FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); + FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); +@@ -197,7 +199,7 @@ class BASE_EXPORT SysInfo { static bool IsLowEndDeviceImpl(); static HardwareInfo GetHardwareInfoSync(); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc index f6c7d3df059e..f4c9afa6ddb0 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/base/system/sys_info_freebsd.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/base/system/sys_info_freebsd.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/base/system/sys_info_freebsd.cc -@@ -13,26 +13,46 @@ +@@ -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]; @@ -56,4 +50,18 @@ + return name; + return std::string(); +} ++ ++// 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/qt5-webengine/files/patch-src_3rdparty_chromium_base_third__party_dmg__fp_dtoa.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_third__party_dmg__fp_dtoa.cc deleted file mode 100644 index f55aef76e854..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_third__party_dmg__fp_dtoa.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- src/3rdparty/chromium/base/third_party/dmg_fp/dtoa.cc.orig 2019-05-23 12:39:34 UTC -+++ src/3rdparty/chromium/base/third_party/dmg_fp/dtoa.cc -@@ -186,7 +186,11 @@ - * used for input more than STRTOD_DIGLIM digits long (default 40). - */ - -+#ifdef __BIG_ENDIAN__ -+#define IEEE_MC68k -+#else - #define IEEE_8087 -+#endif - #define NO_HEX_FP - - #ifndef Long diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn index f9aa5649b5ca..a2e836730ec9 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/build/config/compiler/BUILD.gn @@ -60,7 +60,7 @@ declare_args() { # only two architectures that are currently checked in). Turn this off when @@ -9,16 +9,16 @@ (current_cpu == "x64" || current_cpu == "x86") binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", root_build_dir) -@@ -301,7 +301,7 @@ config("compiler") { +@@ -309,7 +309,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 -@@ -407,7 +407,7 @@ config("compiler") { + ldflags += [ "-Wl,--fatal-warnings" ] + } +@@ -416,7 +416,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,7 +27,16 @@ ldflags += [ "-Wl,-z,defs", "-Wl,--as-needed", -@@ -786,7 +786,7 @@ config("compiler_cpu_abi") { +@@ -516,7 +516,7 @@ config("compiler") { + } + } + +- if (is_clang && !is_nacl && !use_xcode_clang && !use_qt) { ++ if (is_clang && !is_nacl && !use_xcode_clang && !use_qt && !is_bsd) { + cflags += [ "-fcrash-diagnostics-dir=" + + rebase_path("//tools/clang/crashreports", root_build_dir) ] + +@@ -787,7 +787,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -36,7 +45,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1147,7 +1147,7 @@ config("compiler_deterministic") { +@@ -1138,7 +1138,7 @@ config("compiler_deterministic") { "-Xclang", ".", ] @@ -45,7 +54,7 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1553,7 +1553,7 @@ config("default_warnings") { +@@ -1545,7 +1545,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 += [ -@@ -1761,7 +1761,7 @@ config("thin_archive") { +@@ -1775,7 +1775,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,7 +72,7 @@ arflags = [ "-T" ] } else if (is_win && use_lld) { arflags = [ "/llvmlibthin" ] -@@ -2356,7 +2356,7 @@ config("symbols") { +@@ -2373,7 +2373,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) { @@ -72,7 +81,7 @@ } if (use_debug_fission && !is_nacl && !is_android) { -@@ -2377,7 +2377,7 @@ config("symbols") { +@@ -2394,7 +2394,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/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_features.gni b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_features.gni index c0676a68156b..bab3166c078d 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_features.gni +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_features.gni @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/build/config/features.gni.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/build/config/features.gni.orig 2020-04-29 07:57:35 UTC +++ src/3rdparty/chromium/build/config/features.gni -@@ -46,7 +46,7 @@ declare_args() { - fieldtrial_testing_like_official_build = is_chrome_branded +@@ -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/qt5-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libxml.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libxml.gn new file mode 100644 index 000000000000..bb6257c864bb --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libxml.gn @@ -0,0 +1,53 @@ +--- src/3rdparty/chromium/build/linux/unbundle/libxml.gn.orig 2020-04-08 09:41:36 UTC ++++ src/3rdparty/chromium/build/linux/unbundle/libxml.gn +@@ -8,11 +8,48 @@ pkg_config("system_libxml") { + packages = [ "libxml-2.0" ] + } + +-static_library("libxml") { ++source_set("libxml") { ++ public_configs = [ ":system_libxml" ] ++} ++ ++static_library("libxml_utils") { ++ # Do not expand this visibility list without first consulting with the ++ # Security Team. ++ visibility = [ ++ ":xml_reader", ++ ":xml_writer", ++ "//base/test:test_support", ++ "//services/data_decoder:xml_parser_fuzzer", ++ ] + sources = [ + "chromium/libxml_utils.cc", + "chromium/libxml_utils.h", + ] +- + public_configs = [ ":system_libxml" ] ++} ++ ++static_library("xml_reader") { ++ # Do not expand this visibility list without first consulting with the ++ # Security Team. ++ visibility = [ ++ "//base/test:test_support", ++ "//components/policy/core/common:unit_tests", ++ "//services/data_decoder:*", ++ "//tools/traffic_annotation/auditor:auditor_sources", ++ ] ++ sources = [ ++ "chromium/xml_reader.cc", ++ "chromium/xml_reader.h", ++ ] ++ deps = [ ":libxml_utils" ] ++} ++ ++static_library("xml_writer") { ++ # The XmlWriter is considered safe to use from any target. ++ visibility = [ "*" ] ++ sources = [ ++ "chromium/xml_writer.cc", ++ "chromium/xml_writer.h", ++ ] ++ deps = [ ":libxml_utils" ] + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd index 719712ea20a1..af978a3e0c75 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd @@ -18,7 +18,7 @@ <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" /> @@ -9,12 +9,3 @@ <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> -@@ -109,7 +109,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> diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index 30d3fdaf7d31..a344a88fd4a2 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,7 +1,7 @@ ---- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -206,11 +206,11 @@ - #include "chrome/browser/ui/webui/set_as_default_browser_ui_win.h" +@@ -209,11 +209,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 -@@ -323,7 +323,7 @@ bool IsAboutUI(const GURL& url) { +@@ -311,7 +311,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) -@@ -638,7 +638,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -624,7 +624,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 -@@ -681,17 +681,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -674,17 +674,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>; } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc index 78796dc2dab0..088947e36de6 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/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 @@ -24,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: @@ -35,7 +35,17 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -470,7 +470,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -495,6 +495,9 @@ bool PathProvider(int key, base::FilePath* result) { + case chrome::DIR_POLICY_FILES: { + #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")); + #else + cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies")); + #endif +@@ -502,7 +505,7 @@ bool PathProvider(int key, base::FilePath* result) { } #endif #if defined(OS_CHROMEOS) || \ @@ -44,7 +54,7 @@ case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) return false; -@@ -478,7 +478,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -510,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -53,7 +63,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -513,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -545,7 +548,7 @@ bool PathProvider(int key, base::FilePath* result) { #endif break; @@ -62,7 +72,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if defined(OS_MACOSX) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -527,6 +527,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -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")); @@ -72,7 +82,7 @@ #else cur = base::FilePath(FILE_PATH_LITERAL( "/etc/chromium/native-messaging-hosts")); -@@ -539,7 +542,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; @@ -81,7 +91,7 @@ #if !defined(OS_ANDROID) case chrome::DIR_GLOBAL_GCM_STORE: if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) -@@ -547,7 +550,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) @@ -90,7 +100,7 @@ case chrome::FILE_COMPONENT_FLASH_HINT: if (!base::PathService::Get( chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) { -@@ -555,7 +558,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/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc index 637d6f7c120d..f02817656c6a 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/chrome/common/webui_url_constants.cc -@@ -314,7 +314,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me +@@ -318,7 +318,7 @@ bool IsSystemWebUIHost(base::StringPiece host) { const char kChromeUICastHost[] = "cast"; #endif @@ -9,12 +9,12 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; const char kChromeUIHatsHost[] = "hats"; -@@ -325,17 +325,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/"; +@@ -329,17 +329,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 @@ -26,11 +26,11 @@ #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 -@@ -579,13 +579,13 @@ const char* const kChromeHostURLs[] = { +@@ -605,13 +605,13 @@ const char* const kChromeHostURLs[] = { kChromeUIInternetDetailDialogHost, kChromeUIAssistantOptInHost, #endif @@ -41,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/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h index 7960c2d6ed27..ecf37559478f 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/chrome/common/webui_url_constants.h -@@ -272,7 +272,7 @@ extern const char kChromeUIMetroFlowURL[]; +@@ -268,7 +268,7 @@ bool IsSystemWebUIHost(base::StringPiece host); extern const char kChromeUICastHost[]; #endif @@ -9,12 +9,12 @@ extern const char kChromeUIDiscardsHost[]; extern const char kChromeUIDiscardsURL[]; extern const char kChromeUIHatsHost[]; -@@ -284,17 +284,17 @@ extern const char kChromeUIHatsURL[]; +@@ -280,17 +280,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 @@ -26,7 +26,7 @@ #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/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_content_app_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_content_app_BUILD.gn index 2683361d0990..74680fe2c99e 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_content_app_BUILD.gn +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_content_app_BUILD.gn @@ -1,6 +1,11 @@ ---- src/3rdparty/chromium/components/crash/content/app/BUILD.gn.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/components/crash/content/app/BUILD.gn.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/components/crash/content/app/BUILD.gn -@@ -54,7 +54,7 @@ static_library("app") { +@@ -51,17 +51,20 @@ static_library("app") { + "crashpad_win.cc", + ] + +- if (is_mac || is_win || is_android || is_linux) { ++ if ((is_mac || is_win || is_android || is_linux) && !is_bsd) { sources += [ "crashpad.cc" ] } @@ -9,12 +14,39 @@ sources += [ "breakpad_linux.cc", "breakpad_linux.h", -@@ -96,7 +96,7 @@ static_library("app") { - "//sandbox", + "breakpad_linux_impl.h", + ] + } ++ if (is_bsd) { ++ sources -= [ "crashpad_linux.cc" ] ++ } + + defines = [ "CRASH_IMPLEMENTATION" ] + +@@ -73,7 +76,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", +@@ -99,7 +102,7 @@ static_library("app") { ] + } + +- if (is_linux) { ++ if (is_linux && !is_bsd) { + deps += [ "//third_party/breakpad:client" ] + } + +@@ -130,7 +133,7 @@ static_library("app") { + libs = [ "log" ] + } -- if (is_linux) { -+ if (is_linux && !is_bsd) { - deps += [ - "//content/public/common", - "//third_party/breakpad:client", +- if (is_linux) { ++ if (is_linux && !is_bsd) { + data_deps = [ + "//third_party/crashpad/crashpad/handler:crashpad_handler", + ] diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn index a1be56e5a543..31dad0abae33 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/components/crash/core/common/BUILD.gn.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/components/crash/core/common/BUILD.gn.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/components/crash/core/common/BUILD.gn @@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn @@ -9,15 +9,18 @@ } group("common") { -@@ -93,7 +93,6 @@ target(crash_key_target_type, "crash_key") { +@@ -110,7 +110,9 @@ target(crash_key_target_type, "crash_key_lib") { ] } - deps += [ "//third_party/breakpad:client" ] - } - } - -@@ -153,7 +152,7 @@ source_set("unit_tests") { ++ if (!is_bsd) { ++ deps += [ "//third_party/breakpad:client" ] ++ } + if (use_combined_annotations) { + public_deps += [ "//third_party/crashpad/crashpad/client" ] + } +@@ -173,7 +175,7 @@ source_set("unit_tests") { sources += [ "objc_zombie_unittest.mm" ] } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js index 66d03ffa166c..6fee612e68ba 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/components/neterror/resources/neterror.js.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/components/neterror/resources/neterror.js.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/components/neterror/resources/neterror.js -@@ -153,7 +153,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/qt5-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_db_util__unittest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_db_util__unittest.cc deleted file mode 100644 index 18f884a7589f..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_db_util__unittest.cc +++ /dev/null @@ -1,24 +0,0 @@ ---- src/3rdparty/chromium/components/safe_browsing/db/util_unittest.cc.orig 2019-05-23 12:39:34 UTC -+++ src/3rdparty/chromium/components/safe_browsing/db/util_unittest.cc -@@ -12,6 +12,12 @@ - #include "testing/gtest/include/gtest/gtest.h" - #include "url/gurl.h" - -+#if defined(OS_WIN) -+#include <winsock2.h> -+#elif defined(OS_POSIX) -+#include <arpa/inet.h> -+#endif -+ - namespace safe_browsing { - - TEST(SafeBrowsingDbUtilTest, UrlToFullHashes) { -@@ -83,7 +89,7 @@ TEST(SafeBrowsingDbUtilTest, StringToSBFullHashAndSBFu - // 31 chars plus the last \0 as full_hash. - const std::string hash_in = "12345678902234567890323456789012"; - SBFullHash hash_out = StringToSBFullHash(hash_in); -- EXPECT_EQ(0x34333231U, hash_out.prefix); -+ EXPECT_EQ(htonl(0x31323334U), hash_out.prefix); - EXPECT_EQ(0, memcmp(hash_in.data(), hash_out.full_hash, sizeof(SBFullHash))); - - std::string hash_final = SBFullHashToString(hash_out); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_builtin__service__manifests.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_builtin__service__manifests.cc deleted file mode 100644 index 6ee23f6cf0a4..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_builtin__service__manifests.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/content/browser/builtin_service_manifests.cc.orig 2019-11-27 21:12:25 UTC -+++ src/3rdparty/chromium/content/browser/builtin_service_manifests.cc -@@ -32,7 +32,7 @@ - #include "services/tracing/manifest.h" - #include "services/video_capture/public/cpp/manifest.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "components/services/font/public/cpp/manifest.h" // nogncheck - #endif - -@@ -99,7 +99,7 @@ const std::vector<service_manager::Manifest>& GetBuilt - : service_manager::Manifest::ExecutionMode:: - kInProcessBuiltin), - #endif --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - font_service::GetManifest(), - #endif - #if defined(OS_CHROMEOS) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_gpu__process__transport__factory.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_gpu__process__transport__factory.cc new file mode 100644 index 000000000000..0343dc839339 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_gpu__process__transport__factory.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/browser/compositor/gpu_process_transport_factory.cc.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/content/browser/compositor/gpu_process_transport_factory.cc +@@ -114,7 +114,7 @@ viz::FrameSinkManagerImpl* GetFrameSinkManager() { + return content::BrowserMainLoop::GetInstance()->GetFrameSinkManager(); + } + +-#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/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_software__browser__compositor__output__surface.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_software__browser__compositor__output__surface.cc new file mode 100644 index 000000000000..a0065ea651b0 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_software__browser__compositor__output__surface.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/content/browser/compositor/software_browser_compositor_output_surface.cc.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/content/browser/compositor/software_browser_compositor_output_surface.cc +@@ -89,7 +89,7 @@ void SoftwareBrowserCompositorOutputSurface::SwapBuffe + const gfx::Size& pixel_size) { + latency_tracker_.OnGpuSwapBuffersCompleted(latency_info); + client_->DidReceiveSwapBuffersAck({swap_time, swap_time}); +-#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 +@@ -129,7 +129,7 @@ unsigned SoftwareBrowserCompositorOutputSurface::Updat + return 0; + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + void SoftwareBrowserCompositorOutputSurface::SetNeedsSwapSizeNotifications( + bool needs_swap_size_notifications) { + needs_swap_size_notifications_ = needs_swap_size_notifications; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_software__browser__compositor__output__surface.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_software__browser__compositor__output__surface.h new file mode 100644 index 000000000000..fdfb01dea16a --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_software__browser__compositor__output__surface.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/content/browser/compositor/software_browser_compositor_output_surface.h.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/content/browser/compositor/software_browser_compositor_output_surface.h +@@ -39,7 +39,7 @@ class CONTENT_EXPORT SoftwareBrowserCompositorOutputSu + gfx::BufferFormat GetOverlayBufferFormat() const override; + uint32_t GetFramebufferCopyTextureFormat() override; + unsigned UpdateGpuFence() 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 +@@ -55,7 +55,7 @@ class CONTENT_EXPORT SoftwareBrowserCompositorOutputSu + base::TimeDelta refresh_interval_; + 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/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc new file mode 100644 index 000000000000..522db7b2f24b --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_ppapi__plugin__process__host__receiver__bindings.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_ppapi__plugin__process__host__receiver__bindings.cc new file mode 100644 index 000000000000..25b0bff9f590 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_ppapi__plugin__process__host__receiver__bindings.cc @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc index a41d27711120..4bb971655ad5 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc -@@ -230,7 +230,7 @@ - #include "content/browser/compositor/image_transport_factory.h" +@@ -236,7 +236,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> - #endif -@@ -1232,7 +1232,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = + +@@ -1165,7 +1165,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1243,7 +1243,7 @@ size_t GetPlatformProcessLimit() { +@@ -1176,7 +1176,7 @@ size_t GetPlatformProcessLimit() { #else // TODO(https://crbug.com/104689): Implement on other platforms. return kUnknownPlatformProcessLimit; @@ -27,7 +27,16 @@ } #endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS) -@@ -1651,7 +1651,7 @@ bool RenderProcessHostImpl::Init() { +@@ -1218,7 +1218,7 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHost + 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; +@@ -1588,7 +1588,7 @@ bool RenderProcessHostImpl::Init() { renderer_prefix = browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_service__manager_service__manager__context.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_service__manager_service__manager__context.cc deleted file mode 100644 index c7784c310ed4..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_service__manager_service__manager__context.cc +++ /dev/null @@ -1,35 +0,0 @@ ---- src/3rdparty/chromium/content/browser/service_manager/service_manager_context.cc.orig 2019-11-27 21:12:25 UTC -+++ src/3rdparty/chromium/content/browser/service_manager/service_manager_context.cc -@@ -98,7 +98,7 @@ - #include "content/public/android/content_jni_headers/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/mojom/constants.mojom.h" // nogncheck - #endif -@@ -341,12 +341,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) { -@@ -657,7 +657,7 @@ ServiceManagerContext::ServiceManagerContext( - base::BindRepeating(&CreateVideoCaptureService)); - } - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - RegisterInProcessService( - font_service::mojom::kServiceName, - base::CreateSequencedTaskRunnerWithTraits( diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc index abd7591245eb..a77671406a9d 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/browser/utility_process_host.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/content/browser/utility_process_host.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/content/browser/utility_process_host.cc -@@ -211,7 +211,7 @@ UtilityProcessHost::UtilityProcessHost() +@@ -209,7 +209,7 @@ UtilityProcessHost::UtilityProcessHost() UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client) : sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY), diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc index c1c6a5a81eac..e033dd27625d 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/content/gpu/gpu_main.cc -@@ -84,7 +84,7 @@ +@@ -85,7 +85,7 @@ #include "ui/gfx/x/x11_switches.h" // nogncheck #endif @@ -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" -@@ -113,7 +113,7 @@ namespace content { +@@ -106,7 +106,7 @@ namespace content { namespace { @@ -18,7 +18,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread*, const gpu::GPUInfo*, const gpu::GpuPreferences&); -@@ -174,7 +174,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel +@@ -167,7 +167,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) override { @@ -27,16 +27,16 @@ return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs); #elif defined(OS_WIN) return StartSandboxWindows(sandbox_info_); -@@ -280,7 +280,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -273,7 +273,7 @@ int GpuMain(const MainFunctionParams& parameters) { main_thread_task_executor = std::make_unique<base::SingleThreadTaskExecutor>( - gpu_preferences.message_loop_type); + 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 -@@ -388,7 +388,7 @@ int GpuMain(const MainFunctionParams& parameters) { +@@ -379,7 +379,7 @@ int GpuMain(const MainFunctionParams& parameters) { namespace { @@ -45,7 +45,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { -@@ -423,7 +423,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo +@@ -414,7 +414,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo return res; } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc index bc7e39710b93..aaf54946fa06 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc @@ -1,34 +1,25 @@ ---- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2019-05-23 12:39:34 UTC +--- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_app_v8__snapshot__overlay__manifest.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_app_v8__snapshot__overlay__manifest.cc deleted file mode 100644 index e0889cfd8d66..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_app_v8__snapshot__overlay__manifest.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/content/public/app/v8_snapshot_overlay_manifest.cc.orig 2019-05-23 12:39:34 UTC -+++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h index cdea4b04b252..c35c92d4478f 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/content/public/common/common_param_traits_macros.h.orig 2019-05-23 12:39:34 UTC +--- src/3rdparty/chromium/content/public/common/common_param_traits_macros.h.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/content/public/common/common_param_traits_macros.h -@@ -328,7 +328,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences) +@@ -333,7 +333,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/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc index 1981366ab473..00e26170dfdf 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc @@ -1,15 +1,15 @@ ---- src/3rdparty/chromium/content/public/common/content_features.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/content/public/common/content_features.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/content/public/common/content_features.cc -@@ -43,7 +43,7 @@ const base::Feature kAudioServiceLaunchOnStartup{ - // Runs the audio service in a separate process. +@@ -54,7 +54,7 @@ const base::Feature kAudioServiceLaunchOnStartup{ const base::Feature kAudioServiceOutOfProcess{ "AudioServiceOutOfProcess", --#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) + #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 -@@ -618,7 +618,7 @@ const base::Feature kWebAssemblyThreads { +@@ -634,7 +634,7 @@ const base::Feature kWebAssemblyThreads { }; // Enable WebAssembly trap handler. @@ -18,7 +18,7 @@ defined(ARCH_CPU_X86_64) const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -653,7 +653,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle" +@@ -669,7 +669,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle" // https://w3c.github.io/webauthn const base::Feature kWebAuthCable { "WebAuthenticationCable", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc index f6237ce8754e..cdd7d477f3c8 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/content/renderer/render_thread_impl.cc -@@ -186,12 +186,21 @@ +@@ -188,12 +188,21 @@ #include "mojo/public/cpp/bindings/message_dumper.h" #endif @@ -22,7 +22,7 @@ using base::ThreadRestrictions; using blink::WebDocument; using blink::WebFrame; -@@ -904,7 +913,7 @@ void RenderThreadImpl::Init() { +@@ -927,7 +936,7 @@ void RenderThreadImpl::Init() { DCHECK(parsed_num_raster_threads) << string_value; DCHECK_GT(num_raster_threads, 0); @@ -31,16 +31,16 @@ categorized_worker_pool_->SetBackgroundingCallback( main_thread_scheduler_->DefaultTaskRunner(), base::BindOnce( -@@ -933,7 +942,7 @@ void RenderThreadImpl::Init() { +@@ -957,7 +966,7 @@ void RenderThreadImpl::Init() { base::DiscardableMemoryAllocator::SetInstance( discardable_shared_memory_manager_.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 -@@ -1313,7 +1322,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: + if (base::FeatureList::IsEnabled( + blink::features::kBlinkCompositorUseDisplayThreadPriority)) { + render_message_filter()->SetThreadPriority( +@@ -1333,7 +1342,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames); #else cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc index 5753c3696617..868fc376dfe8 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig 2019-05-23 12:39:34 UTC +--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc -@@ -109,7 +109,7 @@ +@@ -99,7 +99,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 -@@ -204,7 +204,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( - ->Clone(); +@@ -174,7 +174,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()); +@@ -184,7 +184,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif -@@ -213,7 +213,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())); -@@ -241,7 +241,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() -@@ -322,7 +322,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto + sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); +@@ -266,7 +266,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); -@@ -335,7 +335,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop +@@ -279,7 +279,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop } blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h index 7a5c7fec5ebe..51de136951ec 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h @@ -1,16 +1,16 @@ ---- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h.orig 2019-05-23 12:39:34 UTC +--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h.orig 2020-04-29 07:57:35 UTC +++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h -@@ -29,7 +29,7 @@ +@@ -31,7 +31,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_; +@@ -221,7 +221,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_; +@@ -245,7 +245,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/qt5-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc index 42d80491e7fe..f03e88ba881d 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2019-05-23 12:39:34 UTC +--- src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_hid__writer__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_hid__writer__linux.cc new file mode 100644 index 000000000000..42ab68374280 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_hid__writer__linux.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/device/gamepad/hid_writer_linux.cc.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_browser__context__keyed__service__factories.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_browser__context__keyed__service__factories.cc index fd64af88ccf4..adc37efe2f1b 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_browser__context__keyed__service__factories.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_browser__context__keyed__service__factories.cc @@ -1,9 +1,9 @@ ---- src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc.orig 2019-05-23 12:39:34 UTC +--- src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc -@@ -93,7 +93,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() - #if defined(OS_CHROMEOS) - NetworkingConfigServiceFactory::GetInstance(); - #endif +@@ -81,7 +81,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() + IdleManagerFactory::GetInstance(); + #endif // !defined(TOOLKIT_QT) + 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/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.cc index 3e9d359ab855..e1216d1f527d 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.cc @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc -@@ -25,7 +25,7 @@ +@@ -26,7 +26,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 + +@@ -34,7 +34,7 @@ #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h" #endif @@ -9,21 +18,56 @@ #define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586 #endif -@@ -451,7 +451,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa - #if defined(OS_FUCHSIA) +@@ -537,7 +537,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; +@@ -560,14 +560,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; --#elif defined(OS_LINUX) -+#elif defined(OS_LINUX) || defined(OS_BSD) + #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); -@@ -520,7 +520,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa +@@ -631,7 +631,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa + return nullptr; } - return std::make_unique<ExternalVkImageGlRepresentation>( - manager, this, tracker, texture_, texture_->service_id()); --#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA) -+#else // !defined(OS_LINUX) && !defined(OS_FUCHSIA) && !defined(OS_BSD) - #error Unsupported OS - #endif + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + if (!texture_) { + GLuint texture_service_id = ProduceGLTextureInternal(); + if (!texture_service_id) +@@ -677,7 +677,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) +@@ -715,7 +715,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/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.h new file mode 100644 index 000000000000..b6b9518ef816 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.h.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.h +@@ -131,7 +131,7 @@ class ExternalVkImageBacking final : public SharedImag + base::Optional<DawnTextureFormat> dawn_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/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc index 9d480d9201f9..60189c32c7cc 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc @@ -12,7 +12,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h" @@ -18,16 +18,16 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #endif -@@ -111,7 +111,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo +@@ -112,7 +112,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo #elif defined(USE_OZONE) - return ui::OzonePlatform::EnsureInstance()->IsNativePixmapConfigSupported( - format, usage); + return ui::OzonePlatform::GetInstance()->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) { -@@ -167,7 +167,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH +@@ -168,7 +168,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH return GpuMemoryBufferImplIOSurface::CreateFromHandle( std::move(handle), size, format, usage, std::move(callback)); #endif diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc index 654a2c4eaa9e..b8717ba1964d 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc @@ -109,7 +109,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in #endif @@ -16,9 +16,9 @@ -#endif // OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST +#endif // (OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST) || OS_BSD - } // namespace - -@@ -152,7 +152,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + class GpuWatchdogInit { + public: +@@ -165,7 +165,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL // crash during feature collection. gpu::SetKeysForCrashLogging(gpu_info_); @@ -27,7 +27,7 @@ if (gpu_info_.gpu.vendor_id == 0x10de && // NVIDIA gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile()) return false; -@@ -228,7 +228,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -246,7 +246,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL sandbox_helper_->PreSandboxStartup(); bool attempted_startsandbox = false; @@ -36,7 +36,7 @@ // 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. -@@ -237,7 +237,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -255,7 +255,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL watchdog_thread_.get(), &gpu_info_, gpu_preferences_); attempted_startsandbox = true; } @@ -45,7 +45,7 @@ base::TimeTicks before_initialize_one_off = base::TimeTicks::Now(); -@@ -284,14 +284,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -280,14 +280,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } if (gl_initialized && use_swiftshader && gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) { @@ -62,25 +62,25 @@ } if (!gl_initialized) gl_initialized = gl::init::InitializeGLNoExtensionsOneOff(); -@@ -317,7 +317,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - command_line, gpu_feature_info_, - gpu_preferences_.disable_software_rasterizer, false); - if (use_swiftshader) { +@@ -314,7 +314,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; -@@ -328,7 +328,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL - << "failed"; + VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " + << "on Linux"; return false; - } +@@ -326,7 +326,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + << "failed"; + return false; + } -#endif // OS_LINUX +#endif // OS_LINUX || OS_BSD - } - } - -@@ -357,7 +357,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL + } + } else { // use_swiftshader == true + switch (gpu_preferences_.use_vulkan) { +@@ -413,7 +413,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_); @@ -89,7 +89,7 @@ // 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. -@@ -376,7 +376,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -432,7 +432,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL return false; } } @@ -98,7 +98,7 @@ if (use_swiftshader) { AdjustInfoToSwiftShader(); -@@ -552,7 +552,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -604,7 +604,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_); @@ -107,7 +107,7 @@ // 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. -@@ -572,7 +572,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -624,7 +624,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c } } } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.cc index d70f4c7fcd62..ad955d10cfb0 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.cc @@ -1,52 +1,42 @@ ---- src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.cc -@@ -45,8 +45,10 @@ const int kGpuTimeout = 10000; +@@ -40,7 +40,7 @@ const int kGpuTimeout = 15000; + const int kGpuTimeout = 10000; #endif - #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 - -@@ -68,9 +70,12 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() +@@ -59,7 +59,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() + arm_cpu_time_(), + #endif + suspension_counter_(this) +-#if defined(USE_X11) ++#if defined(USE_X11) && !defined(OS_BSD) , - display_(nullptr), - window_(0), -- atom_(x11::None), -+ atom_(x11::None) -+#if !defined(OS_BSD) -+ , host_tty_(-1) #endif -+#endif - { - base::subtle::NoBarrier_Store(&awaiting_acknowledge_, false); - -@@ -85,7 +90,9 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1() +@@ -76,7 +76,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(); + host_tty_ = GetActiveTTY(); #endif - base::MessageLoopCurrent::Get()->AddTaskObserver(&task_observer_); -@@ -230,8 +237,10 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() { +@@ -222,7 +222,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_); -@@ -431,7 +440,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR + #endif +@@ -371,7 +371,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR return; #endif @@ -55,17 +45,7 @@ // 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) { -@@ -515,7 +524,9 @@ void GpuWatchdogThreadImplV1::SetupXServer() { - CopyFromParent, InputOutput, CopyFromParent, 0, nullptr); - atom_ = XInternAtom(display_, "CHECK", x11::False); - } -+#if !defined(OS_BSD) - host_tty_ = GetActiveTTY(); -+#endif - } - - void GpuWatchdogThreadImplV1::SetupXChangeProp() { -@@ -615,7 +626,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT +@@ -528,7 +528,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT } #endif diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.h index 769dc7f8e6c7..c9eeb17b8bf9 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.h @@ -1,13 +1,20 @@ ---- src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.h.orig 2019-05-23 12:39:34 UTC +--- src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.h.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/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) +@@ -171,7 +171,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 + base::ThreadTicks GetWatchedThreadTime(); + #endif + +-#if defined(USE_X11) ++#if defined(USE_X11) && !defined(OS_BSD) + int GetActiveTTY() const; + #endif + +@@ -219,7 +219,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1 + base::Time check_time_; + base::TimeTicks check_timeticks_; + +-#if defined(USE_X11) ++#if defined(USE_X11) && !defined(OS_BSD) FILE* tty_file_; int host_tty_; -+#endif #endif - - base::RepeatingClosure alternative_terminate_for_testing_; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h index 7018ac682d2a..67051efb3abe 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h -@@ -161,14 +161,14 @@ struct VulkanFunctionPointers { +@@ -178,15 +178,15 @@ struct VulkanFunctionPointers { vkGetAndroidHardwareBufferPropertiesANDROIDFn = nullptr; #endif // defined(OS_ANDROID) @@ -14,12 +14,13 @@ -#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 -@@ -342,16 +342,16 @@ struct VulkanFunctionPointers { +@@ -374,18 +374,18 @@ struct VulkanFunctionPointers { ->vkGetAndroidHardwareBufferPropertiesANDROIDFn #endif // defined(OS_ANDROID) @@ -35,6 +36,8 @@ -#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) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc index a3c666cca659..1852a3b25f3a 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/base/video_frame.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/media/base/video_frame.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/media/base/video_frame.cc -@@ -52,7 +52,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 -@@ -67,7 +67,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,7 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -186,7 +186,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo +@@ -257,7 +257,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } @@ -27,7 +27,7 @@ // 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 -@@ -204,7 +204,7 @@ class VideoFrame::DmabufHolder +@@ -275,7 +275,7 @@ class VideoFrame::DmabufHolder friend class base::RefCountedThreadSafe<DmabufHolder>; ~DmabufHolder() = default; }; @@ -36,7 +36,7 @@ // static bool VideoFrame::IsValidConfig(VideoPixelFormat format, -@@ -510,7 +510,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva +@@ -588,7 +588,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -45,17 +45,17 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -642,7 +642,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) - DCHECK(frame.dmabuf_fds_); + DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. - wrapping_frame->dmabuf_fds_ = frame.dmabuf_fds_; -@@ -960,7 +960,7 @@ size_t VideoFrame::shared_memory_offset() const { - return shared_memory_offset_; + 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) @@ -63,10 +63,10 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1112,7 +1112,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -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), - shared_memory_offset_(0), -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) dmabuf_fds_(base::MakeRefCounted<DmabufHolder>()), diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h index 3ec6e468dc62..1250f8a74c1d 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/base/video_frame.h.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/media/base/video_frame.h.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/media/base/video_frame.h -@@ -42,9 +42,9 @@ +@@ -39,9 +39,9 @@ #include "base/mac/scoped_cftyperef.h" #endif // defined(OS_MACOSX) @@ -10,19 +10,19 @@ -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - namespace media { - -@@ -79,7 +79,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + 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 -@@ -273,7 +273,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte - uint8_t* a_data, +@@ -245,7 +245,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte + ReleaseMailboxCB mailbox_holder_release_cb, base::TimeDelta timestamp); -#if defined(OS_LINUX) @@ -30,18 +30,18 @@ // 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 -@@ -469,7 +469,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; +@@ -476,7 +476,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 -@@ -672,7 +672,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) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__linux.cc index 4e32bacd9fd9..40829d866458 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__linux.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.cc @@ -315,6 +315,7 @@ void VideoCaptureDeviceFactoryLinux::GetSupportedForma supported_format.pixel_format = diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__linux.cc index eab705865f45..a6ecfe020c9c 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__linux.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__linux.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc @@ -17,8 +17,10 @@ #include <sys/videoio.h> diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_mock__gpu__memory__buffer__manager.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_mock__gpu__memory__buffer__manager.cc deleted file mode 100644 index 92d2bfa1bb8f..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_mock__gpu__memory__buffer__manager.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/media/capture/video/mock_gpu_memory_buffer_manager.cc.orig 2019-05-23 12:39:34 UTC -+++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.cc deleted file mode 100644 index a17f0b87ce6a..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.cc.orig 2019-03-07 09:23:57 UTC -+++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.h deleted file mode 100644 index 7ccc971368ef..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.h.orig 2019-03-07 09:23:57 UTC -+++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc new file mode 100644 index 000000000000..bacd13f50584 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc @@ -0,0 +1,48 @@ +--- src/3rdparty/chromium/media/gpu/buffer_validation.cc.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_libyuv__image__processor.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_libyuv__image__processor.cc index 0f66833092f1..568b96912d2b 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_libyuv__image__processor.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_libyuv__image__processor.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/media/gpu/libyuv_image_processor.cc.orig 2019-11-27 21:12:25 UTC -+++ src/3rdparty/chromium/media/gpu/libyuv_image_processor.cc -@@ -91,7 +91,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce +--- src/3rdparty/chromium/media/gpu/chromeos/libyuv_image_processor.cc.orig 2020-04-08 09:41:36 UTC ++++ src/3rdparty/chromium/media/gpu/chromeos/libyuv_image_processor.cc +@@ -82,7 +82,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce // LibYUVImageProcessor supports only memory-based video frame for input. VideoFrame::StorageType input_storage_type = VideoFrame::STORAGE_UNKNOWN; for (auto input_type : input_config.preferred_storage_types) { @@ -8,8 +8,8 @@ +#if defined(OS_LINUX) || defined(OS_BSD) if (input_type == VideoFrame::STORAGE_DMABUFS) { video_frame_mapper = VideoFrameMapperFactory::CreateMapper( - input_config.layout.format(), true); -@@ -100,7 +100,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce + input_config.fourcc.ToVideoPixelFormat(), VideoFrame::STORAGE_DMABUFS, +@@ -92,7 +92,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce break; } } @@ -18,7 +18,7 @@ if (VideoFrame::IsStorageTypeMappable(input_type)) { input_storage_type = input_type; -@@ -203,7 +203,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V +@@ -191,7 +191,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V FrameReadyCB cb) { DCHECK(process_thread_.task_runner()->BelongsToCurrentThread()); DVLOGF(4); @@ -27,7 +27,7 @@ if (input_frame->storage_type() == VideoFrame::STORAGE_DMABUFS) { DCHECK_NE(video_frame_mapper_.get(), nullptr); input_frame = video_frame_mapper_->Map(std::move(input_frame)); -@@ -213,7 +213,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V +@@ -201,7 +201,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V return; } } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_linux_platform__video__frame__utils.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_linux_platform__video__frame__utils.cc index a75d181da367..85144b81ab47 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_linux_platform__video__frame__utils.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_linux_platform__video__frame__utils.cc @@ -1,20 +1,45 @@ ---- src/3rdparty/chromium/media/gpu/linux/platform_video_frame_utils.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/media/gpu/linux/platform_video_frame_utils.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/media/gpu/linux/platform_video_frame_utils.cc -@@ -121,7 +121,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle - DCHECK(video_frame); +@@ -19,16 +19,16 @@ + #include "ui/gfx/linux/native_pixmap_dmabuf.h" + #include "ui/gfx/native_pixmap.h" - gfx::GpuMemoryBufferHandle handle; -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - handle.type = gfx::NATIVE_PIXMAP; - - std::vector<base::ScopedFD> duped_fds = -@@ -136,7 +136,7 @@ gfx::GpuMemoryBufferHandle CreateGpuMemoryBufferHandle - } - #else - NOTREACHED(); + #include "gpu/ipc/common/gpu_client_ids.h" + #include "gpu/ipc/service/gpu_memory_buffer_factory.h" -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - return handle; + + namespace media { + + namespace { + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + + scoped_refptr<VideoFrame> CreateVideoFrameGpu( + gpu::GpuMemoryBufferFactory* factory, +@@ -92,7 +92,7 @@ scoped_refptr<VideoFrame> CreateVideoFrameGpu( + gpu::kPlatformVideoFramePoolClientId)); + return frame; } +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + } // namespace +@@ -104,11 +104,11 @@ scoped_refptr<VideoFrame> CreatePlatformVideoFrame( + const gfx::Size& natural_size, + base::TimeDelta timestamp, + gfx::BufferUsage buffer_usage) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + return CreateVideoFrameGpu(gpu_memory_buffer_factory, pixel_format, + coded_size, visible_rect, natural_size, timestamp, + buffer_usage); +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + NOTREACHED(); + return nullptr; + } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_clients_mojo__video__encode__accelerator.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_clients_mojo__video__encode__accelerator.cc index 19e66c2c15fe..f44565e54196 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_clients_mojo__video__encode__accelerator.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_clients_mojo__video__encode__accelerator.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/media/mojo/clients/mojo_video_encode_accelerator.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/media/mojo/clients/mojo_video_encode_accelerator.cc @@ -124,7 +124,7 @@ void MojoVideoEncodeAccelerator::Encode(scoped_refptr< frame->layout().num_planes()); @@ -6,6 +6,6 @@ -#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) { - DCHECK(frame->HasDmaBufs()); - vea_->Encode( diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_interfaces_video__frame__struct__traits.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_video__frame__mojom__traits.cc index c3237c78fb2d..fa3c6ce23cac 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_interfaces_video__frame__struct__traits.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_mojo_mojom_video__frame__mojom__traits.cc @@ -1,6 +1,18 @@ ---- src/3rdparty/chromium/media/mojo/interfaces/video_frame_struct_traits.cc.orig 2020-04-05 20:03:42 UTC -+++ src/3rdparty/chromium/media/mojo/interfaces/video_frame_struct_traits.cc -@@ -49,7 +49,7 @@ media::mojom::VideoFrameDataPtr MakeVideoFrameData( +--- src/3rdparty/chromium/media/mojo/mojom/video_frame_mojom_traits.cc.orig 2020-04-08 09:41:36 UTC ++++ src/3rdparty/chromium/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))); } @@ -9,7 +21,7 @@ if (input->storage_type() == media::VideoFrame::STORAGE_DMABUFS) { std::vector<mojo::ScopedHandle> dmabuf_fds; -@@ -142,7 +142,7 @@ bool StructTraits<media::mojom::VideoFrameDataView, +@@ -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); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_renderers_paint__canvas__video__renderer.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_renderers_paint__canvas__video__renderer.cc deleted file mode 100644 index e5bfbcdd8356..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_renderers_paint__canvas__video__renderer.cc +++ /dev/null @@ -1,22 +0,0 @@ ---- src/3rdparty/chromium/media/renderers/paint_canvas_video_renderer.cc.orig 2019-05-23 12:39:34 UTC -+++ src/3rdparty/chromium/media/renderers/paint_canvas_video_renderer.cc -@@ -31,8 +31,7 @@ - - // Skia internal format depends on a platform. On Android it is ABGR, on others - // it is ARGB. --#if SK_B32_SHIFT == 0 && SK_G32_SHIFT == 8 && SK_R32_SHIFT == 16 && \ -- SK_A32_SHIFT == 24 -+#if SK_PMCOLOR_BYTE_ORDER(B,G,R,A) - #define LIBYUV_I420_TO_ARGB libyuv::I420ToARGB - #define LIBYUV_I422_TO_ARGB libyuv::I422ToARGB - #define LIBYUV_I444_TO_ARGB libyuv::I444ToARGB -@@ -42,8 +41,7 @@ - #define LIBYUV_I010_TO_ARGB libyuv::I010ToARGB - #define LIBYUV_H010_TO_ARGB libyuv::H010ToARGB - #define LIBYUV_NV12_TO_ARGB libyuv::NV12ToARGB --#elif SK_R32_SHIFT == 0 && SK_G32_SHIFT == 8 && SK_B32_SHIFT == 16 && \ -- SK_A32_SHIFT == 24 -+#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A) - #define LIBYUV_I420_TO_ARGB libyuv::I420ToABGR - #define LIBYUV_I422_TO_ARGB libyuv::I422ToABGR - #define LIBYUV_I444_TO_ARGB libyuv::I444ToABGR diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_video_fake__gpu__memory__buffer.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_video_fake__gpu__memory__buffer.cc new file mode 100644 index 000000000000..abf65d69a066 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_video_fake__gpu__memory__buffer.cc @@ -0,0 +1,47 @@ +--- src/3rdparty/chromium/media/video/fake_gpu_memory_buffer.cc.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_media_webrtc_webrtc__switches.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_webrtc_webrtc__switches.cc new file mode 100644 index 000000000000..f19a5e3f59ad --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_webrtc_webrtc__switches.cc @@ -0,0 +1,18 @@ +--- src/3rdparty/chromium/media/webrtc/webrtc_switches.cc.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/media/webrtc/webrtc_switches.cc +@@ -44,7 +44,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); +@@ -53,4 +53,4 @@ bool IsWebRtcApmInAudioServiceEnabled() { + #endif + } + +-} // namespace media +\ No newline at end of file ++} // namespace media diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc index 741f3a4bb445..13d86e7b7993 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_mojo_public_c_system_thunks.cc @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/mojo/public/c/system/thunks.cc.orig 2019-05-23 12:39:34 UTC +--- src/3rdparty/chromium/mojo/public/c/system/thunks.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn index 93a361d8bebf..dc18be76e737 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/net/BUILD.gn.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/net/BUILD.gn.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/net/BUILD.gn -@@ -105,7 +105,7 @@ net_configs = [ +@@ -103,7 +103,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,7 +9,25 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1913,7 +1913,7 @@ component("net") { +@@ -1834,6 +1834,17 @@ 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", ++ "base/network_interfaces_linux.h", ++ ] ++ } ++ + if (is_mac) { + sources += [ + "base/network_notification_thread_mac.cc", +@@ -1960,7 +1971,7 @@ component("net") { } } @@ -18,7 +36,7 @@ sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1946,7 +1946,7 @@ component("net") { +@@ -1991,7 +2002,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux and Android. @@ -27,20 +45,3 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2040,6 +2040,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/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.cc index 65ddb377dfb4..ddaeaa1a2a4b 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_net_base_address__tracker__linux.cc @@ -1,105 +1,16 @@ ---- src/3rdparty/chromium/net/base/address_tracker_linux.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/net/base/address_tracker_linux.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/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() -@@ -147,6 +61,7 @@ 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() { @@ -107,7 +18,7 @@ netlink_fd_.reset(socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)); if (!netlink_fd_.is_valid()) { PLOG(ERROR) << "Could not create NETLINK socket"; -@@ -242,6 +157,7 @@ void AddressTrackerLinux::AbortAndForceOnline() { +@@ -272,6 +275,7 @@ void AddressTrackerLinux::AbortAndForceOnline() { connection_type_initialized_cv_.Broadcast(); } @@ -115,7 +26,7 @@ AddressTrackerLinux::AddressMap AddressTrackerLinux::GetAddressMap() const { AddressTrackerAutoLock lock(*this, address_map_lock_); return address_map_; -@@ -260,6 +176,7 @@ bool AddressTrackerLinux::IsInterfaceIgnored(int inter +@@ -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(); } @@ -123,15 +34,15 @@ NetworkChangeNotifier::ConnectionType AddressTrackerLinux::GetCurrentConnectionType() { -@@ -318,6 +235,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) { +#if !defined(OS_FREEBSD) DCHECK(buffer); - for (struct nlmsghdr* header = reinterpret_cast<struct nlmsghdr*>(buffer); - NLMSG_OK(header, length); -@@ -414,6 +332,10 @@ void AddressTrackerLinux::HandleMessage(char* 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; } } @@ -142,7 +53,7 @@ } void AddressTrackerLinux::OnFileCanReadWithoutBlocking() { -@@ -441,31 +363,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const +@@ -487,31 +497,7 @@ bool AddressTrackerLinux::IsTunnelInterfaceName(const } void AddressTrackerLinux::UpdateCurrentConnectionType() { @@ -174,4 +85,4 @@ + NOTIMPLEMENTED(); } - int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting() + int AddressTrackerLinux::GetThreadsWaitingForConnectionTypeInitForTesting() { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc index c6927f629f78..2994c665f947 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_pdf_pdfium_pdfium__engine.cc @@ -1,56 +1,56 @@ ---- src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/pdf/pdfium/pdfium_engine.cc -@@ -138,7 +138,7 @@ constexpr base::TimeDelta kMaxProgressivePaintTime = - constexpr base::TimeDelta kMaxInitialProgressivePaintTime = - base::TimeDelta::FromMilliseconds(250); +@@ -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; - -@@ -560,7 +560,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); + InitializeLinuxFontMapper(); #endif -@@ -593,7 +593,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) -@@ -1045,7 +1045,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesAsRasterPdf( + SetLastInstance(client_->GetPluginInstance()); + #endif +@@ -867,7 +867,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 -@@ -2898,7 +2898,7 @@ bool PDFiumEngine::ContinuePaint(int progressive_index +@@ -2798,7 +2798,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 -@@ -3368,7 +3368,7 @@ void PDFiumEngine::SetCurrentPage(int index) { +@@ -3292,7 +3292,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/qt5-webengine/files/patch-src_3rdparty_chromium_printing_backend_print__backend__cups.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_backend_print__backend__cups.h deleted file mode 100644 index b496870402f7..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_printing_backend_print__backend__cups.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/printing/backend/print_backend_cups.h.orig 2019-05-23 12:39:34 UTC -+++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_services_content_simple__browser_simple__browser__service.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_content_simple__browser_simple__browser__service.cc deleted file mode 100644 index 418346117bb9..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_content_simple__browser_simple__browser__service.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/services/content/simple_browser/simple_browser_service.cc.orig 2019-11-27 21:12:25 UTC -+++ src/3rdparty/chromium/services/content/simple_browser/simple_browser_service.cc -@@ -7,7 +7,7 @@ - #include "build/build_config.h" - #include "services/content/simple_browser/window.h" - --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - #include "third_party/skia/include/ports/SkFontConfigInterface.h" // nogncheck - #endif - -@@ -23,7 +23,7 @@ SimpleBrowserService::~SimpleBrowserService() = defaul - - void SimpleBrowserService::OnStart() { - if (ui_initialization_mode_ == UIInitializationMode::kInitializeUI) { --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - font_loader_ = - sk_make_sp<font_service::FontLoader>(service_binding_.GetConnector()); - SkFontConfigInterface::SetGlobal(font_loader_); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_content_simple__browser_simple__browser__service.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_content_simple__browser_simple__browser__service.h deleted file mode 100644 index 912959c28429..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_content_simple__browser_simple__browser__service.h +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/services/content/simple_browser/simple_browser_service.h.orig 2019-11-27 21:12:25 UTC -+++ src/3rdparty/chromium/services/content/simple_browser/simple_browser_service.h -@@ -15,7 +15,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 - -@@ -45,7 +45,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/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc index 5d8f17bc143a..9f63b2eb7c59 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_geolocation_location__arbitrator.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/services/device/geolocation/location_arbitrator.cc -@@ -167,7 +167,7 @@ LocationArbitrator::NewNetworkLocationProvider( +@@ -159,7 +159,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/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor.cc deleted file mode 100644 index 863eaa5deba8..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_device_time__zone__monitor_time__zone__monitor.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/services/device/time_zone_monitor/time_zone_monitor.cc.orig 2019-05-23 12:39:34 UTC -+++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_sandbox_sandbox__type.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_sandbox_sandbox__type.cc deleted file mode 100644 index bd6f29a6f52d..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_service__manager_sandbox_sandbox__type.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/services/service_manager/sandbox/sandbox_type.cc.orig 2019-05-23 12:39:34 UTC -+++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_perfetto_trace__event__data__source.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_perfetto_trace__event__data__source.cc new file mode 100644 index 000000000000..93dc17e0014d --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_tracing_public_cpp_perfetto_trace__event__data__source.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/services/tracing/public/cpp/perfetto/trace_event_data_source.cc.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/services/tracing/public/cpp/perfetto/trace_event_data_source.cc +@@ -102,7 +102,7 @@ void WriteMetadataProto(ChromeMetadataPacket* metadata + #endif // defined(OS_ANDROID) && defined(OFFICIAL_BUILD) + } + +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(OS_BSD) + // Linux, Android, and Fuchsia all use CLOCK_MONOTONIC. See crbug.com/166153 + // about efforts to unify base::TimeTicks across all platforms. + constexpr perfetto::protos::pbzero::ClockSnapshot::Clock::BuiltinClocks diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_video__capture_broadcasting__receiver.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_video__capture_broadcasting__receiver.cc index 85cf5a55c188..e8f0d5652fdc 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_video__capture_broadcasting__receiver.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_services_video__capture_broadcasting__receiver.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/services/video_capture/broadcasting_receiver.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/services/video_capture/broadcasting_receiver.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/services/video_capture/broadcasting_receiver.cc @@ -40,7 +40,7 @@ void CloneSharedBufferHandle(const mojo::ScopedSharedB void CloneSharedBufferToRawFileDescriptorHandle( @@ -6,15 +6,15 @@ media::mojom::VideoBufferHandlePtr* target) { -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) - media::SharedMemoryHandleProvider provider; - provider.InitFromMojoHandle( - source->Clone(mojo::SharedBufferHandle::AccessMode::READ_WRITE)); -@@ -180,7 +180,7 @@ void BroadcastingReceiver::BufferContext:: + // |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) - media::SharedMemoryHandleProvider provider; - provider.InitAsReadOnlyFromRawFileDescriptor( - std::move(buffer_handle_->get_shared_memory_via_raw_file_descriptor() + // 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/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn index f4531feb1661..0009731cbbdd 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_BUILD.gn @@ -1,16 +1,16 @@ ---- src/3rdparty/chromium/third_party/angle/BUILD.gn.orig 2019-05-23 12:39:34 UTC +--- src/3rdparty/chromium/third_party/angle/BUILD.gn.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/third_party/angle/BUILD.gn -@@ -268,7 +268,8 @@ angle_static_library("angle_gpu_info_util") { +@@ -381,7 +381,8 @@ angle_static_library("angle_gpu_info_util") { if (is_linux || is_fuchsia) { sources += libangle_gpu_info_util_linux_sources -- if (use_x11) { -+ # Somewhere "use_x11" is set to false, so we need to add is_bsd here -+ if (use_x11 || is_bsd) { +- if (angle_use_x11) { ++ # Somewhere "angle_use_x11" is set to false, so we need to add is_bsd here ++ if (angle_use_x11 || is_bsd) { sources += libangle_gpu_info_util_x11_sources deps += [ "src/third_party/libXNVCtrl:libXNVCtrl" ] defines += [ "GPU_INFO_USE_X11" ] -@@ -276,6 +277,7 @@ angle_static_library("angle_gpu_info_util") { +@@ -389,6 +390,7 @@ angle_static_library("angle_gpu_info_util") { "X11", "Xi", "Xext", @@ -18,8 +18,8 @@ ] } } -@@ -842,10 +844,6 @@ foreach(is_shared_library, - libs = [] +@@ -1107,10 +1109,6 @@ foreach(is_shared_library, + if (is_linux) { sources += util_linux_sources - libs += [ diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp index e2411f87a27d..cb31945f0cc5 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_Display.cpp @@ -1,20 +1,11 @@ ---- src/3rdparty/chromium/third_party/angle/src/libANGLE/Display.cpp.orig 2019-05-23 12:39:34 UTC +--- src/3rdparty/chromium/third_party/angle/src/libANGLE/Display.cpp.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/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" +@@ -269,7 +269,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(const Attrib + { + 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/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h new file mode 100644 index 000000000000..1a15bf015cbd --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2020-04-08 09:41:36 UTC ++++ src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h +@@ -19,7 +19,7 @@ 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) diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_third__party_vulkan-loader_src_loader_loader.c b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_third__party_vulkan-loader_src_loader_loader.c new file mode 100644 index 000000000000..ed18d6ae3f53 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_third__party_vulkan-loader_src_loader_loader.c @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/loader.c.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/loader.c +@@ -229,7 +229,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 bool IsHighIntegrity() { + return geteuid() != getuid() || getegid() != getgid(); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h new file mode 100644 index 000000000000..807a5b65c952 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_angle_third__party_vulkan-loader_src_loader_vk__loader__platform.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/third_party/angle/third_party/vulkan-loader/src/loader/vk_loader_platform.h +@@ -31,7 +31,7 @@ + #include "vulkan/vk_platform.h" + #include "vulkan/vk_sdk_platform.h" + +-#if defined(__linux__) || defined(__APPLE__) ++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) + /* Linux-specific common code: */ + + // Headers: diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index f080d7a00a5a..6e2d5d46b40d 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc -@@ -332,7 +332,7 @@ ScrollbarPart ScrollbarThemeAura::InvalidateOnThumbPos +@@ -152,7 +152,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 + +@@ -335,7 +335,7 @@ ScrollbarPart ScrollbarThemeAura::PartsToInvalidateOnT bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scrollbar& scrollbar, const WebMouseEvent& event) { @@ -9,12 +18,3 @@ if (event.button == WebPointerProperties::Button::kMiddle) return true; #endif -@@ -347,7 +347,7 @@ bool ScrollbarThemeAura::ShouldSnapBackToDragOrigin( - // 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 - diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc new file mode 100644 index 000000000000..2c123e619050 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_modules_mediastream_processed__local__audio__source.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/third_party/blink/renderer/modules/mediastream/processed_local_audio_source.cc +@@ -430,7 +430,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/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc index fbdbc5bab073..bebd6e0da392 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.cc @@ -76,7 +76,7 @@ static const char kColorEmojiLocale[] = "und-Zsye"; @@ -13,8 +13,8 @@ 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/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h index e7f56d46416a..d828f921c22b 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,6 +1,15 @@ ---- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/third_party/blink/renderer/platform/fonts/font_cache.h -@@ -154,7 +154,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,25 +18,21 @@ // These are needed for calling QueryRenderStyleForStrike, since // gfx::GetFontRenderParams makes distinctions based on DSF. static float DeviceScaleFactor() { return device_scale_factor_; } -@@ -215,7 +215,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; - std::string filename; -@@ -227,7 +227,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*, -@@ -299,12 +299,12 @@ class PLATFORM_EXPORT FontCache { +@@ -317,12 +317,12 @@ class PLATFORM_EXPORT FontCache { const FontFaceCreationParams&, std::string& name); @@ -42,8 +47,8 @@ scoped_refptr<SimpleFontData> FallbackOnStandardFontStyle( const FontDescription&, -@@ -336,7 +336,7 @@ class PLATFORM_EXPORT FontCache { - bool is_test_font_mgr_ = false; +@@ -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/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_flatbuffers_src_include_flatbuffers_base.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_flatbuffers_src_include_flatbuffers_base.h deleted file mode 100644 index 1aafdf3282ad..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_flatbuffers_src_include_flatbuffers_base.h +++ /dev/null @@ -1,24 +0,0 @@ ---- src/3rdparty/chromium/third_party/flatbuffers/src/include/flatbuffers/base.h.orig 2019-05-23 12:39:34 UTC -+++ src/3rdparty/chromium/third_party/flatbuffers/src/include/flatbuffers/base.h -@@ -220,18 +220,15 @@ template<typename T> T EndianSwap(T t) { - if (sizeof(T) == 1) { // Compile-time if-then's. - return t; - } else if (sizeof(T) == 2) { -- union { T t; uint16_t i; } u; -- u.t = t; -+ union U { T t; uint16_t i; U(const T& t_) : t(t_) {}} u(t); - u.i = FLATBUFFERS_BYTESWAP16(u.i); - return u.t; - } else if (sizeof(T) == 4) { -- union { T t; uint32_t i; } u; -- u.t = t; -+ union U { T t; uint32_t i; U(const T& t_) : t(t_) {}} u(t); - u.i = FLATBUFFERS_BYTESWAP32(u.i); - return u.t; - } else if (sizeof(T) == 8) { -- union { T t; uint64_t i; } u; -- u.t = t; -+ union U { T t; uint64_t i; U(const T& t_) : t(t_) {}} u(t); - u.i = FLATBUFFERS_BYTESWAP64(u.i); - return u.t; - } else { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_flatbuffers_src_include_flatbuffers_minireflect.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_flatbuffers_src_include_flatbuffers_minireflect.h deleted file mode 100644 index 8d26cd9b60a0..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_flatbuffers_src_include_flatbuffers_minireflect.h +++ /dev/null @@ -1,73 +0,0 @@ ---- src/3rdparty/chromium/third_party/flatbuffers/src/include/flatbuffers/minireflect.h.orig 2019-05-23 12:39:34 UTC -+++ src/3rdparty/chromium/third_party/flatbuffers/src/include/flatbuffers/minireflect.h -@@ -122,58 +122,58 @@ inline void IterateValue(ElementaryType type, const ui - soffset_t vector_index, IterationVisitor *visitor) { - switch (type) { - case ET_UTYPE: { -- auto tval = *reinterpret_cast<const uint8_t *>(val); -+ auto tval = ReadScalar<uint8_t>(val); - visitor->UType(tval, EnumName(tval, type_table)); - break; - } - case ET_BOOL: { -- visitor->Bool(*reinterpret_cast<const uint8_t *>(val) != 0); -+ visitor->Bool(ReadScalar<uint8_t>(val) != 0); - break; - } - case ET_CHAR: { -- auto tval = *reinterpret_cast<const int8_t *>(val); -+ auto tval = ReadScalar<int8_t>(val); - visitor->Char(tval, EnumName(tval, type_table)); - break; - } - case ET_UCHAR: { -- auto tval = *reinterpret_cast<const uint8_t *>(val); -+ auto tval = ReadScalar<uint8_t>(val); - visitor->UChar(tval, EnumName(tval, type_table)); - break; - } - case ET_SHORT: { -- auto tval = *reinterpret_cast<const int16_t *>(val); -+ auto tval = ReadScalar<int16_t>(val); - visitor->Short(tval, EnumName(tval, type_table)); - break; - } - case ET_USHORT: { -- auto tval = *reinterpret_cast<const uint16_t *>(val); -+ auto tval = ReadScalar<uint16_t>(val); - visitor->UShort(tval, EnumName(tval, type_table)); - break; - } - case ET_INT: { -- auto tval = *reinterpret_cast<const int32_t *>(val); -+ auto tval = ReadScalar<int32_t>(val); - visitor->Int(tval, EnumName(tval, type_table)); - break; - } - case ET_UINT: { -- auto tval = *reinterpret_cast<const uint32_t *>(val); -+ auto tval = ReadScalar<uint32_t>(val); - visitor->UInt(tval, EnumName(tval, type_table)); - break; - } - case ET_LONG: { -- visitor->Long(*reinterpret_cast<const int64_t *>(val)); -+ visitor->Long(ReadScalar<int64_t>(val)); - break; - } - case ET_ULONG: { -- visitor->ULong(*reinterpret_cast<const uint64_t *>(val)); -+ visitor->ULong(ReadScalar<uint64_t>(val)); - break; - } - case ET_FLOAT: { -- visitor->Float(*reinterpret_cast<const float *>(val)); -+ visitor->Float(ReadScalar<float>(val)); - break; - } - case ET_DOUBLE: { -- visitor->Double(*reinterpret_cast<const double *>(val)); -+ visitor->Double(ReadScalar<double>(val)); - break; - } - case ET_STRING: { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_time.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_time.h index b5b966160dfd..85a41bc4a2d8 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_ext_base_time.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_perfetto_include_perfetto_base_time.h @@ -1,5 +1,5 @@ ---- src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/time.h.orig 2019-11-27 21:12:25 UTC -+++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/ext/base/time.h +--- src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/time.h.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/time.h @@ -123,6 +123,9 @@ inline TimeNanos GetTimeInternalNs(clockid_t clk_id) { // Return ns from boot. Conversely to GetWallTimeNs, this clock counts also time // during suspend (when supported). diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h index ead17cf27510..a849c519e8df 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_skia_src_opts_SkRasterPipeline__opts.h @@ -1,11 +1,25 @@ ---- src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2020-05-25 17:49:17 UTC +--- src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h.orig 2020-05-31 18:04:09 UTC +++ src/3rdparty/chromium/third_party/skia/src/opts/SkRasterPipeline_opts.h -@@ -996,7 +996,7 @@ SI F from_half(U16 h) { +@@ -988,9 +988,7 @@ SI F approx_powf(F x, F y) { + SI F from_half(U16 h) { + #if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ + && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +- __fp16 fp16; +- memcpy(&fp16, &h, sizeof(U16)); +- return float(fp16); ++ return vcvt_f32_f16(h); + #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) + return _mm256_cvtph_ps(h); +@@ -1011,10 +1009,7 @@ SI F from_half(U16 h) { SI U16 to_half(F f) { #if defined(JUMPER_IS_NEON) && defined(SK_CPU_ARM64) \ -- && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -+ && ! (defined(SK_BUILD_FOR_GOOGLE3) || defined(ARMV8_OS_FREEBSD)) // Temporary workaround for some Google3 builds. - __fp16 fp16 = __fp16(f); - U16 u16; - memcpy(&u16, &fp16, sizeof(U16)); + && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +- __fp16 fp16 = __fp16(f); +- U16 u16; +- memcpy(&u16, &fp16, sizeof(U16)); +- return u16; ++ return vcvt_f16_f32(f); + + #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) + return _mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION); diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_common__audio_wav__file.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_common__audio_wav__file.cc deleted file mode 100644 index 556dcba397a2..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_common__audio_wav__file.cc +++ /dev/null @@ -1,49 +0,0 @@ ---- src/3rdparty/chromium/third_party/webrtc/common_audio/wav_file.cc.orig 2019-11-27 21:12:25 UTC -+++ src/3rdparty/chromium/third_party/webrtc/common_audio/wav_file.cc -@@ -102,13 +102,15 @@ size_t WavReader::num_samples() const { - } - - size_t WavReader::ReadSamples(size_t num_samples, int16_t* samples) { --#ifndef WEBRTC_ARCH_LITTLE_ENDIAN --#error "Need to convert samples to big-endian when reading from WAV file" --#endif - // There could be metadata after the audio; ensure we don't read it. - num_samples = std::min(num_samples, num_samples_remaining_); - const size_t read = - fread(samples, sizeof(*samples), num_samples, file_handle_); -+#ifndef WEBRTC_ARCH_LITTLE_ENDIAN -+ for (size_t i = 0; i < read; i++) { -+ samples[i] = __builtin_bswap16(samples[i]); -+ } -+#endif - // If we didn't read what was requested, ensure we've reached the EOF. - RTC_CHECK(read == num_samples || feof(file_handle_)); - RTC_CHECK_LE(read, num_samples_remaining_); -@@ -179,11 +181,25 @@ size_t WavWriter::num_samples() const { - - void WavWriter::WriteSamples(const int16_t* samples, size_t num_samples) { - #ifndef WEBRTC_ARCH_LITTLE_ENDIAN --#error "Need to convert samples to little-endian when writing to WAV file" --#endif -+ static const size_t kChunksize = 4096 / sizeof(uint16_t); -+ for (size_t i = 0; i < num_samples; i += kChunksize) { -+ int16_t isamples[kChunksize]; -+ const size_t chunk = std::min(kChunksize, num_samples - i); -+ for (size_t j = 0; j < chunk; j++) { -+ isamples[j] = __builtin_bswap16(samples[i + j]); -+ } -+ const size_t written = -+ fwrite(isamples, sizeof(*isamples), chunk, file_handle_); -+ RTC_CHECK_EQ(chunk, written); -+ num_samples_ += written; -+ RTC_CHECK(num_samples_ >= written); // detect size_t overflow -+ } -+#else -+ - RTC_CHECK(file_.Write(samples, sizeof(*samples) * num_samples)); - num_samples_ += num_samples; - RTC_CHECK(num_samples_ >= num_samples); // detect size_t overflow -+#endif - } - - void WavWriter::WriteSamples(const float* samples, size_t num_samples) { diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h new file mode 100644 index 000000000000..dd114b8533a5 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_third__party_webrtc_rtc__base_third__party_sigslot_sigslot.h @@ -0,0 +1,19 @@ +--- src/3rdparty/chromium/third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h.orig 2020-04-08 09:41:36 UTC ++++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc new file mode 100644 index 000000000000..0a0178a00a4e --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_webui_web__ui__util.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/base/webui/web_ui_util.cc.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/ui/base/webui/web_ui_util.cc +@@ -227,7 +227,7 @@ std::string GetFontFamily() { + + // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced + // into Ozone: crbug.com/320050 +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) + font_family = ui::ResourceBundle::GetSharedInstance().GetFont( + ui::ResourceBundle::BaseFont).GetFontName() + ", " + font_family; + #endif diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__shm__image__pool__base.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__shm__image__pool__base.cc new file mode 100644 index 000000000000..9b08a7ec6d0b --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_base_x_x11__shm__image__pool__base.cc @@ -0,0 +1,43 @@ +--- src/3rdparty/chromium/ui/base/x/x11_shm_image_pool_base.cc.orig 2020-04-08 09:41:36 UTC ++++ src/3rdparty/chromium/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 "ui/events/platform/platform_event_dispatcher.h" +@@ -43,10 +44,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() { +@@ -172,7 +177,7 @@ bool XShmImagePoolBase::Resize(const gfx::Size& pixel_ + shmctl(state.shminfo_.shmid, IPC_RMID, 0); + 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. +@@ -182,7 +187,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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc new file mode 100644 index 000000000000..1f2b84b597a0 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/compositor/compositor.cc.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/ui/compositor/compositor.cc +@@ -681,7 +681,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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h new file mode 100644 index 000000000000..9c89d86720eb --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor.h @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/compositor/compositor.h.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/ui/compositor/compositor.h +@@ -412,7 +412,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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor__observer.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor__observer.h new file mode 100644 index 000000000000..5769d7057408 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_compositor__observer.h @@ -0,0 +1,16 @@ +--- src/3rdparty/chromium/ui/compositor/compositor_observer.h.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_host_host__context__factory__private.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_host_host__context__factory__private.cc new file mode 100644 index 000000000000..74862ac85de6 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_compositor_host_host__context__factory__private.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/compositor/host/host_context_factory_private.cc.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/ui/compositor/host/host_context_factory_private.cc +@@ -31,7 +31,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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_color__analysis.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_color__analysis.cc index d227a65ba74a..4e36c51d4810 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_color__analysis.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_color__analysis.cc @@ -1,14 +1,14 @@ ---- src/3rdparty/chromium/ui/gfx/color_analysis.cc.orig 2019-05-23 12:39:34 UTC +--- src/3rdparty/chromium/ui/gfx/color_analysis.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/ui/gfx/color_analysis.cc -@@ -16,6 +16,7 @@ - #include <vector> - +@@ -18,6 +18,7 @@ + #include "base/bind.h" + #include "base/callback.h" #include "base/logging.h" +#include "base/sys_byteorder.h" + #include "base/numerics/ranges.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkUnPreMultiply.h" - #include "ui/gfx/codec/png_codec.h" -@@ -506,10 +507,17 @@ SkColor FindClosestColor(const uint8_t* image, +@@ -438,10 +439,17 @@ SkColor FindClosestColor(const uint8_t* image, SkColor best_color = color; const uint8_t* byte = image; for (int i = 0; i < width * height; ++i) { @@ -26,7 +26,7 @@ // Ignore fully transparent pixels. if (a == 0) continue; -@@ -527,7 +535,6 @@ SkColor FindClosestColor(const uint8_t* image, +@@ -459,7 +467,6 @@ SkColor FindClosestColor(const uint8_t* image, // For a 16x16 icon on an Intel Core i5 this function takes approximately // 0.5 ms to run. @@ -34,7 +34,7 @@ SkColor CalculateKMeanColorOfBuffer(uint8_t* decoded_data, int img_width, int img_height, -@@ -550,10 +557,17 @@ SkColor CalculateKMeanColorOfBuffer(uint8_t* decoded_d +@@ -482,10 +489,17 @@ SkColor CalculateKMeanColorOfBuffer(uint8_t* decoded_d int pixel_pos = sampler->GetSample(img_width, img_height) % (img_width * img_height); @@ -52,7 +52,7 @@ // Skip fully transparent pixels as they usually contain black in their // RGB channels but do not contribute to the visual image. if (a == 0) -@@ -602,10 +616,17 @@ SkColor CalculateKMeanColorOfBuffer(uint8_t* decoded_d +@@ -534,10 +548,17 @@ SkColor CalculateKMeanColorOfBuffer(uint8_t* decoded_d uint8_t* pixel = decoded_data; uint8_t* decoded_data_end = decoded_data + (img_width * img_height * 4); while (pixel < decoded_data_end) { @@ -70,7 +70,7 @@ // Skip transparent pixels, see above. if (a == 0) continue; -@@ -683,8 +704,12 @@ SkColor CalculateKMeanColorOfPNG(scoped_refptr<base::R +@@ -615,8 +636,12 @@ SkColor CalculateKMeanColorOfPNG(scoped_refptr<base::R if (png.get() && png->size() && gfx::PNGCodec::Decode(png->front(), png->size(), diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__util.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__util.cc new file mode 100644 index 000000000000..9d20fb9830bd --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_font__util.cc @@ -0,0 +1,25 @@ +--- src/3rdparty/chromium/ui/gfx/font_util.cc.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.cc new file mode 100644 index 000000000000..86d8a62ad8c7 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_gpu__memory__buffer.cc @@ -0,0 +1,11 @@ +--- src/3rdparty/chromium/ui/gfx/gpu_memory_buffer.cc.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_ipc_gfx__param__traits__macros.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_ipc_gfx__param__traits__macros.h index 74380c450bc7..d02d1fe690a4 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_ipc_gfx__param__traits__macros.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_ipc_gfx__param__traits__macros.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/ipc/gfx_param_traits_macros.h.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/ui/gfx/ipc/gfx_param_traits_macros.h.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/ui/gfx/ipc/gfx_param_traits_macros.h @@ -18,7 +18,7 @@ #include "ui/gfx/selection_bound.h" @@ -33,3 +33,12 @@ 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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojo_buffer__types__struct__traits.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.cc index 02a6078491a9..4783ac3a12c1 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojo_buffer__types__struct__traits.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.cc @@ -1,5 +1,5 @@ ---- src/3rdparty/chromium/ui/gfx/mojo/buffer_types_struct_traits.cc.orig 2020-04-05 18:54:38 UTC -+++ src/3rdparty/chromium/ui/gfx/mojo/buffer_types_struct_traits.cc +--- src/3rdparty/chromium/ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/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); } @@ -37,8 +37,17 @@ return true; } -@@ -71,7 +71,7 @@ bool StructTraits< +@@ -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) @@ -46,7 +55,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTraits< gfx::mojom::GpuMemoryBufferHandleDataView, -@@ -84,7 +84,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra +@@ -88,7 +88,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle( std::move(handle.region)); case gfx::NATIVE_PIXMAP: @@ -55,7 +64,7 @@ return gfx::mojom::GpuMemoryBufferPlatformHandle::NewNativePixmapHandle( std::move(handle.native_pixmap_handle)); #else -@@ -160,7 +160,7 @@ bool StructTraits<gfx::mojom::GpuMemoryBufferHandleDat +@@ -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; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojo_buffer__types__struct__traits.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.h index b343337a83e9..0f073697fb0b 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojo_buffer__types__struct__traits.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_mojom_buffer__types__mojom__traits.h @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/ui/gfx/mojo/buffer_types_struct_traits.h.orig 2020-04-05 18:58:53 UTC -+++ src/3rdparty/chromium/ui/gfx/mojo/buffer_types_struct_traits.h -@@ -193,7 +193,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV +--- src/3rdparty/chromium/ui/gfx/mojom/buffer_types_mojom_traits.h.orig 2020-03-16 14:04:24 UTC ++++ src/3rdparty/chromium/ui/gfx/mojom/buffer_types_mojom_traits.h +@@ -194,7 +194,7 @@ struct StructTraits<gfx::mojom::GpuMemoryBufferIdDataV } }; @@ -9,7 +9,16 @@ template <> struct StructTraits<gfx::mojom::NativePixmapPlaneDataView, gfx::NativePixmapPlane> { -@@ -237,7 +237,7 @@ struct StructTraits<gfx::mojom::NativePixmapHandleData +@@ -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); }; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc index c216339ecce7..34b47cb78998 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.cc @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/ui/gfx/native_pixmap_handle.cc @@ -33,7 +33,7 @@ NativePixmapPlane::NativePixmapPlane() : stride(0), of NativePixmapPlane::NativePixmapPlane(int stride, @@ -27,3 +27,12 @@ DCHECK(plane.fd.is_valid()); base::ScopedFD fd_dup(HANDLE_EINTR(dup(plane.fd.get()))); if (!fd_dup.is_valid()) { +@@ -98,7 +98,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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.h index 0242e9115c33..a637774f9203 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gfx_native__pixmap__handle.h @@ -1,4 +1,4 @@ ---- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.h.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/ui/gfx/native_pixmap_handle.h.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/ui/gfx/native_pixmap_handle.h @@ -15,7 +15,7 @@ #include "build/build_config.h" @@ -27,3 +27,12 @@ // 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) + // 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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__autogen__glx.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__autogen__glx.cc index aaa3dfc3b30f..39eeaa6fd8fd 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__autogen__glx.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__bindings__autogen__glx.cc @@ -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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__surface__glx.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__surface__glx.cc deleted file mode 100644 index e220b22d3ce8..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_gl_gl__surface__glx.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- src/3rdparty/chromium/ui/gl/gl_surface_glx.cc.orig 2019-11-27 21:12:25 UTC -+++ src/3rdparty/chromium/ui/gl/gl_surface_glx.cc -@@ -461,7 +461,10 @@ bool GLSurfaceGLX::InitializeOneOff() { - return false; - } - -- const auto& visual_info = gl::GLVisualPickerGLX::GetInstance()->rgba_visual(); -+ const auto& visual_info = -+ ui::IsCompositingManagerPresent() -+ ? gl::GLVisualPickerGLX::GetInstance()->rgba_visual() -+ : gl::GLVisualPickerGLX::GetInstance()->system_visual(); - g_visual = visual_info.visual; - g_depth = visual_info.depth; - g_colormap = diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h new file mode 100644 index 000000000000..33499a3eaee7 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_platform__window_platform__window__init__properties.h @@ -0,0 +1,20 @@ +--- src/3rdparty/chromium/ui/platform_window/platform_window_init_properties.h.orig 2020-04-08 09:41:36 UTC ++++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc index 0ad263123369..9ecf0352cfe4 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_style_platform__style.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/views/style/platform_style.cc.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/ui/views/style/platform_style.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/ui/views/style/platform_style.cc -@@ -19,7 +19,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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc index caa9e8ef7390..eee90b00f726 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/views/views_delegate.cc.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/ui/views/views_delegate.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/ui/views/views_delegate.cc -@@ -87,7 +87,7 @@ HICON ViewsDelegate::GetSmallWindowIcon() const { +@@ -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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h index 50d47039e256..acb86f06a0d4 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_views__delegate.h @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/views/views_delegate.h.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/ui/views/views_delegate.h.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/ui/views/views_delegate.h -@@ -155,7 +155,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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index e13df0269e65..7e3f6c926e5b 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,20 +1,11 @@ ---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2019-05-23 12:39:34 UTC +--- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/chromium/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; +@@ -732,7 +732,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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h deleted file mode 100644 index 444d508d0b2e..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_desktop__aura_desktop__window__tree__host__platform.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h.orig 2019-05-23 12:39:34 UTC -+++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_native__widget__aura.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_native__widget__aura.cc new file mode 100644 index 000000000000..ebd2c14397fd --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_widget_native__widget__aura.cc @@ -0,0 +1,27 @@ +--- src/3rdparty/chromium/ui/views/widget/native_widget_aura.cc.orig 2020-04-08 09:41:36 UTC ++++ src/3rdparty/chromium/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 +@@ -1095,13 +1095,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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc index d8fa4d4bae13..2fe1dc02974f 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_dialog__delegate.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/views/window/dialog_delegate.cc.orig 2018-11-13 18:25:11 UTC +--- src/3rdparty/chromium/ui/views/window/dialog_delegate.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/ui/views/window/dialog_delegate.cc -@@ -65,7 +65,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/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc index 797f804cfe46..5360a93b4abd 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_ui_views_window_frame__background.cc @@ -1,11 +1,11 @@ ---- src/3rdparty/chromium/ui/views/window/frame_background.cc.orig 2019-05-23 12:39:34 UTC +--- src/3rdparty/chromium/ui/views/window/frame_background.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_v8_include_v8config.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_include_v8config.h new file mode 100644 index 000000000000..13a34f3c8cae --- /dev/null +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_include_v8config.h @@ -0,0 +1,21 @@ +--- src/3rdparty/chromium/v8/include/v8config.h.orig 2020-04-08 09:41:36 UTC ++++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc index 9d1b1fd2b650..0b7a73a388f7 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_api_api.cc @@ -1,15 +1,6 @@ ---- src/3rdparty/chromium/v8/src/api/api.cc.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/v8/src/api/api.cc.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/v8/src/api/api.cc -@@ -110,7 +110,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" -@@ -5550,7 +5550,7 @@ bool v8::V8::Initialize() { +@@ -5653,7 +5653,7 @@ bool v8::V8::Initialize() { return true; } diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_arm_cpu-arm.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_arm_cpu-arm.cc deleted file mode 100644 index bcf1ee72ea95..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_codegen_arm_cpu-arm.cc +++ /dev/null @@ -1,22 +0,0 @@ ---- src/3rdparty/chromium/v8/src/codegen/arm/cpu-arm.cc.orig 2019-11-27 21:12:25 UTC -+++ src/3rdparty/chromium/v8/src/codegen/arm/cpu-arm.cc -@@ -7,6 +7,9 @@ - #ifdef __QNXNTO__ - #include <sys/mman.h> // for cache flushing. - #undef MAP_TYPE // NOLINT -+#elif defined(__FreeBSD__) -+#include <sys/types.h> -+#include <machine/sysarch.h> // for cache flushing. - #else - #include <sys/syscall.h> // for cache flushing. - #endif -@@ -25,6 +28,9 @@ V8_NOINLINE void CpuFeatures::FlushICache(void* start, - #if !defined(USE_SIMULATOR) - #if V8_OS_QNX - msync(start, size, MS_SYNC | MS_INVALIDATE_ICACHE); -+#elif defined(__FreeBSD__) -+ struct arm_sync_icache_args args = { .addr = (uintptr_t)start, .len = size }; -+ sysarch(ARM_SYNC_ICACHE, (void *)&args); - #else - register uint32_t beg asm("r0") = reinterpret_cast<uint32_t>(start); - register uint32_t end asm("r1") = beg + size; diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_libsampler_sampler.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_libsampler_sampler.cc deleted file mode 100644 index 9097657f2740..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_libsampler_sampler.cc +++ /dev/null @@ -1,15 +0,0 @@ ---- src/3rdparty/chromium/v8/src/libsampler/sampler.cc.orig 2019-01-16 10:59:47 UTC -+++ src/3rdparty/chromium/v8/src/libsampler/sampler.cc -@@ -550,9 +550,9 @@ void SignalHandler::FillRegisterState(void* context, R - state->sp = reinterpret_cast<void*>(mcontext.mc_rsp); - state->fp = reinterpret_cast<void*>(mcontext.mc_rbp); - #elif V8_HOST_ARCH_ARM -- state->pc = reinterpret_cast<void*>(mcontext.mc_r15); -- state->sp = reinterpret_cast<void*>(mcontext.mc_r13); -- state->fp = reinterpret_cast<void*>(mcontext.mc_r11); -+ state->pc = reinterpret_cast<void*>(mcontext.__gregs[_REG_PC]); -+ state->sp = reinterpret_cast<void*>(mcontext.__gregs[_REG_SP]); -+ state->fp = reinterpret_cast<void*>(mcontext.__gregs[_REG_FP]); - #endif // V8_HOST_ARCH_* - #elif V8_OS_NETBSD - #if V8_HOST_ARCH_IA32 diff --git a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc deleted file mode 100644 index 9471e58ff3c2..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.cc.orig 2019-05-23 12:39:34 UTC -+++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.h deleted file mode 100644 index 022f9bddfbe7..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_handler-inside-posix.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/v8/src/trap-handler/handler-inside-posix.h.orig 2019-05-23 12:39:34 UTC -+++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h deleted file mode 100644 index 220b06e116a1..000000000000 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_src_trap-handler_trap-handler.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdparty/chromium/v8/src/trap-handler/trap-handler.h.orig 2019-05-23 12:39:34 UTC -+++ src/3rdparty/chromium/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/qt5-webengine/files/patch-src_3rdparty_chromium_v8_test_BUILD.gn b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_test_BUILD.gn index e639351c8780..c2330ca88c01 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_test_BUILD.gn +++ b/www/qt5-webengine/files/patch-src_3rdparty_chromium_v8_test_BUILD.gn @@ -1,6 +1,6 @@ ---- src/3rdparty/chromium/v8/test/BUILD.gn.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/chromium/v8/test/BUILD.gn.orig 2020-04-08 09:41:36 UTC +++ src/3rdparty/chromium/v8/test/BUILD.gn -@@ -32,7 +32,7 @@ group("gn_all") { +@@ -31,7 +31,7 @@ group("gn_all") { deps += [ "cctest:cctest", "cctest:generate-bytecode-expectations", @@ -9,10 +9,10 @@ ] } } -@@ -82,10 +82,10 @@ group("v8_bot_default") { +@@ -73,10 +73,10 @@ group("v8_bot_default") { + "message:v8_message", "mjsunit:v8_mjsunit", "mkgrokdump:mkgrokdump", - "preparser:v8_preparser", - "unittests:unittests", + #"unittests:unittests", "wasm-api-tests:wasm_api_tests", @@ -22,10 +22,10 @@ "webkit:v8_webkit", ] } -@@ -103,10 +103,10 @@ group("v8_default") { +@@ -93,10 +93,10 @@ group("v8_default") { + "message:v8_message", "mjsunit:v8_mjsunit", "mkgrokdump:mkgrokdump", - "preparser:v8_preparser", - "unittests:unittests", + #"unittests:unittests", "wasm-api-tests:wasm_api_tests", diff --git a/www/qt5-webengine/files/patch-src_3rdparty_gn_build_gen.py b/www/qt5-webengine/files/patch-src_3rdparty_gn_build_gen.py index 8c0e18808ad9..c0aa44936469 100644 --- a/www/qt5-webengine/files/patch-src_3rdparty_gn_build_gen.py +++ b/www/qt5-webengine/files/patch-src_3rdparty_gn_build_gen.py @@ -1,4 +1,4 @@ ---- src/3rdparty/gn/build/gen.py.orig 2019-11-27 21:12:25 UTC +--- src/3rdparty/gn/build/gen.py.orig 2020-03-16 14:04:24 UTC +++ src/3rdparty/gn/build/gen.py @@ -69,6 +69,9 @@ class Platform(object): def is_aix(self): @@ -10,7 +10,7 @@ def is_posix(self): return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd'] -@@ -364,6 +367,11 @@ def WriteGNNinja(path, platform, host, options): +@@ -371,6 +374,11 @@ def WriteGNNinja(path, platform, host, options): elif platform.is_aix(): cflags_cc.append('-maix64') ldflags.append('-maix64') diff --git a/www/qt5-webengine/files/patch-src_buildtools_config_support.pri b/www/qt5-webengine/files/patch-src_buildtools_config_support.pri index a095ab1330a8..8b602303f42b 100644 --- a/www/qt5-webengine/files/patch-src_buildtools_config_support.pri +++ b/www/qt5-webengine/files/patch-src_buildtools_config_support.pri @@ -1,9 +1,9 @@ ---- src/buildtools/config/support.pri.orig 2020-01-09 09:16:12 UTC +--- src/buildtools/config/support.pri.orig 2020-03-16 14:04:24 UTC +++ src/buildtools/config/support.pri -@@ -68,6 +68,7 @@ defineReplace(qtwebengine_checkError) { - +@@ -64,6 +64,7 @@ defineReplace(qtwebengine_checkError) { linux:!qtwebengine_checkErrorForLinux():return(false) - win:!qtwebengine_checkErrorForWindows():return(false) + win32:!qtwebengine_checkErrorForWindows():return(false) + macos:!qtwebengine_checkErrorForMacOS():return(false) + unix:!qtwebengine_checkErrorForLinux():return(false) sanitizer: !qtConfig(webengine-sanitizer) { diff --git a/www/qt5-webengine/files/patch-src_core_api_core__api.pro b/www/qt5-webengine/files/patch-src_core_api_core__api.pro index eb8901da2aed..746730b40447 100644 --- a/www/qt5-webengine/files/patch-src_core_api_core__api.pro +++ b/www/qt5-webengine/files/patch-src_core_api_core__api.pro @@ -1,11 +1,11 @@ ---- src/core/api/core_api.pro.orig 2018-11-27 04:10:38 UTC +--- src/core/api/core_api.pro.orig 2020-03-16 14:04:24 UTC +++ src/core/api/core_api.pro -@@ -58,7 +58,7 @@ SOURCES = \ +@@ -66,7 +66,7 @@ SOURCES = \ qwebengineurlschemehandler.cpp ### Qt6 Remove this workaround -unix:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!static { +linux:!isEmpty(QMAKE_LFLAGS_VERSION_SCRIPT):!static { - CONFIG -= warning_clean SOURCES += qtbug-60565.cpp \ qtbug-61521.cpp + } diff --git a/www/qt5-webengine/files/patch-src_pdf_pdfcore.pro b/www/qt5-webengine/files/patch-src_pdf_pdfcore.pro new file mode 100644 index 000000000000..1c39092b2471 --- /dev/null +++ b/www/qt5-webengine/files/patch-src_pdf_pdfcore.pro @@ -0,0 +1,18 @@ +--- src/pdf/pdfcore.pro.orig 2020-03-16 14:04:24 UTC ++++ src/pdf/pdfcore.pro +@@ -32,13 +32,13 @@ for(object, NINJA_OBJECTS): RSP_CONTENT += $$object + write_file($$RSP_FILE, RSP_CONTENT) + + macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_FILE) +-linux:LIBS_PRIVATE += @$$RSP_FILE ++unix:LIBS_PRIVATE += @$$RSP_FILE + + # QTBUG-58710 add main rsp file on windows + win32:QMAKE_LFLAGS += @$$RSP_FILE + + !isEmpty(NINJA_ARCHIVES) { +- linux: LIBS_PRIVATE += -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group ++ unix: LIBS_PRIVATE += -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group + else: LIBS_PRIVATE += $$NINJA_ARCHIVES + } + diff --git a/www/qt5-webengine/pkg-plist b/www/qt5-webengine/pkg-plist index d88c0f6a929e..4ad5d3765c9c 100644 --- a/www/qt5-webengine/pkg-plist +++ b/www/qt5-webengine/pkg-plist @@ -1,4 +1,46 @@ -%%QT_BINDIR%%/qwebengine_convert_dict +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfdestination_p.h +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfdocument_p.h +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdflinkmodel_p.h +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdflinkmodel_p_p.h +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfsearchmodel_p.h +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfsearchresult_p.h +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qpdfselection_p.h +%%QT_INCDIR%%/QtPdf/%%FULLVER%%/QtPdf/private/qtpdf-config_p.h +%%QT_INCDIR%%/QtPdf/QPdfBookmarkModel +%%QT_INCDIR%%/QtPdf/QPdfDestination +%%QT_INCDIR%%/QtPdf/QPdfDocument +%%QT_INCDIR%%/QtPdf/QPdfDocumentRenderOptions +%%QT_INCDIR%%/QtPdf/QPdfPageNavigation +%%QT_INCDIR%%/QtPdf/QPdfPageRenderer +%%QT_INCDIR%%/QtPdf/QPdfSearchModel +%%QT_INCDIR%%/QtPdf/QPdfSearchResult +%%QT_INCDIR%%/QtPdf/QPdfSelection +%%QT_INCDIR%%/QtPdf/QtPdf +%%QT_INCDIR%%/QtPdf/QtPdfDepends +%%QT_INCDIR%%/QtPdf/QtPdfVersion +%%QT_INCDIR%%/QtPdf/qpdfbookmarkmodel.h +%%QT_INCDIR%%/QtPdf/qpdfdestination.h +%%QT_INCDIR%%/QtPdf/qpdfdocument.h +%%QT_INCDIR%%/QtPdf/qpdfdocumentrenderoptions.h +%%QT_INCDIR%%/QtPdf/qpdfnamespace.h +%%QT_INCDIR%%/QtPdf/qpdfpagenavigation.h +%%QT_INCDIR%%/QtPdf/qpdfpagerenderer.h +%%QT_INCDIR%%/QtPdf/qpdfsearchmodel.h +%%QT_INCDIR%%/QtPdf/qpdfsearchresult.h +%%QT_INCDIR%%/QtPdf/qpdfselection.h +%%QT_INCDIR%%/QtPdf/qtpdf-config.h +%%QT_INCDIR%%/QtPdf/qtpdfglobal.h +%%QT_INCDIR%%/QtPdf/qtpdfversion.h +%%QT_INCDIR%%/QtPdfWidgets/%%FULLVER%%/QtPdfWidgets/private/qpdfview_p.h +%%QT_INCDIR%%/QtPdfWidgets/%%FULLVER%%/QtPdfWidgets/private/qtpdfwidgets-config_p.h +%%QT_INCDIR%%/QtPdfWidgets/QPdfView +%%QT_INCDIR%%/QtPdfWidgets/QtPdfWidgets +%%QT_INCDIR%%/QtPdfWidgets/QtPdfWidgetsDepends +%%QT_INCDIR%%/QtPdfWidgets/QtPdfWidgetsVersion +%%QT_INCDIR%%/QtPdfWidgets/qpdfview.h +%%QT_INCDIR%%/QtPdfWidgets/qtpdfwidgets-config.h +%%QT_INCDIR%%/QtPdfWidgets/qtpdfwidgetsglobal.h +%%QT_INCDIR%%/QtPdfWidgets/qtpdfwidgetsversion.h %%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qquickwebengineaction_p.h %%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qquickwebengineaction_p_p.h %%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qquickwebenginecertificateerror_p.h @@ -21,8 +63,8 @@ %%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qquickwebenginetouchhandleprovider_p_p.h %%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qquickwebengineview_p.h %%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qquickwebengineview_p_p.h -%%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qtwebengineglobal_p.h %%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qtwebengine-config_p.h +%%QT_INCDIR%%/QtWebEngine/%%FULLVER%%/QtWebEngine/private/qtwebengineglobal_p.h %%QT_INCDIR%%/QtWebEngine/QQuickWebEngineProfile %%QT_INCDIR%%/QtWebEngine/QQuickWebEngineScript %%QT_INCDIR%%/QtWebEngine/QtWebEngine @@ -30,15 +72,15 @@ %%QT_INCDIR%%/QtWebEngine/QtWebEngineVersion %%QT_INCDIR%%/QtWebEngine/qquickwebengineprofile.h %%QT_INCDIR%%/QtWebEngine/qquickwebenginescript.h +%%QT_INCDIR%%/QtWebEngine/qtwebengine-config.h %%QT_INCDIR%%/QtWebEngine/qtwebengineglobal.h %%QT_INCDIR%%/QtWebEngine/qtwebengineversion.h -%%QT_INCDIR%%/QtWebEngine/qtwebengine-config.h +%%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qtwebenginecore-config_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qtwebenginecoreglobal_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginecallback_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginecookiestore_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebenginemessagepumpscheduler_p.h %%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qwebengineurlrequestinfo_p.h -%%QT_INCDIR%%/QtWebEngineCore/%%FULLVER%%/QtWebEngineCore/private/qtwebenginecore-config_p.h %%QT_INCDIR%%/QtWebEngineCore/QWebEngineCallback %%QT_INCDIR%%/QtWebEngineCore/QWebEngineClientCertificateStore %%QT_INCDIR%%/QtWebEngineCore/QWebEngineCookieStore @@ -55,9 +97,9 @@ %%QT_INCDIR%%/QtWebEngineCore/QtWebEngineCore %%QT_INCDIR%%/QtWebEngineCore/QtWebEngineCoreDepends %%QT_INCDIR%%/QtWebEngineCore/QtWebEngineCoreVersion +%%QT_INCDIR%%/QtWebEngineCore/qtwebenginecore-config.h %%QT_INCDIR%%/QtWebEngineCore/qtwebenginecoreglobal.h %%QT_INCDIR%%/QtWebEngineCore/qtwebenginecoreversion.h -%%QT_INCDIR%%/QtWebEngineCore/qtwebenginecore-config.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginecallback.h %%QT_INCDIR%%/QtWebEngineCore/qwebengineclientcertificatestore.h %%QT_INCDIR%%/QtWebEngineCore/qwebenginecookiestore.h @@ -71,6 +113,7 @@ %%QT_INCDIR%%/QtWebEngineCore/qwebengineurlrequestjob.h %%QT_INCDIR%%/QtWebEngineCore/qwebengineurlscheme.h %%QT_INCDIR%%/QtWebEngineCore/qwebengineurlschemehandler.h +%%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qtwebenginewidgets-config_p.h %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebenginedownloaditem_p.h %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebenginehistory_p.h %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebenginenotificationpresenter_p.h @@ -78,7 +121,6 @@ %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebengineprofile_p.h %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebenginescriptcollection_p.h %%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qwebengineview_p.h -%%QT_INCDIR%%/QtWebEngineWidgets/%%FULLVER%%/QtWebEngineWidgets/private/qtwebenginewidgets-config_p.h %%QT_INCDIR%%/QtWebEngineWidgets/QWebEngineCertificateError %%QT_INCDIR%%/QtWebEngineWidgets/QWebEngineClientCertificateSelection %%QT_INCDIR%%/QtWebEngineWidgets/QWebEngineContextMenuData @@ -95,6 +137,7 @@ %%QT_INCDIR%%/QtWebEngineWidgets/QtWebEngineWidgets %%QT_INCDIR%%/QtWebEngineWidgets/QtWebEngineWidgetsDepends %%QT_INCDIR%%/QtWebEngineWidgets/QtWebEngineWidgetsVersion +%%QT_INCDIR%%/QtWebEngineWidgets/qtwebenginewidgets-config.h %%QT_INCDIR%%/QtWebEngineWidgets/qtwebenginewidgetsglobal.h %%QT_INCDIR%%/QtWebEngineWidgets/qtwebenginewidgetsversion.h %%QT_INCDIR%%/QtWebEngineWidgets/qwebenginecertificateerror.h @@ -109,14 +152,32 @@ %%QT_INCDIR%%/QtWebEngineWidgets/qwebenginescriptcollection.h %%QT_INCDIR%%/QtWebEngineWidgets/qwebenginesettings.h %%QT_INCDIR%%/QtWebEngineWidgets/qwebengineview.h -%%QT_INCDIR%%/QtWebEngineWidgets/qtwebenginewidgets-config.h %%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QWebEngineViewPlugin.cmake +%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QPdfPlugin.cmake +%%QT_CMAKEDIR%%/Qt5Pdf/Qt5PdfConfig.cmake +%%QT_CMAKEDIR%%/Qt5Pdf/Qt5PdfConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5PdfWidgets/Qt5PdfWidgetsConfig.cmake +%%QT_CMAKEDIR%%/Qt5PdfWidgets/Qt5PdfWidgetsConfigVersion.cmake %%QT_CMAKEDIR%%/Qt5WebEngine/Qt5WebEngineConfig.cmake %%QT_CMAKEDIR%%/Qt5WebEngine/Qt5WebEngineConfigVersion.cmake %%QT_CMAKEDIR%%/Qt5WebEngineCore/Qt5WebEngineCoreConfig.cmake %%QT_CMAKEDIR%%/Qt5WebEngineCore/Qt5WebEngineCoreConfigVersion.cmake %%QT_CMAKEDIR%%/Qt5WebEngineWidgets/Qt5WebEngineWidgetsConfig.cmake %%QT_CMAKEDIR%%/Qt5WebEngineWidgets/Qt5WebEngineWidgetsConfigVersion.cmake +%%QT_BINDIR%%/qwebengine_convert_dict +@comment %%DEBUG%%%%QT_BINDIR%%/qwebengine_convert_dict.debug +%%QT_LIBDIR%%/libQt5Pdf.prl +%%QT_LIBDIR%%/libQt5Pdf.so +%%QT_LIBDIR%%/libQt5Pdf.so.5 +%%QT_LIBDIR%%/libQt5Pdf.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt5Pdf.so.%%FULLVER%% +@comment %%DEBUG%%%%QT_LIBDIR%%/libQt5Pdf.so.%%FULLVER%%.debug +%%QT_LIBDIR%%/libQt5PdfWidgets.prl +%%QT_LIBDIR%%/libQt5PdfWidgets.so +%%QT_LIBDIR%%/libQt5PdfWidgets.so.5 +%%QT_LIBDIR%%/libQt5PdfWidgets.so.%%SHORTVER%% +%%QT_LIBDIR%%/libQt5PdfWidgets.so.%%FULLVER%% +@comment %%DEBUG%%%%QT_LIBDIR%%/libQt5PdfWidgets.so.%%FULLVER%%.debug %%QT_LIBDIR%%/libQt5WebEngine.prl %%QT_LIBDIR%%/libQt5WebEngine.so %%QT_LIBDIR%%/libQt5WebEngine.so.5 @@ -135,6 +196,10 @@ %%QT_LIBDIR%%/libQt5WebEngineWidgets.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt5WebEngineWidgets.so.%%FULLVER%% @comment %%DEBUG%%%%QT_LIBDIR%%/libQt5WebEngineWidgets.so.%%FULLVER%%.debug +%%QT_MKSPECDIR%%/modules/qt_lib_pdf.pri +%%QT_MKSPECDIR%%/modules/qt_lib_pdf_private.pri +%%QT_MKSPECDIR%%/modules/qt_lib_pdfwidgets.pri +%%QT_MKSPECDIR%%/modules/qt_lib_pdfwidgets_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_webengine.pri %%QT_MKSPECDIR%%/modules/qt_lib_webengine_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_webenginecore.pri @@ -144,6 +209,15 @@ %%QT_MKSPECDIR%%/modules/qt_lib_webenginewidgets_private.pri %%QT_PLUGINDIR%%/designer/libqwebengineview.so @comment %%DEBUG%%%%QT_PLUGINDIR%%/designer/libqwebengineview.so.debug +%%QT_PLUGINDIR%%/imageformats/libqpdf.so +@comment %%DEBUG%%%%QT_PLUGINDIR%%/imageformats/libqpdf.so.debug +%%QT_QMLDIR%%/QtQuick/Pdf/libpdfplugin.so +@comment %%DEBUG%%%%QT_QMLDIR%%/QtQuick/Pdf/libpdfplugin.so.debug +%%QT_QMLDIR%%/QtQuick/Pdf/plugins.qmltypes +%%QT_QMLDIR%%/QtQuick/Pdf/qml/PdfMultiPageView.qml +%%QT_QMLDIR%%/QtQuick/Pdf/qml/PdfPageView.qml +%%QT_QMLDIR%%/QtQuick/Pdf/qml/PdfScrollablePageView.qml +%%QT_QMLDIR%%/QtQuick/Pdf/qmldir %%QT_QMLDIR%%/QtWebEngine/Controls1Delegates/AlertDialog.qml %%QT_QMLDIR%%/QtWebEngine/Controls1Delegates/AuthenticationDialog.qml %%QT_QMLDIR%%/QtWebEngine/Controls1Delegates/ColorDialog.qml @@ -172,10 +246,13 @@ @comment %%DEBUG%%%%QT_QMLDIR%%/QtWebEngine/libqtwebengineplugin.so.debug %%QT_QMLDIR%%/QtWebEngine/plugins.qmltypes %%QT_QMLDIR%%/QtWebEngine/qmldir +libdata/pkgconfig/Qt5Pdf.pc +libdata/pkgconfig/Qt5PdfWidgets.pc libdata/pkgconfig/Qt5WebEngine.pc libdata/pkgconfig/Qt5WebEngineCore.pc libdata/pkgconfig/Qt5WebEngineWidgets.pc %%QT_LIBEXECDIR%%/QtWebEngineProcess +@comment %%DEBUG%%%%QT_LIBEXECDIR%%/QtWebEngineProcess.debug %%BE%%%%QT_DATADIR%%/resources/icudtb.dat %%LE%%%%QT_DATADIR%%/resources/icudtl.dat %%QT_DATADIR%%/resources/qtwebengine_devtools_resources.pak |