Skip to content

Conversation

mrserb
Copy link
Member

@mrserb mrserb commented Jul 8, 2025

The ICC_Profile class has special logic to postpone actual data loading for as long as possible. To support this we use a lightweight object that stores commonly used metadata such as the number of components that can be accessed without triggering full profile loading. But we currently discard this object once the profile is used for color conversion since the application might modify the profile data in a way that becomes inconsistent with what was previously cached.

After JDK-8346465 all standard ICC profiles bundled with the JDK are now immutable. This means the deferral logic can be simplified: we no longer need to drop the lightweight metadata object since the underlying data is guaranteed to remain unchanged.

This patch includes two changes:

  1. We stop discarding the deferred metadata object. It will now used consistently removing the need for a special flag to identify standard profiles.

  2. While implementing the logic above I noticed a workaround introduced for JDK-8272860 no longer applies. This workaround relied on getNumComponents() triggering header profile loading which no longer happens for standard profiles. Initially(at the moment the JDK-8272860 was filed) this caused test failures but due to unrelated changes all those tests now pass. To ensure this issue is still caught in the future, I’ve added a new test case that specifically verifies this behavior.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8359380: Rework deferral profile logic after JDK-8346465 (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26179/head:pull/26179
$ git checkout pull/26179

Update a local copy of the PR:
$ git checkout pull/26179
$ git pull https://git.openjdk.org/jdk.git pull/26179/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26179

View PR using the GUI difftool:
$ git pr show -t 26179

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26179.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 8, 2025

👋 Welcome back serb! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Jul 8, 2025

@mrserb 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:

8359380: Rework deferral profile logic after JDK-8346465

Reviewed-by: prr

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk
Copy link

openjdk bot commented Jul 8, 2025

@mrserb The following label will be automatically applied to this pull request:

  • client

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.

* @summary Verifies profile properties are the same before/after activation
* @bug 8256321 8359380
* @summary Verifies built-in profile properties are the same before and after
* activation and in copies of built-in profiles
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test compared data from the lightweight object with the actual data used after the profile is fully loaded. Since we now always use the lightweight object, I had to create a copy of the standard profile to make sure the actual profile data is used.

@mrserb mrserb marked this pull request as ready for review July 11, 2025 03:54
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 11, 2025
@mlbridge
Copy link

mlbridge bot commented Jul 11, 2025

Webrevs

@mrserb
Copy link
Member Author

mrserb commented Jul 18, 2025

@honkar-jdk please take a look

Copy link
Contributor

@prrace prrace left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks OK, but I'm waiting for a full test run to complete.

Copy link
Contributor

@prrace prrace left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests pass.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 1, 2025
@mrserb
Copy link
Member Author

mrserb commented Aug 19, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Aug 19, 2025

Going to push as commit 4c80780.
Since your change was applied there have been 7 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 19, 2025
@openjdk openjdk bot closed this Aug 19, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 19, 2025
@openjdk
Copy link

openjdk bot commented Aug 19, 2025

@mrserb Pushed as commit 4c80780.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@mrserb mrserb deleted the JDK-8359380 branch August 19, 2025 16:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client [email protected] integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants