Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(513)

Side by Side Diff: third_party/WebKit/Source/wtf/text/StringConcatenate.h

Issue 2016223002: Revert of Replace all occurrences of RELEASE_ASSERT in wtf with CHECK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve conflict in StringImpl.cpp. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2010 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 template<> 164 template<>
165 class WTF_EXPORT StringTypeAdapter<const UChar*> { 165 class WTF_EXPORT StringTypeAdapter<const UChar*> {
166 DISALLOW_NEW(); 166 DISALLOW_NEW();
167 public: 167 public:
168 StringTypeAdapter(const UChar* buffer); 168 StringTypeAdapter(const UChar* buffer);
169 169
170 unsigned length() { return m_length; } 170 unsigned length() { return m_length; }
171 171
172 bool is8Bit() { return false; } 172 bool is8Bit() { return false; }
173 173
174 #if defined(OFFICIAL_BUILD) && defined(NDEBUG)
175 NO_RETURN_DUE_TO_CRASH void writeTo(LChar*) 174 NO_RETURN_DUE_TO_CRASH void writeTo(LChar*)
176 #else
177 void writeTo(LChar*)
178 #endif
179 { 175 {
180 CHECK(false); 176 RELEASE_ASSERT(false);
181 } 177 }
182 178
183 void writeTo(UChar* destination); 179 void writeTo(UChar* destination);
184 180
185 private: 181 private:
186 const UChar* m_buffer; 182 const UChar* m_buffer;
187 unsigned m_length; 183 unsigned m_length;
188 }; 184 };
189 185
190 template<> 186 template<>
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 result += adapter1.length(); 348 result += adapter1.length();
353 adapter2.writeTo(result); 349 adapter2.writeTo(result);
354 350
355 return resultImpl.release(); 351 return resultImpl.release();
356 } 352 }
357 353
358 } // namespace WTF 354 } // namespace WTF
359 355
360 #include "wtf/text/StringOperators.h" 356 #include "wtf/text/StringOperators.h"
361 #endif 357 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/wtf/text/CString.cpp ('k') | third_party/WebKit/Source/wtf/text/StringConcatenate.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698