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

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

Issue 2260233002: [DevTools] Migrate v8_inspector/public from String16 to String{View,Buffer}. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: styling 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/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 fcbae0f7c62a29597385420a6420824367c3e476..7fafdbae93f99cd651f85b26643c4f12d1e07def 100644
--- a/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp
+++ b/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp
@@ -40,6 +40,7 @@
#include "core/events/EventListener.h"
#include "core/frame/LocalFrame.h"
#include "core/inspector/InspectedFrames.h"
+#include "core/inspector/V8InspectorString.h"
#include "modules/IndexedDBNames.h"
#include "modules/indexeddb/GlobalIndexedDB.h"
#include "modules/indexeddb/IDBCursor.h"
@@ -468,10 +469,11 @@ public:
ScriptState* scriptState = m_scriptState.get();
ScriptState::Scope scope(scriptState);
v8::Local<v8::Context> context = scriptState->context();
+ v8_inspector::StringView objectGroup = toV8InspectorStringView(indexedDBObjectGroup);
std::unique_ptr<DataEntry> dataEntry = DataEntry::create()
- .setKey(m_v8Session->wrapObject(context, idbCursor->key(scriptState).v8Value(), indexedDBObjectGroup))
- .setPrimaryKey(m_v8Session->wrapObject(context, idbCursor->primaryKey(scriptState).v8Value(), indexedDBObjectGroup))
- .setValue(m_v8Session->wrapObject(context, idbCursor->value(scriptState).v8Value(), indexedDBObjectGroup))
+ .setKey(m_v8Session->wrapObject(context, idbCursor->key(scriptState).v8Value(), objectGroup))
+ .setPrimaryKey(m_v8Session->wrapObject(context, idbCursor->primaryKey(scriptState).v8Value(), objectGroup))
+ .setValue(m_v8Session->wrapObject(context, idbCursor->value(scriptState).v8Value(), objectGroup))
.build();
m_result->addItem(std::move(dataEntry));
}
@@ -590,7 +592,7 @@ void InspectorIndexedDBAgent::restore()
void InspectorIndexedDBAgent::didCommitLoadForLocalFrame(LocalFrame* frame)
{
if (frame == m_inspectedFrames->root())
- m_v8Session->releaseObjectGroup(indexedDBObjectGroup);
+ m_v8Session->releaseObjectGroup(toV8InspectorStringView(indexedDBObjectGroup));
}
void InspectorIndexedDBAgent::enable(ErrorString*)
@@ -601,7 +603,7 @@ void InspectorIndexedDBAgent::enable(ErrorString*)
void InspectorIndexedDBAgent::disable(ErrorString*)
{
m_state->setBoolean(IndexedDBAgentState::indexedDBAgentEnabled, false);
- m_v8Session->releaseObjectGroup(indexedDBObjectGroup);
+ m_v8Session->releaseObjectGroup(toV8InspectorStringView(indexedDBObjectGroup));
}
static Document* assertDocument(ErrorString* errorString, LocalFrame* frame)

Powered by Google App Engine
This is Rietveld 408576698