diff options
-rw-r--r-- | chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h | 2 | ||||
-rw-r--r-- | chromium/third_party/pdfium/fpdfsdk/javascript/global.cpp | 8 | ||||
-rw-r--r-- | chromium/v8/src/objects-body-descriptors.h | 2 | ||||
-rw-r--r-- | chromium/v8/src/objects-inl.h | 18 | ||||
-rw-r--r-- | chromium/v8/src/objects.h | 16 |
5 files changed, 27 insertions, 19 deletions
diff --git a/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h b/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h index e85c72fd653..6f94cd6734f 100644 --- a/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h +++ b/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h @@ -542,6 +542,8 @@ inline LinkedHashSet<T, U, V, W>& LinkedHashSet<T, U, V, W>::operator=(LinkedHas 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) { diff --git a/chromium/third_party/pdfium/fpdfsdk/javascript/global.cpp b/chromium/third_party/pdfium/fpdfsdk/javascript/global.cpp index c3fc548a733..3187740260f 100644 --- a/chromium/third_party/pdfium/fpdfsdk/javascript/global.cpp +++ b/chromium/third_party/pdfium/fpdfsdk/javascript/global.cpp @@ -23,10 +23,10 @@ template <unsigned ACC, wchar_t... Ns> struct CHash; // Only needed to hash single-character strings. -template <wchar_t N> -struct CHash<N> { - static const unsigned value = N; -}; +// template <wchar_t N> +// struct CHash<N> { +// static const unsigned value = N; +// }; template <unsigned ACC, wchar_t N> struct CHash<ACC, N> { diff --git a/chromium/v8/src/objects-body-descriptors.h b/chromium/v8/src/objects-body-descriptors.h index 91cb8883be8..a1c3634bd76 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 58441d38536..4c486eaf417 100644 --- a/chromium/v8/src/objects-inl.h +++ b/chromium/v8/src/objects-inl.h @@ -7588,6 +7588,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 7d774beb5ba..42da5fa1c04 100644 --- a/chromium/v8/src/objects.h +++ b/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<Derived> New( |