OLD | NEW |
1 // Copyright 2015 the V8 project authors. All rights reserved. | 1 // Copyright 2015 the V8 project authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "src/inspector/remote-object-id.h" | 5 #include "src/inspector/remote-object-id.h" |
6 | 6 |
7 #include "src/inspector/protocol/Protocol.h" | 7 #include "src/inspector/protocol/Protocol.h" |
8 #include "src/inspector/string-util.h" | 8 #include "src/inspector/string-util.h" |
9 | 9 |
10 namespace v8_inspector { | 10 namespace v8_inspector { |
11 | 11 |
12 RemoteObjectIdBase::RemoteObjectIdBase() : m_injectedScriptId(0) {} | 12 RemoteObjectIdBase::RemoteObjectIdBase() : m_injectedScriptId(0) {} |
13 | 13 |
14 std::unique_ptr<protocol::DictionaryValue> | 14 std::unique_ptr<protocol::DictionaryValue> |
15 RemoteObjectIdBase::parseInjectedScriptId(const String16& objectId) { | 15 RemoteObjectIdBase::parseInjectedScriptId(const String16& objectId) { |
16 std::unique_ptr<protocol::Value> parsedValue = protocol::parseJSON(objectId); | 16 std::unique_ptr<protocol::Value> parsedValue = |
| 17 protocol::StringUtil::parseJSON(objectId); |
17 if (!parsedValue || parsedValue->type() != protocol::Value::TypeObject) | 18 if (!parsedValue || parsedValue->type() != protocol::Value::TypeObject) |
18 return nullptr; | 19 return nullptr; |
19 | 20 |
20 std::unique_ptr<protocol::DictionaryValue> parsedObjectId( | 21 std::unique_ptr<protocol::DictionaryValue> parsedObjectId( |
21 protocol::DictionaryValue::cast(parsedValue.release())); | 22 protocol::DictionaryValue::cast(parsedValue.release())); |
22 bool success = | 23 bool success = |
23 parsedObjectId->getInteger("injectedScriptId", &m_injectedScriptId); | 24 parsedObjectId->getInteger("injectedScriptId", &m_injectedScriptId); |
24 if (success) return parsedObjectId; | 25 if (success) return parsedObjectId; |
25 return nullptr; | 26 return nullptr; |
26 } | 27 } |
(...skipping 30 matching lines...) Expand all Loading... |
57 return Response::OK(); | 58 return Response::OK(); |
58 } | 59 } |
59 | 60 |
60 String16 RemoteCallFrameId::serialize(int injectedScriptId, int frameOrdinal) { | 61 String16 RemoteCallFrameId::serialize(int injectedScriptId, int frameOrdinal) { |
61 return "{\"ordinal\":" + String16::fromInteger(frameOrdinal) + | 62 return "{\"ordinal\":" + String16::fromInteger(frameOrdinal) + |
62 ",\"injectedScriptId\":" + String16::fromInteger(injectedScriptId) + | 63 ",\"injectedScriptId\":" + String16::fromInteger(injectedScriptId) + |
63 "}"; | 64 "}"; |
64 } | 65 } |
65 | 66 |
66 } // namespace v8_inspector | 67 } // namespace v8_inspector |
OLD | NEW |