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

Unified Diff: third_party/WebKit/Source/platform/inspector_protocol/String16.h

Issue 2226863003: [DevTools] Reduce API surface of String16. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: wrong vector usage Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/inspector_protocol/String16.h
diff --git a/third_party/WebKit/Source/platform/inspector_protocol/String16.h b/third_party/WebKit/Source/platform/inspector_protocol/String16.h
index 6a1b4a09de3346dbb44e6a35bd95411bae64f039..d2e7f336cfdbb7502ff9775d75ac03e922acf58b 100644
--- a/third_party/WebKit/Source/platform/inspector_protocol/String16.h
+++ b/third_party/WebKit/Source/platform/inspector_protocol/String16.h
@@ -5,10 +5,180 @@
#ifndef String16_h
#define String16_h
+#include "platform/inspector_protocol/Collections.h"
+#include "platform/inspector_protocol/Platform.h"
+
+#include <vector>
+
+namespace blink {
+namespace protocol {
+
+namespace internal {
+PLATFORM_EXPORT void intToStr(int, char*, size_t);
+PLATFORM_EXPORT void doubleToStr(double, char*, size_t);
+PLATFORM_EXPORT void doubleToStr3(double, char*, size_t);
+PLATFORM_EXPORT void doubleToStr6(double, char*, size_t);
+PLATFORM_EXPORT double strToDouble(const char*, bool*);
+PLATFORM_EXPORT int strToInt(const char*, bool*);
+} // namespace internal
+
+template <typename T, typename C>
+class PLATFORM_EXPORT String16Base {
+public:
+ static bool isASCII(C c)
+ {
+ return !(c & ~0x7F);
+ }
+
+ static bool isSpaceOrNewLine(C c)
+ {
+ return isASCII(c) ? c <= ' ' && (c == ' ' || (c <= 0xD && c >= 0x9)) : false;
caseq 2016/08/13 00:28:53 isASCII() && ....
dgozman 2016/08/13 04:49:59 Done.
+ }
+
+ static T fromInteger(int number)
+ {
+ static char buffer[50];
+ internal::intToStr(number, buffer, PROTOCOL_ARRAY_LENGTH(buffer));
+ return T(buffer);
+ }
+
+ static T fromDouble(double number)
+ {
+ static char buffer[100];
+ internal::doubleToStr(number, buffer, PROTOCOL_ARRAY_LENGTH(buffer));
+ return T(buffer);
+ }
+
+ static T fromDoublePrecision3(double number)
+ {
+ static char buffer[100];
+ internal::doubleToStr3(number, buffer, PROTOCOL_ARRAY_LENGTH(buffer));
+ return T(buffer);
+ }
+
+ static T fromDoublePrecision6(double number)
+ {
+ static char buffer[100];
+ internal::doubleToStr6(number, buffer, PROTOCOL_ARRAY_LENGTH(buffer));
+ return T(buffer);
+ }
+
+ static double charactersToDouble(const C* characters, size_t length, bool* ok = nullptr)
+ {
+ std::vector<char> buffer;
+ buffer.reserve(length + 1);
+ for (size_t i = 0; i < length; ++i) {
+ if (!isASCII(characters[i])) {
+ if (ok)
+ *ok = false;
+ return 0;
caseq 2016/08/13 00:28:54 consider returning NaN perhaps?
dgozman 2016/08/13 04:49:59 I don't think it matters. In fact, NaN could cause
+ }
+ buffer.push_back(static_cast<char>(characters[i]));
+ }
+ buffer.push_back('\0');
+ return internal::strToDouble(buffer.data(), ok);
+ }
+
+ static int charactersToInteger(const C* characters, size_t length, bool* ok = nullptr)
+ {
+ std::vector<char> buffer;
+ buffer.reserve(length + 1);
+ for (size_t i = 0; i < length; ++i) {
+ if (!isASCII(characters[i])) {
+ if (ok)
+ *ok = false;
+ return 0;
+ }
+ buffer.push_back(static_cast<char>(characters[i]));
+ }
+ buffer.push_back('\0');
+ return internal::strToInt(buffer.data(), ok);
+ }
+
+ double toDouble(bool* ok = nullptr) const
+ {
+ const C* characters = static_cast<const T&>(*this).characters16();
+ size_t length = static_cast<const T&>(*this).length();
+ return charactersToDouble(characters, length, ok);
+ }
+
+ int toInteger(bool* ok = nullptr) const
+ {
+ const C* characters = static_cast<const T&>(*this).characters16();
+ size_t length = static_cast<const T&>(*this).length();
+ return charactersToInteger(characters, length, ok);
+ }
+
+ T stripWhiteSpace() const
+ {
+ size_t length = static_cast<const T&>(*this).length();
+ if (!length)
+ return T();
+
+ unsigned start = 0;
+ unsigned end = length - 1;
+ const C* characters = static_cast<const T&>(*this).characters16();
+
+ // skip white space from start
+ while (start <= end && isSpaceOrNewLine(characters[start]))
+ ++start;
+
+ // only white space
+ if (start > end)
+ return T();
+
+ // skip white space from end
+ while (end && isSpaceOrNewLine(characters[end]))
+ --end;
+
+ if (!start && end == length - 1)
+ return T(static_cast<const T&>(*this));
+ return T(characters + start, end + 1 - start);
+ }
+
+ bool startsWith(const char* prefix) const
+ {
+ const C* characters = static_cast<const T&>(*this).characters16();
+ size_t length = static_cast<const T&>(*this).length();
+ for (size_t i = 0, j = 0; prefix[j] && i < length; ++i, ++j) {
+ if (characters[i] != prefix[j])
+ return false;
+ }
+ return true;
+ }
+};
+
+} // namespace protocol
+} // namespace blink
+
#if V8_INSPECTOR_USE_STL
#include "platform/inspector_protocol/String16STL.h"
#else
#include "platform/inspector_protocol/String16WTF.h"
#endif // V8_INSPECTOR_USE_STL
+namespace blink {
+namespace protocol {
+
+class PLATFORM_EXPORT String16Builder {
+public:
+ String16Builder();
+ void append(const String16&);
+ void append(UChar);
+ void append(char);
+ void append(const UChar*, size_t);
+ void append(const char*, size_t);
+ String16 toString();
+ void reserveCapacity(size_t);
+
+private:
+ std::vector<UChar> m_buffer;
+};
+
+} // namespace protocol
+} // namespace blink
+
+using String16 = blink::protocol::String16;
+using String16Builder = blink::protocol::String16Builder;
+
#endif // !defined(String16_h)

Powered by Google App Engine
This is Rietveld 408576698