diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/discardable_memory | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/discardable_memory')
| -rw-r--r-- | chromium/components/discardable_memory/common/discardable_shared_memory_heap.cc | 8 | ||||
| -rw-r--r-- | chromium/components/discardable_memory/service/discardable_shared_memory_manager.cc | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/chromium/components/discardable_memory/common/discardable_shared_memory_heap.cc b/chromium/components/discardable_memory/common/discardable_shared_memory_heap.cc index 86a0a8805a0..2e06fa83549 100644 --- a/chromium/components/discardable_memory/common/discardable_shared_memory_heap.cc +++ b/chromium/components/discardable_memory/common/discardable_shared_memory_heap.cc @@ -6,9 +6,11 @@ #include <algorithm> #include <memory> +#include <string> #include <utility> #include "base/format_macros.h" +#include "base/memory/aligned_memory.h" #include "base/memory/discardable_shared_memory.h" #include "base/memory/ptr_util.h" #include "base/stl_util.h" @@ -116,10 +118,8 @@ DiscardableSharedMemoryHeap::Grow( int32_t id, base::OnceClosure deleted_callback) { // Memory must be aligned to block size. - DCHECK_EQ( - reinterpret_cast<size_t>(shared_memory->memory()) & (block_size_ - 1), - 0u); - DCHECK_EQ(size & (block_size_ - 1), 0u); + DCHECK(base::IsAligned(shared_memory->memory(), block_size_)); + DCHECK(base::IsAligned(size, block_size_)); std::unique_ptr<Span> span( new Span(shared_memory.get(), diff --git a/chromium/components/discardable_memory/service/discardable_shared_memory_manager.cc b/chromium/components/discardable_memory/service/discardable_shared_memory_manager.cc index 855a416a8fa..c39b4908abc 100644 --- a/chromium/components/discardable_memory/service/discardable_shared_memory_manager.cc +++ b/chromium/components/discardable_memory/service/discardable_shared_memory_manager.cc @@ -228,6 +228,7 @@ DiscardableSharedMemoryManager::DiscardableSharedMemoryManager() memory_limit_(default_memory_limit_), bytes_allocated_(0), memory_pressure_listener_(new base::MemoryPressureListener( + FROM_HERE, base::BindRepeating(&DiscardableSharedMemoryManager::OnMemoryPressure, base::Unretained(this)))), // Current thread might not have a task runner in tests. |