Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-07-12 22:12:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

- Universal selectors now return early only when no non-pseudo class, ID, or attribute requirements exist.

Browse Source 
- Added computed-style and direct matcher tests for *.foo, *[href], and plain *.
This commit is contained in:
Martín Lucas Golini
2026-07-10 01:44:16 -03:00
parent 6b4179b896
commit 4150eb2df6
3 changed files with 64 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.agent/plans/eepp_css_selector_optimization_plan.md
View File

@@ -307,6 +307,8 @@ Expected:
# Phase 3: Fix Universal Selector Early Return
**Status: Implemented**
## Motivation
`StyleSheetSelectorRule::matches()` currently returns true early for `*` when `applyPseudo == false`.

8
src/eepp/ui/css/stylesheetselectorrule.cpp
View File

@@ -318,10 +318,12 @@ bool StyleSheetSelectorRule::matches( UIWidget* element, const bool& applyPseudo
flags |= TagName;
}
} else {
if ( !applyPseudo ) {
flags |= TagName;
const Uint32 nonPseudoRequirements =
mRequirementFlags & ~( PseudoClass | StructuralPseudoClass );
if ( !applyPseudo && nonPseudoRequirements == TagName ) {
return true;
} else {
flags |= TagName;
}
}
}

57
src/tests/unit_tests/uihtml_tests.cpp
View File

@@ -2803,6 +2803,63 @@ UTEST( UIHTML, StyleSheetSiblingCombinators ) {
Engine::destroySingleton();
}
UTEST( UIHTML, UniversalSelectorRequirements ) {
Engine::instance()->createWindow( WindowSettings( 1024, 768, "Universal Selector Test",
WindowStyle::Default, WindowBackend::Default,
32, {}, 1, false, true ),
ContextSettings( false, 0, 0, GLv_default, true, false ) );
UISceneNode* sceneNode = init_test_inline_block();
const std::string html = R"html(
<!DOCTYPE html>
<html>
<head>
<style>
*.foo { color: red; }
*[href] { color: green; }
</style>
</head>
<body>
<div id="class-match" class="foo">class match</div>
<div id="class-miss">class miss</div>
<a id="attribute-match" href="x">attribute match</a>
<a id="attribute-miss">attribute miss</a>
</body>
</html>
)html";
sceneNode->loadLayoutFromString( HTMLFormatter::HTMLtoXML( html ) );
sceneNode->update( Seconds( 1 ) );
auto* classMatch = sceneNode->getRoot()->find( "class-match" )->asType<UIRichText>();
auto* classMiss = sceneNode->getRoot()->find( "class-miss" )->asType<UIRichText>();
auto* attributeMatch = sceneNode->getRoot()->find( "attribute-match" )->asType<UITextSpan>();
auto* attributeMiss = sceneNode->getRoot()->find( "attribute-miss" )->asType<UITextSpan>();
ASSERT_TRUE( classMatch != nullptr );
ASSERT_TRUE( classMiss != nullptr );
ASSERT_TRUE( attributeMatch != nullptr );
ASSERT_TRUE( attributeMiss != nullptr );
EXPECT_TRUE( classMatch->getFontColor() == Color::Red );
EXPECT_TRUE( classMiss->getFontColor() != Color::Red );
EXPECT_TRUE( attributeMatch->getFontColor() == Color::Green );
EXPECT_TRUE( attributeMiss->getFontColor() != Color::Green );
StyleSheetSelector universalClass( "*.foo" );
EXPECT_TRUE( universalClass.select( classMatch, false ) );
EXPECT_FALSE( universalClass.select( classMiss, false ) );
StyleSheetSelector universalAttribute( "*[href]" );
EXPECT_TRUE( universalAttribute.select( attributeMatch, false ) );
EXPECT_FALSE( universalAttribute.select( attributeMiss, false ) );
StyleSheetSelector pureUniversal( "*" );
EXPECT_TRUE( pureUniversal.select( classMiss, false ) );
EXPECT_TRUE( pureUniversal.select( attributeMiss, false ) );
Engine::destroySingleton();
}
UTEST( UIHTML, BlockList ) {
Engine::instance()->createWindow( WindowSettings( 1024, 768, "Block List Test",
WindowStyle::Default, WindowBackend::Default,