214707 2020-07-23 15:45:05 -0700 Remove definition of NSImageSymbolScale, which is part of the beta 3 SDK 2020-07-27 13:11:38 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=214844 InRadar P2 Normal --- 1 saagar webkit-unassigned ap jbedard thorton webkit-bug-importer oldest_to_newest 1674425 0 saagar 2020-07-23 15:45:05 -0700 Remove definition of NSImageSymbolScale, which is part of the beta 3 SDK 1674453 1 jbedard 2020-07-23 16:28:57 -0700 I'll take a look at this tomorrow. Hadn't tried building with the Seed 3 SDK yet, so there may be more issues like this. 1674455 2 saagar 2020-07-23 16:30:33 -0700 Sure. I have a patch ready (as the bug title might suggest) but webkit-patch is failing halfway through on my computer, so I got stuck with just the bug report :( 1674505 3 405109 saagar 2020-07-23 18:03:27 -0700 Created attachment 405109 Patch 1674631 4 jbedard 2020-07-24 07:27:21 -0700 My only question is do we care about keeping the Seed 1 build working. I think the answer is "no", but I also know we're about to bring up Seed 3 EWS builders, which isn't something we usually do. 1674693 5 ap 2020-07-24 09:30:38 -0700 We do not care about building against old seed SDKs. 1674701 6 405109 ap 2020-07-24 09:36:33 -0700 Comment on attachment 405109 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405109&action=review But also, we should probably add preprocessor checks in this file, as nothing here says that this is new with Big Sur. Looks like using these is guarded by HAVE(ALTERNATE_ICONS). > Source/WebCore/PAL/pal/spi/mac/NSImageSPI.h:39 > extern const NSImageHintKey NSImageHintSymbolFont; > extern const NSImageHintKey NSImageHintSymbolScale; Are these still not part of SDK, even though NSImageSymbolScale is? > Source/WebCore/PAL/pal/spi/mac/NSImageSPI.h:42 > - (void)lockFocusWithRect:(NSRect)rect context:(nullable NSGraphicsContext *)context hints:(nullable NSDictionary *)hints flipped:(BOOL)flipped; Not seeing an underscore makes me wonder if this is SDK too. 1674704 7 saagar 2020-07-24 09:41:16 -0700 I'm not seeing either in my SDK, it's just NSImageSymbolScale that seems to have been added. Did you want me to wrap the new stuff from Big Sur in HAVE(ALTERNATE_ICONS)? 1674711 8 ap 2020-07-24 09:48:18 -0700 I think that it does need to be wrapped, but also we need a better name for the macro. Not sure if it's best for you to just wrap declarations in this header, or for someone from Apple to make the bigger change. 1675357 9 405109 jbedard 2020-07-27 12:57:14 -0700 Comment on attachment 405109 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=405109&action=review >> Source/WebCore/PAL/pal/spi/mac/NSImageSPI.h:39 >> extern const NSImageHintKey NSImageHintSymbolScale; > > Are these still not part of SDK, even though NSImageSymbolScale is? Verified that these are not part of the SDK. >> Source/WebCore/PAL/pal/spi/mac/NSImageSPI.h:42 >> - (void)lockFocusWithRect:(NSRect)rect context:(nullable NSGraphicsContext *)context hints:(nullable NSDictionary *)hints flipped:(BOOL)flipped; > > Not seeing an underscore makes me wonder if this is SDK too. That actually pre-dates Big Sur. And yes, it's still required. 1675362 10 jbedard 2020-07-27 13:03:50 -0700 (In reply to Alexey Proskuryakov from comment #8) > I think that it does need to be wrapped, but also we need a better name for > the macro. Not sure if it's best for you to just wrap declarations in this > header, or for someone from Apple to make the bigger change. We can do the wrapping, will open a different bug for it. But it doesn't seem like we actually need to. 1675367 11 ews-feeder 2020-07-27 13:07:02 -0700 Committed r264939: <https://trac.webkit.org/changeset/264939> All reviewed patches have been landed. Closing bug and clearing flags on attachment 405109. 1675369 12 webkit-bug-importer 2020-07-27 13:07:26 -0700 <rdar://problem/66178015> 1675372 13 ap 2020-07-27 13:11:38 -0700 > We can do the wrapping, will open a different bug for it. But it doesn't > seem like we actually need to. This is necessary for EWS to produce a compile time error if one attempts to use SPIs on an OS version that didn't have them. 405109 2020-07-23 18:03:27 -0700 2020-07-27 13:07:02 -0700 Patch bug-214707-20200723180327.patch text/plain 1492 saagar U3VidmVyc2lvbiBSZXZpc2lvbjogMjY0ODA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Q QUwvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZwppbmRleCBmMmQxOTgx YTgxYzMzYjE5YWQ0MzlhNjUxM2YwMzQ5ZTczYzI3YTE0Li5iNzM2ZmQwZGNhZWYyZjlkODAyYzZl OWUyNTEzMjU1ZDk0NDMyOGM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor MjAyMC0wNy0yMyAgU2FhZ2FyIEpoYSAgPHNhYWdhckBzYWFnYXJqaGEuY29tPgorCisgICAgICAg IFJlbW92ZSBkZWZpbml0aW9uIG9mIE5TSW1hZ2VTeW1ib2xTY2FsZSwgd2hpY2ggaXMgcGFydCBv ZiB0aGUgYmV0YSAzIFNESworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjE0NzA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBwYWwvc3BpL21hYy9OU0ltYWdlU1BJLmg6IFJlbW92ZSBOU0ltYWdlU3ltYm9s U2NhbGUuCisKIDIwMjAtMDctMjIgIENvbnJhZCBTaHVsdHogIDxjb25yYWRfc2h1bHR6QGFwcGxl LmNvbT4KIAogICAgICAgICBVcGRhdGUgbWFjT1MgVmVyc2lvbiBtYWNyb3MKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL21hYy9OU0ltYWdlU1BJLmggYi9Tb3VyY2UvV2Vi Q29yZS9QQUwvcGFsL3NwaS9tYWMvTlNJbWFnZVNQSS5oCmluZGV4IDcxNGMyMGFhYTk5ZDdhMTQy MzA4OWIwZjgxMTE0OWU5ZmJkZGM2NTIuLjgxNjA4NWFmZjAyMjJmOTczNjY3ZDhhOWJmYzA0M2Zi Y2JkZDI1MTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL21hYy9OU0lt YWdlU1BJLmgKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvbWFjL05TSW1hZ2VTUEku aApAQCAtMzgsMTMgKzM4LDYgQEAgTlNfQVNTVU1FX05PTk5VTExfQkVHSU4KIGV4dGVybiBjb25z dCBOU0ltYWdlSGludEtleSBOU0ltYWdlSGludFN5bWJvbEZvbnQ7CiBleHRlcm4gY29uc3QgTlNJ bWFnZUhpbnRLZXkgTlNJbWFnZUhpbnRTeW1ib2xTY2FsZTsKIAotdHlwZWRlZiBOU19FTlVNKE5T SW50ZWdlciwgTlNJbWFnZVN5bWJvbFNjYWxlKSB7Ci0gICAgTlNJbWFnZVN5bWJvbFNjYWxlRGVm YXVsdCA9IC0xLAotICAgIE5TSW1hZ2VTeW1ib2xTY2FsZVNtYWxsID0gMSwKLSAgICBOU0ltYWdl U3ltYm9sU2NhbGVNZWRpdW0gPSAyLAotICAgIE5TSW1hZ2VTeW1ib2xTY2FsZUxhcmdlID0gMywK LX07Ci0KIEBpbnRlcmZhY2UgTlNJbWFnZSAoKQogLSAodm9pZClsb2NrRm9jdXNXaXRoUmVjdDoo TlNSZWN0KXJlY3QgY29udGV4dDoobnVsbGFibGUgTlNHcmFwaGljc0NvbnRleHQgKiljb250ZXh0 IGhpbnRzOihudWxsYWJsZSBOU0RpY3Rpb25hcnkgKiloaW50cyBmbGlwcGVkOihCT09MKWZsaXBw ZWQ7CiBAZW5kCg==