diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-03-04 16:52:04 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-03-16 15:08:09 +0000 |
| commit | bbd400fa483a3cefe5e17e3fba504a2e04a71f8c (patch) | |
| tree | 7ec8f78091702b878405d925bf669c88d8210272 | |
| parent | 665be17a8b9572037e5dbf752aa46e72b86a2fed (diff) | |
| download | qtwebengine-chromium-bbd400fa483a3cefe5e17e3fba504a2e04a71f8c.tar.gz | |
FIXUP: Fix QtWebEngine build on all platforms
Change-Id: Iedab27ecb48a3ee293778b7f6518472ef990662c
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
4 files changed, 5 insertions, 9 deletions
diff --git a/chromium/base/strings/utf_string_conversions.h b/chromium/base/strings/utf_string_conversions.h index c9ae434e7f0..6ac6eebf2f3 100644 --- a/chromium/base/strings/utf_string_conversions.h +++ b/chromium/base/strings/utf_string_conversions.h @@ -80,9 +80,6 @@ std::u16string UTF8ToUTF16(const char (&str)[N]) { return std::u16string(); } -#ifndef TOOLKIT_QT -// This doesn't even REMOTELY compile, as it is used thousands of places across Chromium, -// no idea how Chrome managed to compile anything with this shit. template <size_t N> std::u16string ASCIIToUTF16(const char (&str)[N]) { static_assert(N == 0, "Error: Use the u\"...\" prefix instead."); @@ -95,7 +92,6 @@ template <size_t N> std::u16string ASCIIToUTF16(char (&str)[N]) { return ASCIIToUTF16(StringPiece(str)); } -#endif } // namespace base diff --git a/chromium/third_party/blink/renderer/platform/heap/thread_state_storage.cc b/chromium/third_party/blink/renderer/platform/heap/thread_state_storage.cc index aa94421bbaa..45cc2cb14eb 100644 --- a/chromium/third_party/blink/renderer/platform/heap/thread_state_storage.cc +++ b/chromium/third_party/blink/renderer/platform/heap/thread_state_storage.cc @@ -11,7 +11,7 @@ namespace blink { thread_local ThreadStateStorage* g_thread_specific_ CONSTINIT - __attribute__((tls_model(BLINK_HEAP_THREAD_LOCAL_MODEL))) = nullptr; + /*__attribute__((tls_model(BLINK_HEAP_THREAD_LOCAL_MODEL)))*/ = nullptr; // static ThreadStateStorage ThreadStateStorage::main_thread_state_storage_; diff --git a/chromium/third_party/blink/renderer/platform/heap/thread_state_storage.h b/chromium/third_party/blink/renderer/platform/heap/thread_state_storage.h index 030a87a7a3e..4362361f5ad 100644 --- a/chromium/third_party/blink/renderer/platform/heap/thread_state_storage.h +++ b/chromium/third_party/blink/renderer/platform/heap/thread_state_storage.h @@ -43,8 +43,8 @@ struct ThreadingTrait { // Storage for all ThreadState objects. This includes the main-thread // ThreadState as well. Keep it outside the class so that PLATFORM_EXPORT // doesn't apply to it (otherwise, clang-cl complains). -extern thread_local ThreadStateStorage* g_thread_specific_ CONSTINIT - __attribute__((tls_model(BLINK_HEAP_THREAD_LOCAL_MODEL))); +extern thread_local ThreadStateStorage* g_thread_specific_ CONSTINIT; +// __attribute__((tls_model(BLINK_HEAP_THREAD_LOCAL_MODEL))); // ThreadStateStorage is the explicitly managed TLS- and global-backed storage // for ThreadState. diff --git a/chromium/third_party/webrtc/modules/rtp_rtcp/source/rtp_header_extension_map.cc b/chromium/third_party/webrtc/modules/rtp_rtcp/source/rtp_header_extension_map.cc index 4b8c7b53855..c651bf5aa91 100644 --- a/chromium/third_party/webrtc/modules/rtp_rtcp/source/rtp_header_extension_map.cc +++ b/chromium/third_party/webrtc/modules/rtp_rtcp/source/rtp_header_extension_map.cc @@ -28,11 +28,11 @@ struct ExtensionInfo { }; template <typename Extension> -constexpr ExtensionInfo CreateExtensionInfo() { +ExtensionInfo CreateExtensionInfo() { return {Extension::kId, Extension::Uri()}; } -constexpr ExtensionInfo kExtensions[] = { +ExtensionInfo kExtensions[] = { CreateExtensionInfo<TransmissionOffset>(), CreateExtensionInfo<AudioLevel>(), CreateExtensionInfo<CsrcAudioLevel>(), |