diff --git a/Meta/gn/secondary/Userland/Libraries/LibWebView/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWebView/BUILD.gn index 43bd1239f9..89d2c9cba1 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWebView/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWebView/BUILD.gn @@ -121,7 +121,6 @@ shared_library("LibWebView") { "Database.cpp", "History.cpp", "InspectorClient.cpp", - "PropertyTableModel.cpp", "RequestServerAdapter.cpp", "SearchEngine.cpp", "SourceHighlighter.cpp", diff --git a/Userland/Libraries/LibWebView/CMakeLists.txt b/Userland/Libraries/LibWebView/CMakeLists.txt index 6a106961d6..d90449393f 100644 --- a/Userland/Libraries/LibWebView/CMakeLists.txt +++ b/Userland/Libraries/LibWebView/CMakeLists.txt @@ -6,7 +6,6 @@ set(SOURCES Database.cpp History.cpp InspectorClient.cpp - PropertyTableModel.cpp RequestServerAdapter.cpp SearchEngine.cpp SourceHighlighter.cpp diff --git a/Userland/Libraries/LibWebView/ModelIndex.h b/Userland/Libraries/LibWebView/ModelIndex.h deleted file mode 100644 index d49a002cea..0000000000 --- a/Userland/Libraries/LibWebView/ModelIndex.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2023, Tim Flynn - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -namespace WebView { - -struct ModelIndex { - bool is_valid() const { return row != -1 && column != -1; } - - int row { -1 }; - int column { -1 }; - void const* internal_data { nullptr }; -}; - -} diff --git a/Userland/Libraries/LibWebView/PropertyTableModel.cpp b/Userland/Libraries/LibWebView/PropertyTableModel.cpp deleted file mode 100644 index 57c811cdd7..0000000000 --- a/Userland/Libraries/LibWebView/PropertyTableModel.cpp +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * Copyright (c) 2021, Sam Atkins - * Copyright (c) 2023, Jonah Shafran - * Copyright (c) 2023, Tim Flynn - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#include -#include -#include -#include - -namespace WebView { - -PropertyTableModel::PropertyTableModel(Type type, JsonValue const& properties) -{ - properties.as_object().for_each_member([&](auto const& property_name, auto const& property_value) { - switch (type) { - case PropertyTableModel::Type::ARIAProperties: - m_values.empend(MUST(String::from_deprecated_string(property_name)), String {}); - - property_value.as_object().for_each_member([&](auto const& property_name, auto const& property_value) { - m_values.empend(MUST(String::from_deprecated_string(property_name)), MUST(String::from_deprecated_string(property_value.to_deprecated_string()))); - }); - - break; - - case PropertyTableModel::Type::StyleProperties: - m_values.empend(MUST(String::from_deprecated_string(property_name)), MUST(String::from_deprecated_string(property_value.to_deprecated_string()))); - break; - } - }); - - quick_sort(m_values, [](auto const& a, auto const& b) { - return a.name < b.name; - }); -} - -PropertyTableModel::~PropertyTableModel() = default; - -int PropertyTableModel::row_count(ModelIndex const&) const -{ - return static_cast(m_values.size()); -} - -int PropertyTableModel::column_count(ModelIndex const&) const -{ - return 2; -} - -ErrorOr PropertyTableModel::column_name(int column_index) const -{ - switch (static_cast(column_index)) { - case Column::PropertyName: - return "Name"_string; - case Column::PropertyValue: - return "Value"_string; - } - - VERIFY_NOT_REACHED(); -} - -ModelIndex PropertyTableModel::index(int row, int column, ModelIndex const&) const -{ - return { row, column }; -} - -String PropertyTableModel::text_for_display(ModelIndex const& index) const -{ - auto const& value = m_values[index.row]; - - switch (static_cast(index.column)) { - case Column::PropertyName: - return value.name; - case Column::PropertyValue: - return value.value; - } - - VERIFY_NOT_REACHED(); -} - -} diff --git a/Userland/Libraries/LibWebView/PropertyTableModel.h b/Userland/Libraries/LibWebView/PropertyTableModel.h deleted file mode 100644 index 3acd31a594..0000000000 --- a/Userland/Libraries/LibWebView/PropertyTableModel.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * Copyright (c) 2021, Sam Atkins - * Copyright (c) 2023, Jonah Shafran - * Copyright (c) 2023, Tim Flynn - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include -#include -#include -#include - -namespace WebView { - -class PropertyTableModel { -public: - enum class Type { - ARIAProperties, - StyleProperties, - }; - - enum class Column : int { - PropertyName, - PropertyValue, - }; - - PropertyTableModel(Type, JsonValue const&); - ~PropertyTableModel(); - - template - void for_each_property_name(Callback&& callback) - { - for (size_t i = 0; i < m_values.size(); ++i) { - ModelIndex index { static_cast(i), to_underlying(WebView::PropertyTableModel::Column::PropertyName) }; - auto const& property_name = m_values[i].name; - - if (callback(index, property_name) == IterationDecision::Break) - break; - } - } - - int row_count(ModelIndex const& parent) const; - int column_count(ModelIndex const& parent) const; - ErrorOr column_name(int) const; - ModelIndex index(int row, int column, ModelIndex const& parent) const; - String text_for_display(ModelIndex const& index) const; - -private: - struct Value { - String name; - String value; - }; - Vector m_values; -}; - -}