From 7cc9ce83808895b59061e2eacd12189624d9ec11 Mon Sep 17 00:00:00 2001
From: Andreas Kling <awesomekling@gmail.com>
Date: Thu, 27 Jun 2019 12:16:20 +0200
Subject: [PATCH] LibHTML: Use NonnullRefPtrVector in LibHTML.

---
 LibHTML/CSS/StyleRule.cpp  |  2 +-
 LibHTML/CSS/StyleRule.h    | 12 ++++++------
 LibHTML/CSS/StyleSheet.cpp |  2 +-
 LibHTML/CSS/StyleSheet.h   | 10 +++++-----
 LibHTML/Dump.cpp           |  4 ++--
 5 files changed, 15 insertions(+), 15 deletions(-)

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 <LibHTML/CSS/StyleRule.h>
 
-StyleRule::StyleRule(Vector<Selector>&& selectors, Vector<NonnullRefPtr<StyleDeclaration>>&& declarations)
+StyleRule::StyleRule(Vector<Selector>&& selectors, NonnullRefPtrVector<StyleDeclaration>&& 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 <AK/Vector.h>
+#include <AK/NonnullRefPtrVector.h>
 #include <LibHTML/CSS/Selector.h>
 #include <LibHTML/CSS/StyleDeclaration.h>
 
 class StyleRule : public RefCounted<StyleRule> {
 public:
-    static NonnullRefPtr<StyleRule> create(Vector<Selector>&& selectors, Vector<NonnullRefPtr<StyleDeclaration>>&& declarations)
+    static NonnullRefPtr<StyleRule> create(Vector<Selector>&& selectors, NonnullRefPtrVector<StyleDeclaration>&& declarations)
     {
         return adopt(*new StyleRule(move(selectors), move(declarations)));
     }
@@ -14,18 +14,18 @@ public:
     ~StyleRule();
 
     const Vector<Selector>& selectors() const { return m_selectors; }
-    const Vector<NonnullRefPtr<StyleDeclaration>>& declarations() const { return m_declarations; }
+    const NonnullRefPtrVector<StyleDeclaration>& declarations() const { return m_declarations; }
 
     template<typename C>
     void for_each_declaration(C callback) const
     {
         for (auto& declaration : m_declarations)
-            callback(*declaration);
+            callback(declaration);
     }
 
 private:
-    StyleRule(Vector<Selector>&&, Vector<NonnullRefPtr<StyleDeclaration>>&&);
+    StyleRule(Vector<Selector>&&, NonnullRefPtrVector<StyleDeclaration>&&);
 
     Vector<Selector> m_selectors;
-    Vector<NonnullRefPtr<StyleDeclaration>> m_declarations;
+    NonnullRefPtrVector<StyleDeclaration> 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 <LibHTML/CSS/StyleSheet.h>
 
-StyleSheet::StyleSheet(Vector<NonnullRefPtr<StyleRule>>&& rules)
+StyleSheet::StyleSheet(NonnullRefPtrVector<StyleRule>&& 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 <AK/Vector.h>
+#include <AK/NonnullRefPtrVector.h>
 #include <LibHTML/CSS/StyleRule.h>
 
 class StyleSheet : public RefCounted<StyleSheet> {
 public:
-    static NonnullRefPtr<StyleSheet> create(Vector<NonnullRefPtr<StyleRule>>&& rules)
+    static NonnullRefPtr<StyleSheet> create(NonnullRefPtrVector<StyleRule>&& rules)
     {
         return adopt(*new StyleSheet(move(rules)));
     }
 
     ~StyleSheet();
 
-    const Vector<NonnullRefPtr<StyleRule>>& rules() const { return m_rules; }
+    const NonnullRefPtrVector<StyleRule>& rules() const { return m_rules; }
 
 private:
-    explicit StyleSheet(Vector<NonnullRefPtr<StyleRule>>&&);
+    explicit StyleSheet(NonnullRefPtrVector<StyleRule>&&);
 
-    Vector<NonnullRefPtr<StyleRule>> m_rules;
+    NonnullRefPtrVector<StyleRule> 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());
         });
     }