diff --git a/LibHTML/CSS/StyleRule.cpp b/LibHTML/CSS/StyleRule.cpp
index 06a5925788..1fcdf38c40 100644
--- a/LibHTML/CSS/StyleRule.cpp
+++ b/LibHTML/CSS/StyleRule.cpp
@@ -1,6 +1,6 @@
#include
-StyleRule::StyleRule(Vector&& selectors, Vector>&& declarations)
+StyleRule::StyleRule(Vector&& selectors, NonnullRefPtrVector&& declarations)
: m_selectors(move(selectors))
, m_declarations(move(declarations))
{
diff --git a/LibHTML/CSS/StyleRule.h b/LibHTML/CSS/StyleRule.h
index cfff791698..3ccdb57caa 100644
--- a/LibHTML/CSS/StyleRule.h
+++ b/LibHTML/CSS/StyleRule.h
@@ -1,12 +1,12 @@
#pragma once
-#include
+#include
#include
#include
class StyleRule : public RefCounted {
public:
- static NonnullRefPtr create(Vector&& selectors, Vector>&& declarations)
+ static NonnullRefPtr create(Vector&& selectors, NonnullRefPtrVector&& declarations)
{
return adopt(*new StyleRule(move(selectors), move(declarations)));
}
@@ -14,18 +14,18 @@ public:
~StyleRule();
const Vector& selectors() const { return m_selectors; }
- const Vector>& declarations() const { return m_declarations; }
+ const NonnullRefPtrVector& declarations() const { return m_declarations; }
template
void for_each_declaration(C callback) const
{
for (auto& declaration : m_declarations)
- callback(*declaration);
+ callback(declaration);
}
private:
- StyleRule(Vector&&, Vector>&&);
+ StyleRule(Vector&&, NonnullRefPtrVector&&);
Vector m_selectors;
- Vector> m_declarations;
+ NonnullRefPtrVector m_declarations;
};
diff --git a/LibHTML/CSS/StyleSheet.cpp b/LibHTML/CSS/StyleSheet.cpp
index 58064325ed..c659311030 100644
--- a/LibHTML/CSS/StyleSheet.cpp
+++ b/LibHTML/CSS/StyleSheet.cpp
@@ -1,6 +1,6 @@
#include
-StyleSheet::StyleSheet(Vector>&& rules)
+StyleSheet::StyleSheet(NonnullRefPtrVector&& rules)
: m_rules(move(rules))
{
}
diff --git a/LibHTML/CSS/StyleSheet.h b/LibHTML/CSS/StyleSheet.h
index f769e0f8e1..5fc0a1a741 100644
--- a/LibHTML/CSS/StyleSheet.h
+++ b/LibHTML/CSS/StyleSheet.h
@@ -1,21 +1,21 @@
#pragma once
-#include
+#include
#include
class StyleSheet : public RefCounted {
public:
- static NonnullRefPtr create(Vector>&& rules)
+ static NonnullRefPtr create(NonnullRefPtrVector&& rules)
{
return adopt(*new StyleSheet(move(rules)));
}
~StyleSheet();
- const Vector>& rules() const { return m_rules; }
+ const NonnullRefPtrVector& rules() const { return m_rules; }
private:
- explicit StyleSheet(Vector>&&);
+ explicit StyleSheet(NonnullRefPtrVector&&);
- Vector> m_rules;
+ NonnullRefPtrVector m_rules;
};
diff --git a/LibHTML/Dump.cpp b/LibHTML/Dump.cpp
index 411ff8bffc..e9c2a2b313 100644
--- a/LibHTML/Dump.cpp
+++ b/LibHTML/Dump.cpp
@@ -73,7 +73,7 @@ void dump_sheet(const StyleSheet& sheet)
for (auto& rule : sheet.rules()) {
printf("Rule:\n");
- for (auto& selector : rule->selectors()) {
+ for (auto& selector : rule.selectors()) {
printf(" Selector:\n");
for (auto& component : selector.components()) {
const char* type_description = "Unknown";
@@ -95,7 +95,7 @@ void dump_sheet(const StyleSheet& sheet)
}
}
printf(" Declarations:\n");
- rule->for_each_declaration([](auto& declaration) {
+ rule.for_each_declaration([](auto& declaration) {
printf(" '%s': '%s'\n", declaration.property_name().characters(), declaration.value().to_string().characters());
});
}