| Index: third_party/WebKit/Source/wtf/HexNumber.h
|
| diff --git a/third_party/WebKit/Source/wtf/HexNumber.h b/third_party/WebKit/Source/wtf/HexNumber.h
|
| index d9e65144ff1b8c3a279f86c11312a13fb47100b4..1cf547152f2cba01276e6ae296f7499e008becd8 100644
|
| --- a/third_party/WebKit/Source/wtf/HexNumber.h
|
| +++ b/third_party/WebKit/Source/wtf/HexNumber.h
|
| @@ -24,78 +24,82 @@
|
|
|
| namespace WTF {
|
|
|
| -enum HexConversionMode {
|
| - Lowercase,
|
| - Uppercase
|
| -};
|
| +enum HexConversionMode { Lowercase, Uppercase };
|
|
|
| namespace Internal {
|
|
|
| const LChar lowerHexDigits[17] = "0123456789abcdef";
|
| const LChar upperHexDigits[17] = "0123456789ABCDEF";
|
| -inline const LChar* hexDigitsForMode(HexConversionMode mode)
|
| -{
|
| - return mode == Lowercase ? lowerHexDigits : upperHexDigits;
|
| +inline const LChar* hexDigitsForMode(HexConversionMode mode) {
|
| + return mode == Lowercase ? lowerHexDigits : upperHexDigits;
|
| }
|
|
|
| -} // namespace Internal
|
| +} // namespace Internal
|
|
|
| -template<typename T>
|
| -inline void appendByteAsHex(unsigned char byte, T& destination, HexConversionMode mode = Uppercase)
|
| -{
|
| - const LChar* hexDigits = Internal::hexDigitsForMode(mode);
|
| - destination.append(hexDigits[byte >> 4]);
|
| - destination.append(hexDigits[byte & 0xF]);
|
| +template <typename T>
|
| +inline void appendByteAsHex(unsigned char byte,
|
| + T& destination,
|
| + HexConversionMode mode = Uppercase) {
|
| + const LChar* hexDigits = Internal::hexDigitsForMode(mode);
|
| + destination.append(hexDigits[byte >> 4]);
|
| + destination.append(hexDigits[byte & 0xF]);
|
| }
|
|
|
| -template<typename T>
|
| -inline void placeByteAsHexCompressIfPossible(unsigned char byte, T& destination, unsigned& index, HexConversionMode mode = Uppercase)
|
| -{
|
| - const LChar* hexDigits = Internal::hexDigitsForMode(mode);
|
| - if (byte >= 0x10)
|
| - destination[index++] = hexDigits[byte >> 4];
|
| - destination[index++] = hexDigits[byte & 0xF];
|
| +template <typename T>
|
| +inline void placeByteAsHexCompressIfPossible(
|
| + unsigned char byte,
|
| + T& destination,
|
| + unsigned& index,
|
| + HexConversionMode mode = Uppercase) {
|
| + const LChar* hexDigits = Internal::hexDigitsForMode(mode);
|
| + if (byte >= 0x10)
|
| + destination[index++] = hexDigits[byte >> 4];
|
| + destination[index++] = hexDigits[byte & 0xF];
|
| }
|
|
|
| -template<typename T>
|
| -inline void placeByteAsHex(unsigned char byte, T& destination, HexConversionMode mode = Uppercase)
|
| -{
|
| - const LChar* hexDigits = Internal::hexDigitsForMode(mode);
|
| - *destination++ = hexDigits[byte >> 4];
|
| - *destination++ = hexDigits[byte & 0xF];
|
| +template <typename T>
|
| +inline void placeByteAsHex(unsigned char byte,
|
| + T& destination,
|
| + HexConversionMode mode = Uppercase) {
|
| + const LChar* hexDigits = Internal::hexDigitsForMode(mode);
|
| + *destination++ = hexDigits[byte >> 4];
|
| + *destination++ = hexDigits[byte & 0xF];
|
| }
|
|
|
| -template<typename T>
|
| -inline void appendUnsignedAsHex(unsigned number, T& destination, HexConversionMode mode = Uppercase)
|
| -{
|
| - const LChar* hexDigits = Internal::hexDigitsForMode(mode);
|
| - Vector<LChar, 8> result;
|
| - do {
|
| - result.prepend(hexDigits[number % 16]);
|
| - number >>= 4;
|
| - } while (number > 0);
|
| -
|
| - destination.append(result.data(), result.size());
|
| +template <typename T>
|
| +inline void appendUnsignedAsHex(unsigned number,
|
| + T& destination,
|
| + HexConversionMode mode = Uppercase) {
|
| + const LChar* hexDigits = Internal::hexDigitsForMode(mode);
|
| + Vector<LChar, 8> result;
|
| + do {
|
| + result.prepend(hexDigits[number % 16]);
|
| + number >>= 4;
|
| + } while (number > 0);
|
| +
|
| + destination.append(result.data(), result.size());
|
| }
|
|
|
| // Same as appendUnsignedAsHex, but using exactly 'desiredDigits' for the conversion.
|
| -template<typename T>
|
| -inline void appendUnsignedAsHexFixedSize(unsigned number, T& destination, unsigned desiredDigits, HexConversionMode mode = Uppercase)
|
| -{
|
| - ASSERT(desiredDigits);
|
| -
|
| - const LChar* hexDigits = Internal::hexDigitsForMode(mode);
|
| - Vector<LChar, 8> result;
|
| - do {
|
| - result.prepend(hexDigits[number % 16]);
|
| - number >>= 4;
|
| - } while (result.size() < desiredDigits);
|
| -
|
| - ASSERT(result.size() == desiredDigits);
|
| - destination.append(result.data(), result.size());
|
| +template <typename T>
|
| +inline void appendUnsignedAsHexFixedSize(unsigned number,
|
| + T& destination,
|
| + unsigned desiredDigits,
|
| + HexConversionMode mode = Uppercase) {
|
| + ASSERT(desiredDigits);
|
| +
|
| + const LChar* hexDigits = Internal::hexDigitsForMode(mode);
|
| + Vector<LChar, 8> result;
|
| + do {
|
| + result.prepend(hexDigits[number % 16]);
|
| + number >>= 4;
|
| + } while (result.size() < desiredDigits);
|
| +
|
| + ASSERT(result.size() == desiredDigits);
|
| + destination.append(result.data(), result.size());
|
| }
|
|
|
| -} // namespace WTF
|
| +} // namespace WTF
|
|
|
| using WTF::appendByteAsHex;
|
| using WTF::appendUnsignedAsHex;
|
| @@ -104,4 +108,4 @@ using WTF::placeByteAsHex;
|
| using WTF::placeByteAsHexCompressIfPossible;
|
| using WTF::Lowercase;
|
|
|
| -#endif // HexNumber_h
|
| +#endif // HexNumber_h
|
|
|