RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 10:47:41 +00:00
Code Issues Activity Actions

LibWeb: Modify StylePropertiesModel to work with JSON

Browse source 
Now that the DOM Inspector communicates remotely with the web content,
we can't read the `StyleProperties` object from a `Node` directly, but
will receive JSON over IPC. This updates the model to match.
This commit is contained in:
Sam Atkins 2021-08-24 16:27:10 +01:00 • committed by Andreas Kling
parent 08aa7b77a7
commit 57ee7b3d56
2 changed files with 30 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Userland/Libraries/LibWeb/StylePropertiesModel.cpp
View file

@ -1,23 +1,21 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Sam Atkins <atkinssj@gmail.com>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include "StylePropertiesModel.h"
#include <AK/QuickSort.h> #include <AK/QuickSort.h>
#include <LibWeb/CSS/PropertyID.h>
#include <LibWeb/CSS/StyleProperties.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/StylePropertiesModel.h>
namespace Web { namespace Web {
StylePropertiesModel::StylePropertiesModel(const CSS::StyleProperties& properties) StylePropertiesModel::StylePropertiesModel(JsonObject properties)
: m_properties(properties) : m_properties(move(properties))
{ {
properties.for_each_property([&](auto property_id, auto& property_value) { m_properties.for_each_member([&](auto& property_name, auto& property_value) {
Value value; Value value;
value.name = CSS::string_from_property_id(property_id); value.name = property_name;
value.value = property_value.to_string(); value.value = property_value.to_string();
m_values.append(value); m_values.append(value);
}); });
@ -25,7 +23,11 @@ StylePropertiesModel::StylePropertiesModel(const CSS::StyleProperties& propertie
quick_sort(m_values, [](auto& a, auto& b) { return a.name < b.name; }); quick_sort(m_values, [](auto& a, auto& b) { return a.name < b.name; });
} }
int StylePropertiesModel::row_count(const GUI::ModelIndex&) const StylePropertiesModel::~StylePropertiesModel()
{
}
int StylePropertiesModel::row_count(GUI::ModelIndex const&) const
{ {
return m_values.size(); return m_values.size();
} }
@ -41,7 +43,8 @@ String StylePropertiesModel::column_name(int column_index) const
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
} }
GUI::Variant StylePropertiesModel::data(const GUI::ModelIndex& index, GUI::ModelRole role) const
GUI::Variant StylePropertiesModel::data(GUI::ModelIndex const& index, GUI::ModelRole role) const
{ {
auto& value = m_values[index.row()]; auto& value = m_values[index.row()];
if (role == GUI::ModelRole::Display) { if (role == GUI::ModelRole::Display) {

27
Userland/Libraries/LibWeb/StylePropertiesModel.h
View file

@ -1,19 +1,18 @@
/* /*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org> * Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Sam Atkins <atkinssj@gmail.com>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#pragma once #pragma once
#include <AK/NonnullRefPtrVector.h> #include <AK/JsonObject.h>
#include <LibGUI/Model.h> #include <LibGUI/Model.h>
#include <LibWeb/CSS/StyleProperties.h> #include <LibWeb/CSS/StyleProperties.h>
namespace Web { namespace Web {
class StyleProperties;
class StylePropertiesModel final : public GUI::Model { class StylePropertiesModel final : public GUI::Model {
public: public:
enum Column { enum Column {
@ -22,18 +21,26 @@ public:
__Count __Count
}; };
static NonnullRefPtr<StylePropertiesModel> create(const CSS::StyleProperties& properties) { return adopt_ref(*new StylePropertiesModel(properties)); } static NonnullRefPtr<StylePropertiesModel> create(StringView properties)
{
auto json_or_error = JsonValue::from_string(properties);
if (!json_or_error.has_value())
VERIFY_NOT_REACHED();
virtual int row_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override; return adopt_ref(*new StylePropertiesModel(json_or_error.value().as_object()));
virtual int column_count(const GUI::ModelIndex& = GUI::ModelIndex()) const override { return Column::__Count; } }
virtual ~StylePropertiesModel() override;
virtual int row_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override;
virtual int column_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return Column::__Count; }
virtual String column_name(int) const override; virtual String column_name(int) const override;
virtual GUI::Variant data(const GUI::ModelIndex&, GUI::ModelRole) const override; virtual GUI::Variant data(GUI::ModelIndex const&, GUI::ModelRole) const override;
private: private:
explicit StylePropertiesModel(const CSS::StyleProperties& properties); explicit StylePropertiesModel(JsonObject);
const CSS::StyleProperties& properties() const { return *m_properties; }
NonnullRefPtr<CSS::StyleProperties> m_properties; JsonObject m_properties;
struct Value { struct Value {
String name; String name;