8237469: Inherited styles don't update when node is moved #87

DeanWookey · 2020-01-17T14:09:54Z

Everything passes with the fix and 5 of the new tests fail without the fix.

removingThenAddingNodeToDifferentBranchGetsNewFontStyleTest
movingBranchToDifferentBranchGetsNewCssVariableTest
removingThenAddingNodeToDifferentBranchGetsCorrectInheritedValue
removingThenAddingNodeToDifferentBranchGetsIneritableStyle
movingNodeToDifferentBranchGetsNewFontStyleTest

I doubt this will cause a significant performance decrease. I think it's worth it for correctness. The only other thing is that I kept the fix to the minimum, but technically canReuseHelper now has a side effect. I could try rewrite some things if necessary, or maybe rename the method? Else leave it as is?

Originally introduced here: https://bugs.openjdk.java.net/browse/JDK-8090462/ 834b0d0#diff-9ec098280fa1aeed53c70243347e76ab

Progress

Change must not contain extraneous whitespace
Commit message must refer to an issue
Change must be properly reviewed

Issue

JDK-8237469: Inherited styles don't update when node is moved

Approvers

David Grieve (dgrieve - Reviewer) Note! Review applies to 782f55e
Ajit Ghaisas (aghaisas - Reviewer)
Kevin Rushforth (kcr - Reviewer)


        8237469: CssStyleHelper reuse check fixed

bridgekeeper · 2020-01-17T14:10:39Z

👋 Welcome back dwookey! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request (refresh this page to view it).


        8237469: Fixed whitespace issues

mlbridge · 2020-01-17T14:18:01Z

Webrevs

kevinrushforth · 2020-01-17T18:40:34Z

I mentioned this in the JBS bug as well: I suspect that JDK-8234877 has the same root cause as this one. Can you run the HelloCSS test program as described in that bug with your patch from this PR and see if it also fixes that bug?

kevinrushforth · 2020-01-17T18:42:34Z

This will need (at least) two reviewers. I request @aghaisas and @dsgrieve to review (I'll review it as well next week, once I'm done with the more urgent reviews).

DeanWookey · 2020-01-18T08:11:58Z

I mentioned this in the JBS bug as well: I suspect that JDK-8234877 has the same root cause as this one. Can you run the HelloCSS test program as described in that bug with your patch from this PR and see if it also fixes that bug?

I ran it and it seems to work. The button is always red in the red pane and always yellow in the yellow one.

modules/javafx.graphics/src/main/java/javafx/scene/CssStyleHelper.java


        8237469: Moved firstStyleableAncestor call to before canReuseStyleHel…

…per can return true

openjdk · 2020-01-22T17:03:58Z

@DeanWookey This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

8237469: Inherited styles don't update when node is moved

Reviewed-by: dgrieve, aghaisas, kcr

If you would like to add a summary, use the /summary command.
To credit additional contributors, use the /contributor command.
To add additional solved issues, use the /solves command.

Since the source branch of this PR was last updated there have been 23 commits pushed to the master branch. Since there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 3c55a7ed4249a7ab22ecc729215dbc535d34b9f7.

As you do not have Committer status in this project, an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@dsgrieve, @aghaisas, @kevinrushforth) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

kevinrushforth · 2020-01-24T15:01:56Z

/reviewers 3

openjdk · 2020-01-24T15:02:17Z

@kevinrushforth
The number of required reviews for this PR is now set to 3 (with at least 1 of role reviewers).

.../javafx.graphics/src/test/java/test/javafx/scene/CssStyleHelperTest.java


        8237469: Removed extra year in copyright header

kevinrushforth · 2020-02-05T00:12:22Z

I updated the PR title to match the JBS title, so that the commit message will be correct when this PR is integrated.

kevinrushforth

This looks good to me. I appreciate all of the added unit tests. I also confirmed that this fixed JDK-8234877, so I will close that one as a duplicate.

This is now ready to integrate. Either Ajit or I can sponsor it.

DeanWookey · 2020-02-06T06:45:30Z

/integrate

openjdk · 2020-02-06T06:50:32Z

@DeanWookey
Your change (at version c7e60b9) is now ready to be sponsored by a Committer.

kevinrushforth · 2020-02-06T13:11:44Z

/sponsor

openjdk · 2020-02-06T13:16:32Z

@kevinrushforth @DeanWookey The following commits have been pushed to master since your change was applied:

3c55a7e: Merge
a4b9f24: 8237503: Update copyright header for files modified in 2020
1749e85: 8237975: Non-embedded Animations do not play backwards after being paused
2ab40c1: 8231513: JavaFX cause Keystroke Receiving prompt on MacOS 10.15 (Catalina)
aa91ebb: 8237944: webview native cl "-m32" unknown option for windows 32-bit build
56267e1: 8237770: Error creating fragment phong shader on iOS
95bf2c0: 8237782: Only read advances up to the minimum of the numHorMetrics or the available font data.
d05e8fc: 8237833: Check glyph size before adding to glyph texture cache
1213ea7: Merge
1823f6e: 8088198: Exception thrown from snapshot if dimensions are larger than max texture size
ca37c1f: 8238249: GetPrimitiveArrayCritical passed with hardcoded FALSE value
b96bc52: 8237003: Remove hardcoded WebAnimationsCSSIntegrationEnabled flag in DumpRenderTree
d303a21: Merge
5a0e71b: 8237372: NullPointerException in TabPaneSkin.stopDrag
79fc0d0: 8232824: Removing TabPane with strong referenced content causes memory leak from weak one
aa6f3a4: 8236912: NullPointerException when clicking in WebView with Button 4 or Button 5
921389f: Merge
da99e24: 8237823: Mark TextTest.testTabSize as unstable
66ac99f: Merge
9ae37f1: 8236753: Animations do not play backwards after being stopped
b2d8564: 8233942: Update to 609.1 version of WebKit
f5ee963: 8157224: isNPOTSupported check is too strict
be22e85: 8237078: [macOS] Media build broken on XCode 11

Your commit was automatically rebased without conflicts.

Pushed as commit 6968e38.

mlbridge · 2020-02-06T13:17:07Z

Mailing list message from Kevin Rushforth on openjfx-dev:

Changeset: 6968e38
Author: Dean Wookey <dwookey at openjdk.org>
Committer: Kevin Rushforth <kcr at openjdk.org>
Date: 2020-02-06 13:16:16 +0000
URL: https://git.openjdk.java.net/jfx/commit/6968e38d

8237469: Inherited styles don't update when node is moved

Reviewed-by: dgrieve, aghaisas, kcr

! modules/javafx.graphics/src/main/java/javafx/scene/CssStyleHelper.java
+ modules/javafx.graphics/src/test/java/test/javafx/scene/CssStyleHelperTest.java

8237469: CssStyleHelper reuse check fixed

Loading status checks…

4e69640

8237469: Fixed whitespace issues

Loading status checks…

0749dde

openjdk bot added the rfr label Jan 17, 2020

kevinrushforth assigned DeanWookey Jan 17, 2020

kevinrushforth self-requested a review Jan 17, 2020

dsgrieve suggested changes Jan 22, 2020

View changes

modules/javafx.graphics/src/main/java/javafx/scene/CssStyleHelper.java Show resolved Hide resolved

8237469: Moved firstStyleableAncestor call to before canReuseStyleHel…

Loading status checks…

782f55e

…per can return true

dsgrieve approved these changes Jan 22, 2020

View changes

openjdk bot removed the rfr label Jan 22, 2020

openjdk bot added ready rfr labels Jan 22, 2020

openjdk bot removed the ready label Jan 24, 2020

aghaisas reviewed Jan 28, 2020

View changes

.../javafx.graphics/src/test/java/test/javafx/scene/CssStyleHelperTest.java Outdated Show resolved Hide resolved

8237469: Removed extra year in copyright header

Loading status checks…

c7e60b9

aghaisas approved these changes Jan 28, 2020

View changes

kevinrushforth changed the title ~~8237469: CssStyleHelper reuse check fixed~~ 8237469: Inherited styles don't update when node is moved Feb 5, 2020

kevinrushforth approved these changes Feb 5, 2020

View changes

openjdk bot added the ready label Feb 5, 2020

openjdk bot added the sponsor label Feb 6, 2020

openjdk bot closed this Feb 6, 2020

openjdk bot added integrated and removed sponsor ready rfr labels Feb 6, 2020

openjdk / jfx

8237469: Inherited styles don't update when node is moved #87

8237469: Inherited styles don't update when node is moved #87

DeanWookey commented Jan 17, 2020 •

edited by openjdk bot

bridgekeeper bot commented Jan 17, 2020

mlbridge bot commented Jan 17, 2020 •

edited

kevinrushforth commented Jan 17, 2020

kevinrushforth commented Jan 17, 2020

DeanWookey commented Jan 18, 2020

openjdk bot commented Jan 22, 2020 •

edited

kevinrushforth commented Jan 24, 2020

openjdk bot commented Jan 24, 2020

kevinrushforth commented Feb 5, 2020

kevinrushforth left a comment

DeanWookey commented Feb 6, 2020

openjdk bot commented Feb 6, 2020

kevinrushforth commented Feb 6, 2020

openjdk bot commented Feb 6, 2020

mlbridge bot commented Feb 6, 2020

openjdk / jfx

Join GitHub today

8237469: Inherited styles don't update when node is moved #87

8237469: Inherited styles don't update when node is moved #87

Conversation

DeanWookey commented Jan 17, 2020 • edited by openjdk bot

Progress

Issue

Approvers

bridgekeeper bot commented Jan 17, 2020

mlbridge bot commented Jan 17, 2020 • edited

Webrevs

kevinrushforth commented Jan 17, 2020

kevinrushforth commented Jan 17, 2020

DeanWookey commented Jan 18, 2020

openjdk bot commented Jan 22, 2020 • edited

kevinrushforth commented Jan 24, 2020

openjdk bot commented Jan 24, 2020

kevinrushforth commented Feb 5, 2020

kevinrushforth left a comment

DeanWookey commented Feb 6, 2020

openjdk bot commented Feb 6, 2020

kevinrushforth commented Feb 6, 2020

openjdk bot commented Feb 6, 2020

mlbridge bot commented Feb 6, 2020

DeanWookey commented Jan 17, 2020 •

edited by openjdk bot

mlbridge bot commented Jan 17, 2020 •

edited

openjdk bot commented Jan 22, 2020 •

edited