Commit 6bac15d7 authored by Johannes Henkel's avatar Johannes Henkel Committed by Commit Bot

Port InspectorIndexedDBAgent to InspectorAgentState fields.

There's just one field for the enabled bit so this one's trivial.

For reference the PR that introduced the new
InspectorSessionState / InspectorAgentState / Fields
was https://chromium-review.googlesource.com/c/chromium/src/+/1149201.
We're migrating things from state_ to this new mechanism,
which allows incremental updates to flow back to the browser
process.

Bug: 851762
Change-Id: Ie709f8c99d196f5be018838e1cb9e70a2cb6aed8
Reviewed-on: https://chromium-review.googlesource.com/1159721
Commit-Queue: Johannes Henkel <johannes@chromium.org>
Reviewed-by: default avatarAndrey Kosyakov <caseq@chromium.org>
Reviewed-by: default avatarChris Mumford <cmumford@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580329}
parent 53bc99d8
...@@ -90,11 +90,6 @@ typedef blink::protocol::IndexedDB::Backend::DeleteDatabaseCallback ...@@ -90,11 +90,6 @@ typedef blink::protocol::IndexedDB::Backend::DeleteDatabaseCallback
DeleteDatabaseCallback; DeleteDatabaseCallback;
namespace blink { namespace blink {
namespace IndexedDBAgentState {
static const char kIndexedDBAgentEnabled[] = "indexedDBAgentEnabled";
};
namespace { namespace {
const char kIndexedDBObjectGroup[] = "indexeddb"; const char kIndexedDBObjectGroup[] = "indexeddb";
...@@ -754,15 +749,15 @@ class DataLoader final : public ExecutableWithDatabase<RequestDataCallback> { ...@@ -754,15 +749,15 @@ class DataLoader final : public ExecutableWithDatabase<RequestDataCallback> {
InspectorIndexedDBAgent::InspectorIndexedDBAgent( InspectorIndexedDBAgent::InspectorIndexedDBAgent(
InspectedFrames* inspected_frames, InspectedFrames* inspected_frames,
v8_inspector::V8InspectorSession* v8_session) v8_inspector::V8InspectorSession* v8_session)
: inspected_frames_(inspected_frames), v8_session_(v8_session) {} : inspected_frames_(inspected_frames),
v8_session_(v8_session),
enabled_(&agent_state_, /*default_value=*/false) {}
InspectorIndexedDBAgent::~InspectorIndexedDBAgent() = default; InspectorIndexedDBAgent::~InspectorIndexedDBAgent() = default;
void InspectorIndexedDBAgent::Restore() { void InspectorIndexedDBAgent::Restore() {
if (state_->booleanProperty(IndexedDBAgentState::kIndexedDBAgentEnabled, if (enabled_.Get())
false)) {
enable(); enable();
}
} }
void InspectorIndexedDBAgent::DidCommitLoadForLocalFrame(LocalFrame* frame) { void InspectorIndexedDBAgent::DidCommitLoadForLocalFrame(LocalFrame* frame) {
...@@ -773,12 +768,12 @@ void InspectorIndexedDBAgent::DidCommitLoadForLocalFrame(LocalFrame* frame) { ...@@ -773,12 +768,12 @@ void InspectorIndexedDBAgent::DidCommitLoadForLocalFrame(LocalFrame* frame) {
} }
Response InspectorIndexedDBAgent::enable() { Response InspectorIndexedDBAgent::enable() {
state_->setBoolean(IndexedDBAgentState::kIndexedDBAgentEnabled, true); enabled_.Set(true);
return Response::OK(); return Response::OK();
} }
Response InspectorIndexedDBAgent::disable() { Response InspectorIndexedDBAgent::disable() {
state_->setBoolean(IndexedDBAgentState::kIndexedDBAgentEnabled, false); enabled_.Clear();
v8_session_->releaseObjectGroup( v8_session_->releaseObjectGroup(
ToV8InspectorStringView(kIndexedDBObjectGroup)); ToV8InspectorStringView(kIndexedDBObjectGroup));
return Response::OK(); return Response::OK();
......
...@@ -86,6 +86,7 @@ class MODULES_EXPORT InspectorIndexedDBAgent final ...@@ -86,6 +86,7 @@ class MODULES_EXPORT InspectorIndexedDBAgent final
private: private:
Member<InspectedFrames> inspected_frames_; Member<InspectedFrames> inspected_frames_;
v8_inspector::V8InspectorSession* v8_session_; v8_inspector::V8InspectorSession* v8_session_;
InspectorAgentState::Boolean enabled_;
}; };
} // namespace blink } // namespace blink
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment