Skip to content

Commit 562e0d7

Browse files
shannonboothawesomekling
authored andcommitted
LibWeb: Port ProcessingInstruction from ByteString
1 parent 7ce3e11 commit 562e0d7

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

Userland/Libraries/LibWeb/DOM/Document.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1427,7 +1427,7 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<ProcessingInstruction>> Document::create_pr
14271427
// FIXME: 2. If data contains the string "?>", then throw an "InvalidCharacterError" DOMException.
14281428

14291429
// 3. Return a new ProcessingInstruction node, with target set to target, data set to data, and node document set to this.
1430-
return heap().allocate<ProcessingInstruction>(realm(), *this, data.to_byte_string(), target.to_byte_string());
1430+
return heap().allocate<ProcessingInstruction>(realm(), *this, data, target);
14311431
}
14321432

14331433
JS::NonnullGCPtr<Range> Document::create_range()

Userland/Libraries/LibWeb/DOM/Node.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ JS::NonnullGCPtr<Node> Node::clone_node(Document* document, bool clone_children)
872872
auto processing_instruction = verify_cast<ProcessingInstruction>(this);
873873

874874
// Set copy’s target and data to those of node.
875-
auto processing_instruction_copy = heap().allocate<ProcessingInstruction>(realm(), *document, processing_instruction->data().to_byte_string(), processing_instruction->target());
875+
auto processing_instruction_copy = heap().allocate<ProcessingInstruction>(realm(), *document, processing_instruction->data(), processing_instruction->target());
876876
copy = processing_instruction_copy;
877877
}
878878
// Otherwise, Do nothing.

Userland/Libraries/LibWeb/DOM/ProcessingInstruction.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ namespace Web::DOM {
1313

1414
JS_DEFINE_ALLOCATOR(ProcessingInstruction);
1515

16-
ProcessingInstruction::ProcessingInstruction(Document& document, ByteString const& data, ByteString const& target)
17-
: CharacterData(document, NodeType::PROCESSING_INSTRUCTION_NODE, MUST(String::from_byte_string(data)))
16+
ProcessingInstruction::ProcessingInstruction(Document& document, String const& data, String const& target)
17+
: CharacterData(document, NodeType::PROCESSING_INSTRUCTION_NODE, data)
1818
, m_target(target)
1919
{
2020
}

Userland/Libraries/LibWeb/DOM/ProcessingInstruction.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ class ProcessingInstruction final : public CharacterData {
1717
public:
1818
virtual ~ProcessingInstruction() override = default;
1919

20-
virtual FlyString node_name() const override { return MUST(FlyString::from_deprecated_fly_string(m_target)); }
20+
virtual FlyString node_name() const override { return m_target; }
2121

22-
ByteString const& target() const { return m_target; }
22+
String const& target() const { return m_target; }
2323

2424
private:
25-
ProcessingInstruction(Document&, ByteString const& data, ByteString const& target);
25+
ProcessingInstruction(Document&, String const& data, String const& target);
2626

2727
virtual void initialize(JS::Realm&) override;
2828

29-
ByteString m_target;
29+
String m_target;
3030
};
3131

3232
template<>

0 commit comments

Comments
 (0)