diff --git a/chromium/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h b/chromium/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h index 7c320073461806375e4c51d03ef4290bb20668c7..dd2d6370853f2a32a81d3300ba8bfca2bd235519 100644 --- a/chromium/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h +++ b/chromium/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h @@ -5,6 +5,7 @@ #include "platform/PlatformExport.h" #include "wtf/ThreadSpecific.h" +#include <functional> #include <memory> namespace gpu { diff --git a/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h b/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h index 65f5100a8f133fa66fb81d123c1a0c710d546375..831bb23a55c3761d6ec4cabb3d709e495ec8ef19 100644 --- a/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h +++ b/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h @@ -630,6 +630,8 @@ inline LinkedHashSet<T, U, V, W>& LinkedHashSet<T, U, V, W>::operator=( return *this; } +inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b); + template <typename T, typename U, typename V, typename W> inline void LinkedHashSet<T, U, V, W>::swap(LinkedHashSet& other) { m_impl.swap(other.m_impl); diff --git a/chromium/v8/src/objects-body-descriptors.h b/chromium/v8/src/objects-body-descriptors.h index 91cb8883be88739eab2b10df71f6f0d08aab436e..a1c3634bd762d7e03b4c87d38aa14a9a3ce318e4 100644 --- a/chromium/v8/src/objects-body-descriptors.h +++ b/chromium/v8/src/objects-body-descriptors.h @@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase { template <typename StaticVisitor> static inline void IterateBody(HeapObject* obj, int object_size) { - IterateBody(obj); + IterateBody<StaticVisitor>(obj); } }; diff --git a/chromium/v8/src/objects-inl.h b/chromium/v8/src/objects-inl.h index 1a8274cbf12c940345df93334e45c2c49dea8140..47d3448c5f68cac34c02fbb78ac487a0a8b12ed2 100644 --- a/chromium/v8/src/objects-inl.h +++ b/chromium/v8/src/objects-inl.h @@ -7975,6 +7975,24 @@ bool GlobalDictionaryShape::IsDeleted(Dictionary* dict, int entry) { } +template <typename Derived, typename Shape, typename Key> +inline uint32_t HashTable<Derived,Shape,Key>::Hash(Key key) { + if (Shape::UsesSeed) { + return Shape::SeededHash(key, GetHeap()->HashSeed()); + } else { + return Shape::Hash(key); + } +} + +template <typename Derived, typename Shape, typename Key> +inline uint32_t HashTable<Derived,Shape,Key>::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<Object> key, Object* other) { return key->SameValue(other); } diff --git a/chromium/v8/src/objects.h b/chromium/v8/src/objects.h index 747a4f0511da020ba1feb3ca599793fa8102c545..53bc4a5502d1817dc556f232090a928497529526 100644 --- a/chromium/v8/src/objects.h +++ b/chromium/v8/src/objects.h @@ -3532,21 +3532,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<Derived> New(