Commit bc4f04b2 authored by Johannes Henkel's avatar Johannes Henkel Committed by Commit Bot

Port InspectorDOMStorageAgent to InspectorAgentState fields.

There's just one field for the enabled bit so this one's trivial;
I made an InnerEnable to avoid having multiple fields.

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.

Change-Id: I57b45ccb2595fc9167390361715cc9d795941699
Reviewed-on: https://chromium-review.googlesource.com/1159730Reviewed-by: default avatarAndrey Kosyakov <caseq@chromium.org>
Reviewed-by: default avatarMarijn Kruisselbrink <mek@chromium.org>
Commit-Queue: Johannes Henkel <johannes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580288}
parent 02e70958
...@@ -42,13 +42,8 @@ ...@@ -42,13 +42,8 @@
#include "third_party/blink/renderer/platform/weborigin/security_origin.h" #include "third_party/blink/renderer/platform/weborigin/security_origin.h"
namespace blink { namespace blink {
using protocol::Response; using protocol::Response;
namespace DOMStorageAgentState {
static const char kDomStorageAgentEnabled[] = "domStorageAgentEnabled";
};
static Response ToResponse(ExceptionState& exception_state) { static Response ToResponse(ExceptionState& exception_state) {
if (!exception_state.HadException()) if (!exception_state.HadException())
return Response::OK(); return Response::OK();
...@@ -63,7 +58,8 @@ static Response ToResponse(ExceptionState& exception_state) { ...@@ -63,7 +58,8 @@ static Response ToResponse(ExceptionState& exception_state) {
InspectorDOMStorageAgent::InspectorDOMStorageAgent( InspectorDOMStorageAgent::InspectorDOMStorageAgent(
InspectedFrames* inspected_frames) InspectedFrames* inspected_frames)
: inspected_frames_(inspected_frames), is_enabled_(false) {} : inspected_frames_(inspected_frames),
enabled_(&agent_state_, /*default_value=*/false) {}
InspectorDOMStorageAgent::~InspectorDOMStorageAgent() = default; InspectorDOMStorageAgent::~InspectorDOMStorageAgent() = default;
...@@ -73,28 +69,28 @@ void InspectorDOMStorageAgent::Trace(blink::Visitor* visitor) { ...@@ -73,28 +69,28 @@ void InspectorDOMStorageAgent::Trace(blink::Visitor* visitor) {
} }
void InspectorDOMStorageAgent::Restore() { void InspectorDOMStorageAgent::Restore() {
if (state_->booleanProperty(DOMStorageAgentState::kDomStorageAgentEnabled, if (enabled_.Get())
false)) { InnerEnable();
enable();
}
} }
Response InspectorDOMStorageAgent::enable() { void InspectorDOMStorageAgent::InnerEnable() {
if (is_enabled_)
return Response::OK();
is_enabled_ = true;
state_->setBoolean(DOMStorageAgentState::kDomStorageAgentEnabled, true);
if (StorageNamespaceController* controller = StorageNamespaceController::From( if (StorageNamespaceController* controller = StorageNamespaceController::From(
inspected_frames_->Root()->GetPage())) inspected_frames_->Root()->GetPage()))
controller->SetInspectorAgent(this); controller->SetInspectorAgent(this);
}
Response InspectorDOMStorageAgent::enable() {
if (enabled_.Get())
return Response::OK();
enabled_.Set(true);
InnerEnable();
return Response::OK(); return Response::OK();
} }
Response InspectorDOMStorageAgent::disable() { Response InspectorDOMStorageAgent::disable() {
if (!is_enabled_) if (!enabled_.Get())
return Response::OK(); return Response::OK();
is_enabled_ = false; enabled_.Set(false);
state_->setBoolean(DOMStorageAgentState::kDomStorageAgentEnabled, false);
if (StorageNamespaceController* controller = StorageNamespaceController::From( if (StorageNamespaceController* controller = StorageNamespaceController::From(
inspected_frames_->Root()->GetPage())) inspected_frames_->Root()->GetPage()))
controller->SetInspectorAgent(nullptr); controller->SetInspectorAgent(nullptr);
......
...@@ -54,6 +54,7 @@ class MODULES_EXPORT InspectorDOMStorageAgent final ...@@ -54,6 +54,7 @@ class MODULES_EXPORT InspectorDOMStorageAgent final
const SecurityOrigin*); const SecurityOrigin*);
private: private:
void InnerEnable();
// InspectorBaseAgent overrides. // InspectorBaseAgent overrides.
void Restore() override; void Restore() override;
...@@ -84,7 +85,7 @@ class MODULES_EXPORT InspectorDOMStorageAgent final ...@@ -84,7 +85,7 @@ class MODULES_EXPORT InspectorDOMStorageAgent final
bool is_local_storage); bool is_local_storage);
Member<InspectedFrames> inspected_frames_; Member<InspectedFrames> inspected_frames_;
bool is_enabled_; 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