@@ -, +, @@ --- chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 ++ .../third_party/pdfium/fpdfsdk/javascript/global.cpp | 8 ++++---- chromium/v8/src/objects-body-descriptors.h | 2 +- chromium/v8/src/objects-inl.h | 18 ++++++++++++++++++ chromium/v8/src/objects.h | 16 ++-------------- 5 files changed, 27 insertions(+), 19 deletions(-) --- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h +++ a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h @@ -542,6 +542,8 @@ inline LinkedHashSet& LinkedHashSet::operator=(LinkedHas return *this; } +inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b); + template inline void LinkedHashSet::swap(LinkedHashSet& other) { --- a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h +++ a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h @@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase { template static inline void IterateBody(HeapObject* obj, int object_size) { - IterateBody(obj); + IterateBody(obj); } }; --- a/src/3rdparty/chromium/v8/src/objects-inl.h +++ a/src/3rdparty/chromium/v8/src/objects-inl.h @@ -7588,6 +7588,24 @@ bool GlobalDictionaryShape::IsDeleted(Dictionary* dict, int entry) { } +template +inline uint32_t HashTable::Hash(Key key) { + if (Shape::UsesSeed) { + return Shape::SeededHash(key, GetHeap()->HashSeed()); + } else { + return Shape::Hash(key); + } +} + +template +inline uint32_t HashTable::HashForObject(Key key, Object* object) { + if (Shape::UsesSeed) { + return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); + } else { + return Shape::HashForObject(key, object); + } +} + bool ObjectHashTableShape::IsMatch(Handle key, Object* other) { return key->SameValue(other); } --- a/src/3rdparty/chromium/v8/src/objects.h +++ a/src/3rdparty/chromium/v8/src/objects.h @@ -3194,21 +3194,9 @@ class HashTable : public HashTableBase { typedef Shape ShapeT; // Wrapper methods - inline uint32_t Hash(Key key) { - if (Shape::UsesSeed) { - return Shape::SeededHash(key, GetHeap()->HashSeed()); - } else { - return Shape::Hash(key); - } - } + inline uint32_t Hash(Key key); - inline uint32_t HashForObject(Key key, Object* object) { - if (Shape::UsesSeed) { - return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); - } else { - return Shape::HashForObject(key, object); - } - } + inline uint32_t HashForObject(Key key, Object* object); // Returns a new HashTable object. MUST_USE_RESULT static Handle New( --