Chromium Code Reviews| OLD | NEW | 
|---|---|
| 1 /* | 1 /* | 
| 2 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2004, 2005, 2006, 2008 Apple Inc. All rights reserved. | 
| 3 * | 3 * | 
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or | 
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public | 
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either | 
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. | 
| 8 * | 8 * | 
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, | 
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 48 AtomicString(const UChar* s, unsigned length) : m_string(add(s, length)) { } | 48 AtomicString(const UChar* s, unsigned length) : m_string(add(s, length)) { } | 
| 49 AtomicString(const UChar* s, unsigned length, unsigned existingHash) : m_str ing(add(s, length, existingHash)) { } | 49 AtomicString(const UChar* s, unsigned length, unsigned existingHash) : m_str ing(add(s, length, existingHash)) { } | 
| 50 AtomicString(const UChar* s) : m_string(add(s)) { } | 50 AtomicString(const UChar* s) : m_string(add(s)) { } | 
| 51 | 51 | 
| 52 template<size_t inlineCapacity> | 52 template<size_t inlineCapacity> | 
| 53 explicit AtomicString(const Vector<UChar, inlineCapacity>& characters) | 53 explicit AtomicString(const Vector<UChar, inlineCapacity>& characters) | 
| 54 : m_string(add(characters.data(), characters.size())) | 54 : m_string(add(characters.data(), characters.size())) | 
| 55 { | 55 { | 
| 56 } | 56 } | 
| 57 | 57 | 
| 58 ATOMICSTRING_CONVERSION AtomicString(StringImpl* imp) : m_string(add(imp)) { } | 58 explicit AtomicString(StringImpl* imp) : m_string(add(imp)) { } | 
| 
 
eseidel
2013/11/27 20:21:00
So previously this was optionally (compile time) e
 
Inactive
2013/11/27 20:33:25
This is correct.
 
 | |
| 59 ATOMICSTRING_CONVERSION AtomicString(const String& s) : m_string(add(s.impl( ))) { } | 59 ATOMICSTRING_CONVERSION AtomicString(const String& s) : m_string(add(s.impl( ))) { } | 
| 60 AtomicString(StringImpl* baseString, unsigned start, unsigned length) : m_st ring(add(baseString, start, length)) { } | 60 AtomicString(StringImpl* baseString, unsigned start, unsigned length) : m_st ring(add(baseString, start, length)) { } | 
| 61 | 61 | 
| 62 enum ConstructFromLiteralTag { ConstructFromLiteral }; | 62 enum ConstructFromLiteralTag { ConstructFromLiteral }; | 
| 63 AtomicString(const char* characters, unsigned length, ConstructFromLiteralTa g) | 63 AtomicString(const char* characters, unsigned length, ConstructFromLiteralTa g) | 
| 64 : m_string(addFromLiteralData(characters, length)) | 64 : m_string(addFromLiteralData(characters, length)) | 
| 65 { | 65 { | 
| 66 } | 66 } | 
| 67 | 67 | 
| 68 template<unsigned charactersCount> | 68 template<unsigned charactersCount> | 
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 266 using WTF::textAtom; | 266 using WTF::textAtom; | 
| 267 using WTF::commentAtom; | 267 using WTF::commentAtom; | 
| 268 using WTF::starAtom; | 268 using WTF::starAtom; | 
| 269 using WTF::xmlAtom; | 269 using WTF::xmlAtom; | 
| 270 using WTF::xmlnsAtom; | 270 using WTF::xmlnsAtom; | 
| 271 using WTF::xlinkAtom; | 271 using WTF::xlinkAtom; | 
| 272 #endif | 272 #endif | 
| 273 | 273 | 
| 274 #include "wtf/text/StringConcatenate.h" | 274 #include "wtf/text/StringConcatenate.h" | 
| 275 #endif // AtomicString_h | 275 #endif // AtomicString_h | 
| OLD | NEW |