Browse Source

LibWeb: Make HTMLToken::{Position,AttributeBuilder} structs public

There was and is no reason for those to be private. Making them public
also allows us to explicitly specify the return type of some getters.
Max Wipfli 4 years ago
parent
commit
d82f3eb085
1 changed files with 20 additions and 19 deletions
  1. 20 19
      Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.h

+ 20 - 19
Userland/Libraries/LibWeb/HTML/Parser/HTMLToken.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
+ * Copyright (c) 2021, Max Wipfli <max.wipfli@serenityos.org>
  *
  * SPDX-License-Identifier: BSD-2-Clause
  */
@@ -29,6 +30,22 @@ public:
         EndOfFile,
     };
 
+    struct Position {
+        size_t line { 0 };
+        size_t column { 0 };
+    };
+
+    struct AttributeBuilder {
+        String prefix;
+        String local_name;
+        String namespace_;
+        String value;
+        Position name_start_position;
+        Position value_start_position;
+        Position name_end_position;
+        Position value_end_position;
+    };
+
     static HTMLToken make_character(u32 code_point)
     {
         HTMLToken token;
@@ -158,32 +175,16 @@ public:
 
     String to_string() const;
 
-    auto const& start_position() const { return m_start_position; }
-    auto const& end_position() const { return m_end_position; }
+    Position const& start_position() const { return m_start_position; }
+    Position const& end_position() const { return m_end_position; }
 
-    auto const& attributes() const
+    Vector<Attribute> const& attributes() const
     {
         VERIFY(is_start_tag() || is_end_tag());
         return m_tag.attributes;
     }
 
 private:
-    struct Position {
-        size_t line { 0 };
-        size_t column { 0 };
-    };
-
-    struct AttributeBuilder {
-        String prefix;
-        String local_name;
-        String namespace_;
-        String value;
-        Position name_start_position;
-        Position value_start_position;
-        Position name_end_position;
-        Position value_end_position;
-    };
-
     Type m_type { Type::Invalid };
 
     // Type::DOCTYPE