diff --git a/AK/URL.cpp b/AK/URL.cpp index be47f41314..d50be060de 100644 --- a/AK/URL.cpp +++ b/AK/URL.cpp @@ -63,11 +63,6 @@ DeprecatedString URL::basename() const } DeprecatedString URL::fragment() const -{ - return percent_decode(m_fragment); -} - -DeprecatedString URL::raw_fragment() const { return m_fragment; } @@ -142,7 +137,7 @@ void URL::append_path(StringView path) void URL::set_fragment(StringView fragment) { - m_fragment = deprecated_string_percent_encode(fragment, PercentEncodeSet::Fragment); + m_fragment = fragment; } // https://url.spec.whatwg.org/#cannot-have-a-username-password-port diff --git a/AK/URL.h b/AK/URL.h index 1f5c0305ed..97280c70f4 100644 --- a/AK/URL.h +++ b/AK/URL.h @@ -83,9 +83,7 @@ public: ErrorOr serialized_host() const; DeprecatedString basename() const; Optional const& query() const { return m_query; } - // NOTE: fragment() is percent-decoded, raw_fragment() is not. DeprecatedString fragment() const; - DeprecatedString raw_fragment() const; Optional port() const { return m_port; } DeprecatedString path_segment_at_index(size_t index) const; size_t path_segment_count() const { return m_paths.size(); } diff --git a/Userland/Libraries/LibWeb/DOM/Document.cpp b/Userland/Libraries/LibWeb/DOM/Document.cpp index 3706b556a3..e4d493fa12 100644 --- a/Userland/Libraries/LibWeb/DOM/Document.cpp +++ b/Userland/Libraries/LibWeb/DOM/Document.cpp @@ -1737,7 +1737,7 @@ Document::IndicatedPart Document::determine_the_indicated_part() const // For an HTML document document, the following processing model must be followed to determine its indicated part: // 1. Let fragment be document's URL's fragment. - auto fragment = url().raw_fragment(); + auto fragment = url().fragment(); // 2. If fragment is the empty string, then return the special value top of the document. if (fragment.is_empty()) @@ -1752,8 +1752,7 @@ Document::IndicatedPart Document::determine_the_indicated_part() const // 5. Let fragmentBytes be the result of percent-decoding fragment. // 6. Let decodedFragment be the result of running UTF-8 decode without BOM on fragmentBytes. - // NOTE: 5 and 6 are done as a single step in `AK::URL::fragment()`. - auto decoded_fragment = url().fragment(); + auto decoded_fragment = AK::URL::percent_decode(fragment); // 7. Set potentialIndicatedElement to the result of finding a potential indicated element given document and decodedFragment. potential_indicated_element = find_a_potential_indicated_element(decoded_fragment);