summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@qt.io>2019-03-29 17:45:29 +0100
committerMichael BrĂ¼ning <michael.bruning@qt.io>2019-04-01 08:25:11 +0000
commita4a129005d8c2250fa5a1c998a2f2b1a77108b8c (patch)
tree252cede137bc3d736e88e6193ed290f475462ae7
parentd6d21a17c5a22e644ccb008087afb337c16e87e8 (diff)
downloadqtwebengine-chromium-a4a129005d8c2250fa5a1c998a2f2b1a77108b8c.tar.gz
FIXUP: [Backport] Security bug 905509
Overeager size_t replacement led to missing symbol. Change-Id: I8ac7ba11d8e96298fa6dcfbb1923a301e941100c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--chromium/cc/paint/raw_memory_transfer_cache_entry.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/chromium/cc/paint/raw_memory_transfer_cache_entry.cc b/chromium/cc/paint/raw_memory_transfer_cache_entry.cc
index 55c38c58a24..ecbdc84ef6f 100644
--- a/chromium/cc/paint/raw_memory_transfer_cache_entry.cc
+++ b/chromium/cc/paint/raw_memory_transfer_cache_entry.cc
@@ -20,6 +20,10 @@ ClientRawMemoryTransferCacheEntry::~ClientRawMemoryTransferCacheEntry() =
// static
base::AtomicSequenceNumber ClientRawMemoryTransferCacheEntry::s_next_id_;
+uint32_t ClientRawMemoryTransferCacheEntry::SerializedSize() const {
+ return static_cast<uint32_t>(data_.size());
+}
+
uint32_t ClientRawMemoryTransferCacheEntry::Id() const {
return id_;
}
@@ -38,8 +42,8 @@ ServiceRawMemoryTransferCacheEntry::ServiceRawMemoryTransferCacheEntry() =
ServiceRawMemoryTransferCacheEntry::~ServiceRawMemoryTransferCacheEntry() =
default;
-uint32_t ClientRawMemoryTransferCacheEntry::SerializedSize() const {
- return static_cast<uint32_t>(data_.size());
+size_t ServiceRawMemoryTransferCacheEntry::CachedSize() const {
+ return data_.size();
}
bool ServiceRawMemoryTransferCacheEntry::Deserialize(