Bug 92137 – Create a specialized pair for use in HashMap iterators

• Status: RESOLVED
• Resolution: FIXED
• Component: Web Template Framework

[Caio Marcelo de Oliveira Filho]

Create a specialized struct for use in HashMap iterators

[Caio Marcelo de Oliveira Filho]

Created attachment 154102 [details]
Patch

[Ryosuke Niwa]

Comment on attachment 154102 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=154102&action=review

> Source/WTF/wtf/HashTable.h:294
> +    template<typename T, typename U> inline void hashTableSwap(KeyValuePair<T, U>& a, KeyValuePair<T, U>& b)

Do we need to keep the one with std::pair?

> Source/WTF/wtf/HashTraits.h:195
> +        KeyValuePair() : first(), second() { }
> +        KeyValuePair(const KeyTypeArg& key, const ValueTypeArg& value) : first(key), second(value) { }
> +
> +        template <typename OtherKeyType, typename OtherValueType>
> +        KeyValuePair(const KeyValuePair<OtherKeyType, OtherValueType>& other) : first(other.first), second(other.second) { }

Please put each variable initialization on a separate line.

> Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h:76
> +    static void encode(ArgumentEncoder* encoder, const WTF::KeyValuePair<KeyType, ValueType>& pair)

Do we need to keep the one with std::pair?

[Caio Marcelo de Oliveira Filho]

Comment on attachment 154102 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=154102&action=review

Thanks for the comments.

>> Source/WTF/wtf/HashTable.h:294
>> +    template<typename T, typename U> inline void hashTableSwap(KeyValuePair<T, U>& a, KeyValuePair<T, U>& b)
> 
> Do we need to keep the one with std::pair?

Not anymore.

>> Source/WTF/wtf/HashTraits.h:195
>> +        KeyValuePair(const KeyValuePair<OtherKeyType, OtherValueType>& other) : first(other.first), second(other.second) { }
> 
> Please put each variable initialization on a separate line.

Fixed.

>> Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h:76
>> +    static void encode(ArgumentEncoder* encoder, const WTF::KeyValuePair<KeyType, ValueType>& pair)
> 
> Do we need to keep the one with std::pair?

Yes, it is still needed: we pass thru IPC other structures that build on top of std::pair.

[Caio Marcelo de Oliveira Filho]

Created attachment 154116 [details]
Updated version for EWS

[Caio Marcelo de Oliveira Filho]

Created attachment 154409 [details]
Patch for landing

[Caio Marcelo de Oliveira Filho]

Created attachment 154411 [details]
Patch for landing

[WebKit Review Bot]

Comment on attachment 154411 [details]
Patch for landing

Clearing flags on attachment: 154411

Committed r123667: <http://trac.webkit.org/changeset/123667>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.