RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 21:07:34 +00:00
Code Issues Activity Actions

LibWeb: Port Storage interface from DeprecatedString to String

Browse source 
Which ends up bubbling all the way up to the Browser storage model.
This commit is contained in:
Shannon Booth 2023-08-26 16:30:02 +12:00 • committed by Andrew Kaster
parent 6f85be501d
commit 901220c588
11 changed files with 39 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Applications/Browser/StorageModel.cpp
View file

@ -10,10 +10,10 @@
namespace Browser {
void StorageModel::set_items(OrderedHashMap<DeprecatedString, DeprecatedString> map)
void StorageModel::set_items(OrderedHashMap<String, String> map)
{
begin_insert_rows({}, m_local_storage_entries.size(), m_local_storage_entries.size());
m_local_storage_entries = map;
m_local_storage_entries = move(map);
end_insert_rows();
did_update(DontInvalidateIndices);

4
Userland/Applications/Browser/StorageModel.h
View file

@ -18,7 +18,7 @@ public:
__Count,
};
void set_items(OrderedHashMap<DeprecatedString, DeprecatedString> map);
void set_items(OrderedHashMap<String, String> map);
void clear_items();
virtual int row_count(GUI::ModelIndex const&) const override;
virtual int column_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return Column::__Count; }
@ -28,7 +28,7 @@ public:
virtual GUI::Model::MatchResult data_matches(GUI::ModelIndex const& index, GUI::Variant const& term) const override;
private:
OrderedHashMap<DeprecatedString, DeprecatedString> m_local_storage_entries;
OrderedHashMap<String, String> m_local_storage_entries;
};
}

4
Userland/Applications/Browser/StorageWidget.cpp
View file

@ -107,7 +107,7 @@ void StorageWidget::clear_cookies()
m_cookies_model->clear_items();
}
void StorageWidget::set_local_storage_entries(OrderedHashMap<DeprecatedString, DeprecatedString> entries)
void StorageWidget::set_local_storage_entries(OrderedHashMap<String, String> entries)
{
m_local_storage_model->set_items(move(entries));
}
@ -117,7 +117,7 @@ void StorageWidget::clear_local_storage_entries()
m_local_storage_model->clear_items();
}
void StorageWidget::set_session_storage_entries(OrderedHashMap<DeprecatedString, DeprecatedString> entries)
void StorageWidget::set_session_storage_entries(OrderedHashMap<String, String> entries)
{
m_session_storage_model->set_items(move(entries));
}

4
Userland/Applications/Browser/StorageWidget.h
View file

@ -26,10 +26,10 @@ public:
Function<void(Web::Cookie::Cookie)> on_update_cookie;
void set_local_storage_entries(OrderedHashMap<DeprecatedString, DeprecatedString> entries);
void set_local_storage_entries(OrderedHashMap<String, String> entries);
void clear_local_storage_entries();
void set_session_storage_entries(OrderedHashMap<DeprecatedString, DeprecatedString> entries);
void set_session_storage_entries(OrderedHashMap<String, String> entries);
void clear_session_storage_entries();
private:

4
Userland/Applications/Browser/Tab.h
View file

@ -76,8 +76,8 @@ public:
Function<void()> on_dump_cookies;
Function<void(Web::Cookie::Cookie)> on_update_cookie;
Function<Vector<Web::Cookie::Cookie>()> on_get_cookies_entries;
Function<OrderedHashMap<DeprecatedString, DeprecatedString>()> on_get_local_storage_entries;
Function<OrderedHashMap<DeprecatedString, DeprecatedString>()> on_get_session_storage_entries;
Function<OrderedHashMap<String, String>()> on_get_local_storage_entries;
Function<OrderedHashMap<String, String>()> on_get_session_storage_entries;
void enable_webdriver_mode();