Skip to content

Commit

Permalink
LibWeb/HTML: Update get_an_elements_noopener() to current spec
Browse files Browse the repository at this point in the history
Note that this preemptively includes this fix to step 3:
whatwg/html#10962
  • Loading branch information
AtkinsSJ committed Jan 31, 2025
1 parent 50dc454 commit bdf6bde
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 11 deletions.
4 changes: 2 additions & 2 deletions Libraries/LibWeb/HTML/HTMLAnchorElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ class HTMLAnchorElement final
{
return get_an_elements_target(target);
}
virtual TokenizedFeature::NoOpener hyperlink_element_utils_get_an_elements_noopener(StringView target) const override
virtual TokenizedFeature::NoOpener hyperlink_element_utils_get_an_elements_noopener(URL::URL const& url, StringView target) const override
{
return get_an_elements_noopener(target);
return get_an_elements_noopener(url, target);
}

virtual Optional<ARIA::Role> default_role() const override;
Expand Down
4 changes: 2 additions & 2 deletions Libraries/LibWeb/HTML/HTMLAreaElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ class HTMLAreaElement final
{
return get_an_elements_target(target);
}
virtual TokenizedFeature::NoOpener hyperlink_element_utils_get_an_elements_noopener(StringView target) const override
virtual TokenizedFeature::NoOpener hyperlink_element_utils_get_an_elements_noopener(URL::URL const& url, StringView target) const override
{
return get_an_elements_noopener(target);
return get_an_elements_noopener(url, target);
}

virtual Optional<ARIA::Role> default_role() const override;
Expand Down
20 changes: 17 additions & 3 deletions Libraries/LibWeb/HTML/HTMLElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -930,9 +930,10 @@ String HTMLElement::get_an_elements_target(Optional<String> target) const
}

// https://html.spec.whatwg.org/multipage/links.html#get-an-element's-noopener
TokenizedFeature::NoOpener HTMLElement::get_an_elements_noopener(StringView target) const
TokenizedFeature::NoOpener HTMLElement::get_an_elements_noopener(URL::URL const& url, StringView target) const
{
// To get an element's noopener, given an a, area, or form element element and a string target:
// To get an element's noopener, given an a, area, or form element element, a URL record url, and a string target,
// perform the following steps. They return a boolean.
auto rel = MUST(get_attribute_value(HTML::AttributeNames::rel).to_lowercase());
auto link_types = rel.bytes_as_string_view().split_view_if(Infra::is_ascii_whitespace);

Expand All @@ -945,7 +946,20 @@ TokenizedFeature::NoOpener HTMLElement::get_an_elements_noopener(StringView targ
if (!link_types.contains_slow("opener"sv) && Infra::is_ascii_case_insensitive_match(target, "_blank"sv))
return TokenizedFeature::NoOpener::Yes;

// 3. Return false.
// 3. If url's blob URL entry is not null:
if (url.blob_url_entry().has_value()) {
// 1. Let blobOrigin be url's blob URL entry's environment's origin.
auto const& blob_origin = url.blob_url_entry()->environment.origin;

// 2. Let topLevelOrigin be element's relevant settings object's top-level origin.
auto const& top_level_origin = relevant_settings_object(*this).top_level_origin;

// 3. If blobOrigin is not same site with topLevelOrigin, then return true.
if (!blob_origin.is_same_site(top_level_origin))
return TokenizedFeature::NoOpener::Yes;
}

// 4. Return false.
return TokenizedFeature::NoOpener::No;
}

Expand Down
2 changes: 1 addition & 1 deletion Libraries/LibWeb/HTML/HTMLElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ class HTMLElement
virtual Optional<ARIA::Role> default_role() const override;

String get_an_elements_target(Optional<String> target = {}) const;
TokenizedFeature::NoOpener get_an_elements_noopener(StringView target) const;
TokenizedFeature::NoOpener get_an_elements_noopener(URL::URL const& url, StringView target) const;

WebIDL::ExceptionOr<GC::Ref<ElementInternals>> attach_internals();

Expand Down
2 changes: 1 addition & 1 deletion Libraries/LibWeb/HTML/HTMLFormElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ WebIDL::ExceptionOr<void> HTMLFormElement::submit_form(GC::Ref<HTMLElement> subm
auto target = get_an_elements_target(form_target);

// 21. Let noopener be the result of getting an element's noopener with form, parsed action, and target.
auto no_opener = get_an_elements_noopener(target);
auto no_opener = get_an_elements_noopener(*parsed_action, target);

// 22. Let targetNavigable be the first return value of applying the rules for choosing a navigable given target,
// form's node navigable, and noopener.
Expand Down
2 changes: 1 addition & 1 deletion Libraries/LibWeb/HTML/HTMLHyperlinkElementUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ void HTMLHyperlinkElementUtils::follow_the_hyperlink(Optional<String> hyperlink_
return;

// 6. Let noopener be the result of getting an element's noopener with subject, urlRecord, and targetAttributeValue.
auto noopener = hyperlink_element_utils_get_an_elements_noopener(target_attribute_value);
auto noopener = hyperlink_element_utils_get_an_elements_noopener(*url_record, target_attribute_value);

// 7. Let targetNavigable be the first return value of applying the rules for choosing a navigable given
// targetAttributeValue, subject's node navigable, and noopener.
Expand Down
2 changes: 1 addition & 1 deletion Libraries/LibWeb/HTML/HTMLHyperlinkElementUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class HTMLHyperlinkElementUtils {
virtual bool hyperlink_element_utils_is_html_anchor_element() const = 0;
virtual bool hyperlink_element_utils_is_connected() const = 0;
virtual String hyperlink_element_utils_get_an_elements_target(Optional<String> target = {}) const = 0;
virtual TokenizedFeature::NoOpener hyperlink_element_utils_get_an_elements_noopener(StringView target) const = 0;
virtual TokenizedFeature::NoOpener hyperlink_element_utils_get_an_elements_noopener(URL::URL const& url, StringView target) const = 0;

virtual void hyperlink_element_utils_queue_an_element_task(HTML::Task::Source source, Function<void()> steps) = 0;

Expand Down

0 comments on commit bdf6bde

Please sign in to comment.