diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2018-10-31 17:18:12 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-20 13:53:20 +0100 |
| commit | b99d49b015c937533ec1496a6dec309aa7dcd9e1 (patch) | |
| tree | bcc4b69c5d0cc28fec22e64311bc50dd89cc0798 /chromium/content/browser | |
| parent | 621f8813f25262be0885b68dc03b3b2fd4c11b6d (diff) | |
| download | qtwebengine-chromium-b99d49b015c937533ec1496a6dec309aa7dcd9e1.tar.gz | |
Fix building with MSVC
Work-around various issues to make Chromium build on MSVC
Change-Id: Ib95ea5c2da0b3806cb2138454a47825fd7c59c1a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/browser')
3 files changed, 12 insertions, 3 deletions
diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn index 329fa5700cd..4d42c46050f 100644 --- a/chromium/content/browser/BUILD.gn +++ b/chromium/content/browser/BUILD.gn @@ -2631,6 +2631,7 @@ jumbo_source_set("browser") { "accessibility/browser_accessibility_com_win.h", "accessibility/browser_accessibility_manager_win.cc", "accessibility/browser_accessibility_manager_win.h", + "accessibility/browser_accessibility_state_impl_win.cc", "accessibility/browser_accessibility_win.cc", "accessibility/browser_accessibility_win.h", "accessibility/accessibility_tree_formatter_win.cc", @@ -2647,6 +2648,7 @@ jumbo_source_set("browser") { "accessibility/browser_accessibility_mac.h", "accessibility/browser_accessibility_manager_mac.mm", "accessibility/browser_accessibility_manager_mac.h", + "accessibility/browser_accessibility_state_impl_mac.mm", "renderer_host/native_web_keyboard_event_mac.mm", "renderer_host/render_widget_host_view_mac.mm", "renderer_host/render_widget_host_view_mac.h", diff --git a/chromium/content/browser/accessibility/browser_accessibility_state_impl.cc b/chromium/content/browser/accessibility/browser_accessibility_state_impl.cc index 24aaa70ae0b..9f3975c104d 100644 --- a/chromium/content/browser/accessibility/browser_accessibility_state_impl.cc +++ b/chromium/content/browser/accessibility/browser_accessibility_state_impl.cc @@ -170,7 +170,7 @@ ui::AXMode BrowserAccessibilityStateImpl::GetAccessibilityMode() const { return accessibility_mode_; } -#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_MACOSX) +#if (!defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_MACOSX)) || defined(TOOLKIT_QT) void BrowserAccessibilityStateImpl::PlatformInitialize() {} void BrowserAccessibilityStateImpl::UpdatePlatformSpecificHistograms() { diff --git a/chromium/content/browser/indexed_db/scopes/disjoint_range_lock_manager.cc b/chromium/content/browser/indexed_db/scopes/disjoint_range_lock_manager.cc index 17eea2e156e..1cd020eb2e7 100644 --- a/chromium/content/browser/indexed_db/scopes/disjoint_range_lock_manager.cc +++ b/chromium/content/browser/indexed_db/scopes/disjoint_range_lock_manager.cc @@ -17,10 +17,17 @@ DisjointRangeLockManager::LockRequest::LockRequest(LockRequest&&) noexcept = default; DisjointRangeLockManager::LockRequest::~LockRequest() = default; DisjointRangeLockManager::Lock::Lock() = default; -DisjointRangeLockManager::Lock::Lock(Lock&&) noexcept = default; +DisjointRangeLockManager::Lock::Lock(DisjointRangeLockManager::Lock&& lock) noexcept + : acquired_count(std::move(lock.acquired_count)), lock_mode(lock.lock_mode), + queue(std::move(lock.queue)) {} DisjointRangeLockManager::Lock::~Lock() = default; DisjointRangeLockManager::Lock& DisjointRangeLockManager::Lock::operator=( - DisjointRangeLockManager::Lock&&) noexcept = default; + DisjointRangeLockManager::Lock&& lock) noexcept { + acquired_count = lock.acquired_count; + lock_mode = lock.lock_mode; + queue = std::move(lock.queue); + return *this; +} DisjointRangeLockManager::DisjointRangeLockManager(int level_count) : task_runner_(base::SequencedTaskRunnerHandle::Get()), |