| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 { | 113 { |
| 114 assign(fromUTF8(data, N - 1)); | 114 assign(fromUTF8(data, N - 1)); |
| 115 return *this; | 115 return *this; |
| 116 } | 116 } |
| 117 | 117 |
| 118 #if INSIDE_BLINK | 118 #if INSIDE_BLINK |
| 119 BLINK_COMMON_EXPORT WebString(const WTF::String&); | 119 BLINK_COMMON_EXPORT WebString(const WTF::String&); |
| 120 BLINK_COMMON_EXPORT WebString& operator=(const WTF::String&); | 120 BLINK_COMMON_EXPORT WebString& operator=(const WTF::String&); |
| 121 BLINK_COMMON_EXPORT operator WTF::String() const; | 121 BLINK_COMMON_EXPORT operator WTF::String() const; |
| 122 | 122 |
| 123 BLINK_COMMON_EXPORT operator WTF::StringView() const; | |
| 124 | |
| 125 BLINK_COMMON_EXPORT WebString(const WTF::AtomicString&); | 123 BLINK_COMMON_EXPORT WebString(const WTF::AtomicString&); |
| 126 BLINK_COMMON_EXPORT WebString& operator=(const WTF::AtomicString&); | 124 BLINK_COMMON_EXPORT WebString& operator=(const WTF::AtomicString&); |
| 127 BLINK_COMMON_EXPORT operator WTF::AtomicString() const; | 125 BLINK_COMMON_EXPORT operator WTF::AtomicString() const; |
| 128 #else | 126 #else |
| 129 WebString(const base::string16& s) | 127 WebString(const base::string16& s) |
| 130 { | 128 { |
| 131 assign(s.data(), s.length()); | 129 assign(s.data(), s.length()); |
| 132 } | 130 } |
| 133 | 131 |
| 134 WebString& operator=(const base::string16& s) | 132 WebString& operator=(const base::string16& s) |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 } | 199 } |
| 202 | 200 |
| 203 inline bool operator!=(const WebString& a, const WebString& b) | 201 inline bool operator!=(const WebString& a, const WebString& b) |
| 204 { | 202 { |
| 205 return !(a == b); | 203 return !(a == b); |
| 206 } | 204 } |
| 207 | 205 |
| 208 } // namespace blink | 206 } // namespace blink |
| 209 | 207 |
| 210 #endif | 208 #endif |
| OLD | NEW |