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

Unified Diff: third_party/WebKit/Source/core/inspector/V8InspectorString.cpp

Issue 2490473004: [DevTools] Roll third_party/inspector_protocol to e23134c5aa6131e5a3a3afbefce255becce3a3bd. (Closed)
Patch Set: ui_devtools Created 4 years, 1 month 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/core/inspector/V8InspectorString.cpp
diff --git a/third_party/WebKit/Source/core/inspector/V8InspectorString.cpp b/third_party/WebKit/Source/core/inspector/V8InspectorString.cpp
index 61274ea2a593f458d56366e8eecea678b43e4f89..4634908419c4d9cad0f7de9bc3c01884f376c71d 100644
--- a/third_party/WebKit/Source/core/inspector/V8InspectorString.cpp
+++ b/third_party/WebKit/Source/core/inspector/V8InspectorString.cpp
@@ -41,14 +41,18 @@ String toCoreString(std::unique_ptr<v8_inspector::StringBuffer> buffer) {
namespace protocol {
-std::unique_ptr<protocol::Value> parseJSON(const String& string) {
+// static
+std::unique_ptr<protocol::Value> StringUtil::parseJSON(const String& string) {
if (string.isNull())
return nullptr;
- if (string.is8Bit())
- return parseJSON(reinterpret_cast<const uint8_t*>(string.characters8()),
- string.length());
- return parseJSON(reinterpret_cast<const uint16_t*>(string.characters16()),
- string.length());
+ if (string.is8Bit()) {
+ return parseJSONCharacters(
+ reinterpret_cast<const uint8_t*>(string.characters8()),
+ string.length());
+ }
+ return parseJSONCharacters(
+ reinterpret_cast<const uint16_t*>(string.characters16()),
+ string.length());
}
} // namespace protocol

Powered by Google App Engine
This is Rietveld 408576698