-
Notifications
You must be signed in to change notification settings - Fork 6.2k
JDK-8357082 : Stabilize and add debug logs to CopyAreaOOB.java #25279
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.
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
Conversation
👋 Welcome back honkar! A progress list of the required criteria for merging this PR into |
@honkar-jdk This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 324 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
@honkar-jdk The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
|
||
// copy the region such that part of it goes below the bottom of the | ||
// destination surface | ||
g2d.copyArea(0, 10, 50, h-10, 60, 10); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new version looks like a different test, previously we copyArea from the paint method for the awt frame, then call sync to flush all rendering, then check the rendering on screen, and all of that on "each render frame".
Now it will draw everything in paint then sometime later(or even after a few repaints) we check the actual rendering(waitForIdle/delay(100))....
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added back Toolkit.sync() and canvas capture to paint method. Although I'm not sure if I understood "each render frame" correctly. Can you please explain?
BufferedImage capture = null;
try {
Thread.sleep(500);
if (robot == null) robot = new Robot();
Point pt1 = getLocationOnScreen();
Rectangle rect = new Rectangle(pt1.x, pt1.y, 400, 400);
capture = robot.createScreenCapture(rect);
} catch (Exception e) {
throw new RuntimeException("Problems handling Robot");
}
// Test pixels
testRegion(capture, "green", 0, 0, 400, 10, 0xff00ff00);
testRegion(capture, "original red", 0, 10, 50, 400, 0xffff0000);
testRegion(capture, "background", 50, 10, 60, 400, 0xff000000);
testRegion(capture, "in-between", 60, 10, 110, 20, 0xff000000);
testRegion(capture, "copied red", 60, 20, 110, 400, 0xffff0000);
testRegion(capture, "background", 110, 10, 400, 400, 0xff000000);
Isn't capture going to be the same image throughout? I'm not sure why it is passed as an extra argument to testRegion. It can be saved once as static BufferedImage var and the same can be used for testing or am I missing something?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added back Toolkit.sync() and canvas capture to paint method. Although I'm not sure if I understood "each render frame" correctly. Can you please explain?
The paint method may be invoked multiple times after the frame becomes visible, so the validation logic inside paint will be executed for each rendering data.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh okay, although when I debug I don't see paint method being called multiple times. Probably the case when frame is resized or screen configuration changes?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, and validation of each frame will confirm no garbage on the screen.
@mrserb @aivanov-jdk Can you please re-review when you get a chance? |
/integrate |
Going to push as commit e490b4f.
Your commit was automatically rebased without conflicts. |
@honkar-jdk Pushed as commit e490b4f. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
CopyAreaOOB.java was failing intermittently on some platforms on CI but recently it started to fail more frequently on macos-aarch64 when the entire test suite runs.
Test failure is not reproducible when the test is run individually (multiple times) on CI.
Rewritten the test and added debug logs that will be helpful to figure out the issue.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/25279/head:pull/25279
$ git checkout pull/25279
Update a local copy of the PR:
$ git checkout pull/25279
$ git pull https://git.openjdk.org/jdk.git pull/25279/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 25279
View PR using the GUI difftool:
$ git pr show -t 25279
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/25279.diff
Using Webrev
Link to Webrev Comment