third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp - Issue 1738073002: DevTools: introduce protocol::Value, baseline for hierarchical data in remote debugging protocol.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp

Issue 1738073002: DevTools: introduce protocol::Value, baseline for hierarchical data in remote debugging protocol. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

« no previous file with comments | « third_party/WebKit/Source/modules/cachestorage/InspectorCacheStorageAgent.cpp ('k') | third_party/WebKit/Source/modules/storage/InspectorDOMStorageAgent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp

diff --git a/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp b/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp

index e8abe9e3ed724f4579e98cb373ec435a735210d1..810aa0ed3c7132cc8023adc0eca11a832cd9c26e 100644

--- a/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp

+++ b/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp

@@ -55,8 +55,8 @@

#include "modules/indexeddb/IDBOpenDBRequest.h"

#include "modules/indexeddb/IDBRequest.h"

#include "modules/indexeddb/IDBTransaction.h"

-#include "platform/JSONValues.h"

-#include "platform/JSONValuesForV8.h"

+#include "platform/inspector_protocol/Values.h"

+#include "platform/v8_inspector/public/V8ToProtocolValue.h"

#include "platform/weborigin/SecurityOrigin.h"

#include "public/platform/modules/indexeddb/WebIDBCursor.h"

#include "public/platform/modules/indexeddb/WebIDBTypes.h"

@@ -474,9 +474,9 @@ public:

const String errorMessage("\"Inspection error. Maximum depth reached?\"");

ScriptState* scriptState = m_scriptState.get();

ScriptState::Scope scope(scriptState);

- RefPtr<JSONValue> keyJsonValue = toJSONValue(scriptState->context(), idbCursor->key(scriptState).v8Value());

- RefPtr<JSONValue> primaryKeyJsonValue = toJSONValue(scriptState->context(), idbCursor->primaryKey(scriptState).v8Value());

- RefPtr<JSONValue> valueJsonValue = toJSONValue(scriptState->context(), idbCursor->value(scriptState).v8Value());

+ RefPtr<protocol::Value> keyJsonValue = toProtocolValue(scriptState->context(), idbCursor->key(scriptState).v8Value());

+ RefPtr<protocol::Value> primaryKeyJsonValue = toProtocolValue(scriptState->context(), idbCursor->primaryKey(scriptState).v8Value());

+ RefPtr<protocol::Value> valueJsonValue = toProtocolValue(scriptState->context(), idbCursor->value(scriptState).v8Value());

String key = keyJsonValue ? keyJsonValue->toJSONString() : errorMessage;

String value = valueJsonValue ? valueJsonValue->toJSONString() : errorMessage;

String primaryKey = primaryKeyJsonValue ? primaryKeyJsonValue->toJSONString() : errorMessage;