Repository navigation
Commit e516485
authored
[web] Honor requested upscaling in instantiateImageCodecWithSize and ImageDescriptor.instantiateCodec (flutter#195836)
On the web, `instantiateImageCodecWithSize` and
`ImageDescriptor.instantiateCodec` (encoded path) forwarded to the codec
with a hardcoded `allowUpscaling: false`. Any requested target size
larger than the intrinsic size was silently clamped back down, so
`ResizeImage(allowUpscaling: true)` could never upscale on web.
This PR removes the hardcoded flag so both entry points decode to the
size the caller asked for, matching native `dart:ui`. The upscaling
policy already lives in the framework: `ResizeImage`'s `getTargetSize`
clamps to the intrinsic size when its own `allowUpscaling` is `false`,
so that case behaves exactly as before.
Changes:
- `engine/src/flutter/lib/web_ui/lib/painting.dart`: drop
`allowUpscaling: false` in `instantiateImageCodecWithSize` and in the
encoded branch of `ImageDescriptor.instantiateCodec`. Every callee
defaults to `allowUpscaling: true`, so this enables upscaling uniformly
across the `ImageDecoder`, `createImageBitmap`, and Skia fallback paths.
- `engine/src/flutter/lib/web_ui/test/ui/image_test.dart`: new tests
that decode a 10x10 image to larger sizes through both entry points,
including non-square, mixed up/down, and width-only (aspect-preserving)
targets. The existing `Image.onCreate`/`onDispose` hook resets now use
`addTearDown`, so a failing assertion can't leak hooks into later tests.
-
`packages/flutter/test/painting/image_provider_resize_image_test.dart`:
remove `skip: isBrowser` from `group('resizing')`. Its 43 tests now run
on web and pass on CanvasKit and Skwasm.
Fixes flutter#195193
## Where to focus
- **Key decision: honor the caller's size instead of adding a web-only
knob.** The public `dart:ui` signatures are unchanged. The web engine
now trusts the target size it is given, as native does, rather than
applying a second, stricter upscaling policy underneath the framework's.
- **Non-obvious: the argument is removed, not set to `true`.** `true` is
already the default at every hop (`engineInstantiateImageCodec` →
browser/static/Skia codecs → `scaleImageIfNeeded`), and writing it
explicitly trips `avoid_redundant_argument_values`.
- **Non-obvious: the old clamp wasn't applied evenly.** The Skwasm Skia
fallback already resized natively and ignored the flag. After this
change, every decode path behaves the same.
- **Primary review file:**
`engine/src/flutter/lib/web_ui/lib/painting.dart` (two call sites). Then
`engine/src/flutter/lib/web_ui/test/ui/image_test.dart`.
## Pre-launch Checklist
- [x] I read the [Contributor Guide] and followed the process outlined
there for submitting PRs.
- [x] I read the [AI contribution guidelines] and understand my
responsibilities, or I am not using AI tools.
- [x] I read the [Tree Hygiene] wiki page, which explains my
responsibilities.
- [x] I read and followed the [Flutter Style Guide], including [Features
we expect every widget to implement].
- [x] I signed the [CLA].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I updated/added relevant in-code documentation (doc comments with
`///`).
- [x] If this PR introduces a new feature or capability, I created and
linked a website documentation issue or PR in [flutter/website] (or
verified none is needed).
- [x] I added new tests to check the change I am making, or this PR is
[test-exempt].
- [x] I followed the [breaking change policy] and added [Data Driven
Fixes] where supported.
- [x] All existing and new tests are passing.
If you need help, consider asking for advice on the #hackers-new channel
on [Discord].
If this change needs to override an active code freeze, provide a
comment explaining why. The code freeze workflow can be overridden by
code reviewers. See pinned issues for any active code freezes with
guidance.
**Note**: The Flutter team is currently trialing the use of [Gemini Code
Assist for
GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code).
Comments from the `gemini-code-assist` bot should not be taken as
authoritative feedback from the Flutter team. If you find its comments
useful you can update your code accordingly, but if you are unsure or
disagree with the feedback, please feel free to wait for a Flutter team
member's review for guidance on which automated comments should be
addressed.
<!-- Links -->
[Contributor Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
[AI contribution guidelines]:
https://github.com/flutter/flutter/blob/main/CONTRIBUTING.ai.md
[Tree Hygiene]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md
[test-exempt]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests
[Flutter Style Guide]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md
[Features we expect every widget to implement]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement
[CLA]: https://cla.developers.google.com/
[flutter/tests]: https://github.com/flutter/tests
[flutter/website]: https://github.com/flutter/website
[breaking change policy]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes
[Discord]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
[Data Driven Fixes]:
https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md1 parent 3fe98af commit e516485
3 files changed
Lines changed: 95 additions & 12 deletions
File tree
- engine/src/flutter/lib/web_ui
- lib
- test/ui
- packages/flutter/test/painting
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
763 | 763 | | |
764 | 764 | | |
765 | 765 | | |
766 | | - | |
767 | 766 | | |
768 | 767 | | |
769 | 768 | | |
| |||
1081 | 1080 | | |
1082 | 1081 | | |
1083 | 1082 | | |
1084 | | - | |
1085 | | - | |
1086 | | - | |
1087 | | - | |
1088 | | - | |
1089 | | - | |
| 1083 | + | |
1090 | 1084 | | |
1091 | 1085 | | |
1092 | 1086 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| 23 | + | |
23 | 24 | | |
24 | 25 | | |
25 | 26 | | |
| |||
34 | 35 | | |
35 | 36 | | |
36 | 37 | | |
37 | | - | |
38 | | - | |
39 | 38 | | |
40 | 39 | | |
41 | 40 | | |
42 | 41 | | |
43 | 42 | | |
| 43 | + | |
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
60 | | - | |
61 | | - | |
62 | 60 | | |
63 | 61 | | |
64 | 62 | | |
| |||
123 | 121 | | |
124 | 122 | | |
125 | 123 | | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
126 | 128 | | |
127 | 129 | | |
128 | 130 | | |
| |||
146 | 148 | | |
147 | 149 | | |
148 | 150 | | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
149 | 238 | | |
150 | 239 | | |
151 | 240 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
619 | 619 | | |
620 | 620 | | |
621 | 621 | | |
622 | | - | |
| 622 | + | |
623 | 623 | | |
624 | 624 | | |
625 | 625 | | |
| |||
0 commit comments