third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp - Issue 1638563002: DevTools: migrate ScriptFunctionCall off ScriptValue (to be inlined into the InjectedScript.cpp).

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 1638563002: DevTools: migrate ScriptFunctionCall off ScriptValue (to be inlined into the InjectedScript.cpp). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: ready for review Created 4 years, 11 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

« third_party/WebKit/Source/core/inspector/InjectedScript.cpp ('K') | « third_party/WebKit/Source/core/inspector/v8/V8InjectedScriptHost.cpp ('k') | third_party/WebKit/Source/platform/JSONValuesForV8.h » ('j') | third_party/WebKit/Source/platform/JSONValuesForV8.cpp » ('J')
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 39a7bb9154c145ccc8905be5303c2b9abcff462c..cbc2107fc6a8c39ac8b5a2c13a5460d6af2da8d6 100644

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

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

@@ -495,11 +495,10 @@ public:

// object is inspected.

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

ScriptState* scriptState = m_scriptState.get();

- v8::Isolate* isolate = scriptState->isolate();

ScriptState::Scope scope(scriptState);

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

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

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

+ 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());

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

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

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