Skip to content

JDK-8322795 CSS performance regression up to 10x #1314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

JDK-8322795 CSS performance regression up to 10x #1314

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions modules/javafx.graphics/src/main/java/javafx/css/SimpleSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ public Set<StyleClass> getStyleClassSet() {
* styleClasses converted to a set of bit masks
*/
private final Set<StyleClass> styleClassSet;
private final Set<StyleClass> unwrappedStyleClassSet;

private final String id;

Expand Down Expand Up @@ -148,19 +149,19 @@ public NodeOrientation getNodeOrientation() {
// then match needs to check name
this.matchOnName = (name != null && !("".equals(name)) && !("*".equals(name)));

Set<StyleClass> scs = new StyleClassSet();
this.unwrappedStyleClassSet = new StyleClassSet();

if (styleClasses != null) {
for (int n = 0; n < styleClasses.size(); n++) {

final String styleClassName = styleClasses.get(n);
if (styleClassName == null || styleClassName.isEmpty()) continue;

scs.add(StyleClassSet.getStyleClass(styleClassName));
unwrappedStyleClassSet.add(StyleClassSet.getStyleClass(styleClassName));
}
}

this.styleClassSet = Collections.unmodifiableSet(scs);
this.styleClassSet = Collections.unmodifiableSet(unwrappedStyleClassSet);
this.matchOnStyleClass = (this.styleClassSet.size() > 0);

PseudoClassState pcs = new PseudoClassState();
Expand Down Expand Up @@ -289,7 +290,8 @@ public NodeOrientation getNodeOrientation() {
// This selector matches when class="pastoral blue aqua marine" but does not
// match for class="pastoral blue".
private boolean matchStyleClasses(StyleClassSet otherStyleClasses) {
return otherStyleClasses.containsAll(styleClassSet);
// checks against unwrapped version so BitSet can do its special casing for performance
return otherStyleClasses.containsAll(unwrappedStyleClassSet);
}

@Override public boolean equals(Object obj) {
Expand Down