On Sun, 15 Mar 2026 21:11:55 GMT, Marius Hanl <[email protected]> wrote:
>> Michael Strauß has updated the pull request with a new target base due to a
>> merge or a rebase. The pull request now contains eight commits:
>>
>> - Merge branch 'master' into feature/conditional-import
>>
>> # Conflicts:
>> # modules/javafx.graphics/src/main/java/javafx/css/CssParser.java
>> - javadoc change
>> - javadoc change
>> - specify capacity of MediaQueryList
>> - javadoc change
>> - Merge branch 'master' into feature/conditional-import
>> - Merge branch 'master' into feature/conditional-import
>> - Conditional stylesheet imports
>
> modules/javafx.graphics/src/main/java/javafx/css/Stylesheet.java line 315:
>
>> 313: private void readBinaryImports(int bssVersion, DataInputStream is,
>> String[] strings) throws IOException {
>> 314: for (int i = 0, max = is.readInt(); i < max; i++) {
>> 315: int queryCount = is.readInt();
>
> This can be replaced by:
>
> var importConditions = MediaQueryList.readBinary(is, strings);
>
> Is the same code as far as I can see.
Replaced this and `MediaQueryList.writeBinary()`.
> modules/javafx.graphics/src/main/java/javafx/css/Stylesheet.java line 327:
>
>> 325: stylesheet.readBinary(bssVersion, is, strings);
>> 326: addStylesheetImport(new StylesheetImport(stylesheet,
>> importConditions));
>> 327: } else if (is.skip(stylesheetSizeInBytes) !=
>> stylesheetSizeInBytes) {
>
> The javadoc here states:
> `
> The skip method may, for a variety of reasons, end up skipping over some
> smaller number of bytes, possibly 0. The actual number of bytes skipped is
> returned.
> `
> Can that be a problem here (Never used BSS, so I'm not sure)
I've replaced it with `skinNBytes()`.
-------------
PR Review Comment: https://git.openjdk.org/jfx/pull/2031#discussion_r2937391964
PR Review Comment: https://git.openjdk.org/jfx/pull/2031#discussion_r2937391226
