Commit 2ee9326b authored by Jose Dapena Paz's avatar Jose Dapena Paz Committed by Commit Bot

GCC: use wtf_size_t on WTF::Vector cross thread copier.

Another regression in GCC build caused by the introduction of wtf_size_t on
WTF::Vector in the commit 9d0fd86c "Introduce wtf_size_t which is typedef
for uint32_t".

In this case, it failed because the WTF::CrossThreadCopier structs for vector
were still using size_ instead of wtf_size_t.

Bug: 819294
Change-Id: I62811a58218696f5c3bd409132b44954ff682a40
Reviewed-on: https://chromium-review.googlesource.com/1155110Reviewed-by: default avatarDave Tapuska <dtapuska@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579112}
parent 66b62dfc
......@@ -42,6 +42,7 @@
#include "third_party/blink/renderer/platform/wtf/forward.h"
#include "third_party/blink/renderer/platform/wtf/functional.h" // FunctionThreadAffinity
#include "third_party/blink/renderer/platform/wtf/type_traits.h"
#include "third_party/blink/renderer/platform/wtf/wtf_size_t.h"
namespace base {
template <typename, typename>
......@@ -176,7 +177,7 @@ struct CrossThreadCopier<std::unique_ptr<T, Deleter>> {
}
};
template <typename T, size_t inlineCapacity, typename Allocator>
template <typename T, wtf_size_t inlineCapacity, typename Allocator>
struct CrossThreadCopier<
Vector<std::unique_ptr<T>, inlineCapacity, Allocator>> {
STATIC_ONLY(CrossThreadCopier);
......@@ -186,7 +187,7 @@ struct CrossThreadCopier<
}
};
template <size_t inlineCapacity, typename Allocator>
template <wtf_size_t inlineCapacity, typename Allocator>
struct CrossThreadCopier<Vector<uint64_t, inlineCapacity, Allocator>> {
STATIC_ONLY(CrossThreadCopier);
using Type = Vector<uint64_t, inlineCapacity, Allocator>;
......@@ -299,7 +300,7 @@ struct CrossThreadCopier<MessagePortChannel> {
}
};
template <size_t inlineCapacity, typename Allocator>
template <wtf_size_t inlineCapacity, typename Allocator>
struct CrossThreadCopier<
Vector<MessagePortChannel, inlineCapacity, Allocator>> {
STATIC_ONLY(CrossThreadCopier);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment