Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1914062 - implement updates to dir=auto traversal rules, r=emilio

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D222352
This commit is contained in:
Olli Pettay 2024-09-16 22:07:47 +00:00
parent f4af096a51
commit 42b0342fff
3 changed files with 16 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dom/base/DirectionalityUtils.cpp
View File

@ -214,10 +214,17 @@ static Directionality GetDirectionFromText(const Text* aTextNode,
}
/**
* Compute auto direction aRoot should have based on descendants
* https://html.spec.whatwg.org/#auto-directionality step 3
* Compute auto direction for aRoot. If aCanExcludeRoot is true and aRoot
* establishes its own directionality, return early.
* https://html.spec.whatwg.org/#contained-text-auto-directionality
*/
Directionality WalkDescendantsAndGetDirectionFromText(nsINode* aRoot) {
Directionality ContainedTextAutoDirectionality(nsINode* aRoot,
bool aCanExcludeRoot) {
MOZ_ASSERT_IF(aCanExcludeRoot, aRoot->IsElement());
if (aCanExcludeRoot && EstablishesOwnDirection(aRoot->AsElement())) {
return Directionality::Unset;
}
nsIContent* child = aRoot->GetFirstChild();
while (child) {
if (child->IsElement() && EstablishesOwnDirection(child->AsElement())) {
@ -225,7 +232,7 @@ Directionality WalkDescendantsAndGetDirectionFromText(nsINode* aRoot) {
continue;
}
// Step 3.2. If descendant is a slot element whose root is a shadow root,
// Step 1.2. If descendant is a slot element whose root is a shadow root,
// then return the directionality of that shadow root's host.
if (auto* slot = HTMLSlotElement::FromNode(child)) {
if (const ShadowRoot* sr = slot->GetContainingShadow()) {
@ -235,8 +242,8 @@ Directionality WalkDescendantsAndGetDirectionFromText(nsINode* aRoot) {
}
}
// Step 3.3-5. If descendant is a Text node, return its
// text node directionality if it is not null
// Step 1.3-5. If descendant is a Text node, return its
// text node directionality.
if (auto* text = Text::FromNode(child)) {
Directionality textNodeDir = GetDirectionFromText(text);
if (textNodeDir != Directionality::Unset) {
@ -276,22 +283,8 @@ Directionality ComputeAutoDirectionFromAssignedNodes(
Element* assignedElement = Element::FromNode(assignedNode);
MOZ_ASSERT(assignedElement);
// Step 2.1.3.2. Set childDirection to the auto directionality of child.
// Need to perform parts of the auto directionality algorithm here, as
// ComputeAutoDirectionality does not implement the whole algorithm.
if (Maybe<nsAutoString> maybe =
GetValueIfFormAssociatedElement(assignedElement)) {
const nsAutoString& value = maybe.value();
childDirection =
GetDirectionFromText(value.BeginReading(), value.Length());
if (childDirection == Directionality::Unset && !value.IsEmpty()) {
childDirection = Directionality::Ltr;
}
}
// Now recursively call into the remainder of auto directionality.
if (ParticipatesInAutoDirection(assignedElement)) {
childDirection = ComputeAutoDirectionality(assignedElement, aNotify);
}
// Step 2.1.3.2.
childDirection = ContainedTextAutoDirectionality(assignedElement, true);
}
// Step 2.1.4. If childDirection is not null, then return childDirection.
@ -329,7 +322,7 @@ static Directionality ComputeAutoDirectionality(Element* aElement,
}
// Step 3. find first text or slot that determines the direction
Directionality nodeDir = WalkDescendantsAndGetDirectionFromText(aElement);
Directionality nodeDir = ContainedTextAutoDirectionality(aElement, false);
if (nodeDir != Directionality::Unset) {
return nodeDir;
}

3
testing/web-platform/meta/html/dom/elements/global-attributes/dir-auto-dynamic-changes.window.js.ini
View File

@ -1,3 +0,0 @@
[dir-auto-dynamic-changes.window.html]
[dir=auto slot is not affected by text in value of input element children]
expected: FAIL

12
testing/web-platform/meta/html/dom/elements/global-attributes/dir-slots-directionality.html.ini
View File

@ -1,12 +0,0 @@
[dir-slots-directionality.html]
[dir=auto slot ignores assigned nodes with dir attribute]
expected: FAIL
[dir=auto slot ignores text in bdi assigned nodes]
expected: FAIL
[dir=auto slot ignores text in value of input element children]
expected: FAIL
[dir=auto slot is not affected by value of auto-directionality form associated elements]
expected: FAIL