213608 2020-06-25 09:02:39 -0700 Upstream macOS 11 additions to RenderThemeMac.mm and ThemeMac.mm 2020-06-25 10:39:49 -0700 1 1 1 Unclassified WebKit Forms WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh aestes bdakin cdumez changseok darin esprehn+autocc ews-watchlist glenn gyuyoung.kim kondapallykalyan macpherson megan_gardner menard pdr thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1666059 0 wenson_hsieh 2020-06-25 09:02:39 -0700 <rdar://problem/64758299> 1666061 1 402740 wenson_hsieh 2020-06-25 09:18:10 -0700 Created attachment 402740 Patch 1666064 2 402740 darin 2020-06-25 09:23:28 -0700 Comment on attachment 402740 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402740&action=review > Source/WebCore/platform/mac/ThemeMac.mm:994 > + static bool hasSupport = false; > + static dispatch_once_t onceToken; > + dispatch_once(&onceToken, ^{ > + hasSupport = [[NSAppearance currentAppearance] _usesMetricsAppearance]; > + }); > + return hasSupport; Overkill to use dispatch_once here; this is not called concurrently on multiple threads. Should just be: static bool hasSupport = [[NSAppearance currentAppearance] _usesMetricsAppearance]; > Source/WebCore/rendering/RenderThemeMac.mm:2738 > + auto image = retainPtr([NSImage _imageWithSystemSymbolName:@"arrow.down.circle"]); No need for this retainPtr; this is autoreleased and should work fine with a raw pointer. > Source/WebCore/rendering/RenderThemeMac.mm:2743 > + auto cgImage = retainPtr([image CGImageForProposedRect:&imageRect context:nil hints:@{ Ditto. 1666077 3 402740 wenson_hsieh 2020-06-25 10:13:16 -0700 Comment on attachment 402740 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402740&action=review Thanks for the review! >> Source/WebCore/platform/mac/ThemeMac.mm:994 >> + return hasSupport; > > Overkill to use dispatch_once here; this is not called concurrently on multiple threads. Should just be: > > static bool hasSupport = [[NSAppearance currentAppearance] _usesMetricsAppearance]; Sounds good — removed the dispatch_once. >> Source/WebCore/rendering/RenderThemeMac.mm:2738 >> + auto image = retainPtr([NSImage _imageWithSystemSymbolName:@"arrow.down.circle"]); > > No need for this retainPtr; this is autoreleased and should work fine with a raw pointer. Fixed. >> Source/WebCore/rendering/RenderThemeMac.mm:2743 >> + auto cgImage = retainPtr([image CGImageForProposedRect:&imageRect context:nil hints:@{ > > Ditto. Fixed. 1666078 4 402742 wenson_hsieh 2020-06-25 10:13:52 -0700 Created attachment 402742 Patch for landing 1666086 5 ews-feeder 2020-06-25 10:39:48 -0700 Committed r263519: <https://trac.webkit.org/changeset/263519> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402742. 402740 2020-06-25 09:18:10 -0700 2020-06-25 09:23:28 -0700 Patch bug-213608-20200625091809.patch text/plain 6756 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTZjMWExYjljNzQ2NzVj YjU1ZDVjOGU1ZDg5NmM3N2Y0NjU5NzZhNS4uOGFmYzNkNTlhNzY0NmY2NzJlMWRiOThlMDk0YmM4 ZWVjOWYxODNjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA2LTI1ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFVwc3RyZWFtIG1h Y09TIDExIGFkZGl0aW9ucyB0byBSZW5kZXJUaGVtZU1hYy5tbSBhbmQgVGhlbWVNYWMubW0KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzYwOAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNjQ3NTgyOTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBXZWJLaXRBZGRpdGlvbnMgaW1wb3J0cyB3 aXRoIHRoZSBpbXBvcnRlZCBjb2RlLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAg KiBjc3MvaHRtbC5jc3M6CisgICAgICAgIChpbnB1dDo6LXdlYmtpdC1jb250YWN0cy1hdXRvLWZp bGwtYnV0dG9uKToKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvVGhlbWVNYWMubW06CisgICAgICAg IChXZWJDb3JlOjpUaGVtZU1hYzo6c3VwcG9ydHNMYXJnZUZvcm1Db250cm9scyk6CisgICAgICAg ICogcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl clRoZW1lTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlQXR0YWNobWVudFBsYWNlaG9s ZGVySW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVNYWM6OmV4dHJhRGVmYXVs dFN0eWxlU2hlZXQpOiBEZWxldGVkLgorCisgICAgICAgIFJlbW92ZSB0aGUgb3ZlcnJpZGUgZm9y IGV4dHJhRGVmYXVsdFN0eWxlU2hlZXQgYWx0b2dldGhlciwgc2luY2UgdGhpcyB3YXMgb25seSB1 c2VkIHRvIHRlbXBvcmFyaWx5IGhpZGUgdGhlIG5ldworICAgICAgICBjb250YWN0IEF1dG9GaWxs IGJ1dHRvbiBhcHBlYXJhbmNlIGZyb20gb3BlbiBzb3VyY2UgV2ViS2l0LgorCiAyMDIwLTA2LTIx ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFRleHQg bWFuaXB1bGF0aW9uIHNob3VsZCBleGNsdWRlIHRleHQgcmVuZGVyZWQgdXNpbmcgaWNvbi1vbmx5 IGZvbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvaHRtbC5jc3MgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvaHRtbC5jc3MKaW5kZXggMGE2NDViM2MyNmYxZmU2ZTNkNWYwNTg4NGNiNDQ1 MjZmMjkzNmU4OS4uYWY3ZjZkMjNmYWQ3YzM5ZDU0ZjUyNDA2MTdlOWRkY2EyYmYxY2FkMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL2h0bWwuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9odG1sLmNzcwpAQCAtNTk3LDcgKzU5Nyw5IEBAIGlucHV0Ojotd2Via2l0LWNyZWRlbnRp YWxzLWF1dG8tZmlsbC1idXR0b246YWN0aXZlIHsKIH0KIAogaW5wdXQ6Oi13ZWJraXQtY29udGFj dHMtYXV0by1maWxsLWJ1dHRvbiB7Ci0jaWYgIShkZWZpbmVkKEhBVkVfQUxURVJOQVRFX0lDT05T KSAmJiBIQVZFX0FMVEVSTkFURV9JQ09OUykKKyNpZiAoZGVmaW5lZChIQVZFX0FMVEVSTkFURV9J Q09OUykgJiYgSEFWRV9BTFRFUk5BVEVfSUNPTlMpCisgICAgLXdlYmtpdC1tYXNrLWltYWdlOiB1 cmwoJ2RhdGE6aW1hZ2Uvc3ZnK3htbCw8c3ZnIHZpZXdCb3g9IjAgMCA0NCAyNCIgdmVyc2lvbj0i MS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxwYXRoIGQ9Ik0gMzAuMjUg OS4yNSBMIDM2LjUgMTUuNzUgTCA0Mi43NSA5LjI1IiBmaWxsPSJub25lIiBzdHJva2U9ImJsYWNr IiBzdHJva2Utd2lkdGg9IjIuNSIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpv aW49InJvdW5kIi8+PHBhdGggZD0iTSAxMiAyNCBDIDE4LjU2NDcgMjQgMjQgMTguNTUyOSAyNCAx MiBDIDI0IDUuNDM1MyAxOC41NTMgMCAxMS45ODgzIDAgQyA1LjQzNTMgMCAwIDUuNDM1MyAwIDEy IEMgMCAxOC41NTI5IDUuNDQ3MSAyNCAxMiAyNCBaIE0gMTIgMTYuMDExOCBDIDguNDcwNiAxNi4w MTE4IDUuNzQxMiAxNy4yNzA2IDQuNTUyOSAxOC42ODIzIEMgMi45NjQ3IDE2LjkxNzYgMi4wMTE4 IDE0LjU3NjUgMi4wMTE4IDEyIEMgMi4wMTE4IDYuNDQ3IDYuNDM1MyAyIDExLjk4ODMgMiBDIDE3 LjU0MTIgMiAyMS45ODgzIDYuNDQ3IDIyIDEyIEMgMjIuMDExOSAxNC41NzY1IDIxLjA0NzEgMTYu OTE3NiAxOS40NTg5IDE4LjY5NDEgQyAxOC4yNzA2IDE3LjI4MjMgMTUuNTQxMiAxNi4wMTE4IDEy IDE2LjAxMTggWiBNIDEyIDE0LjAxMTggQyAxNC4yNTg4IDE0LjAzNTMgMTYuMDM1MyAxMi4xMDU5 IDE2LjAzNTMgOS41NzY1IEMgMTYuMDM1MyA3LjIgMTQuMjU4OCA1LjIyMzUgMTIgNS4yMjM1IEMg OS43NDEyIDUuMjIzNSA3Ljk1MjkgNy4yIDcuOTY0NyA5LjU3NjUgQyA3Ljk3NjUgMTIuMTA1OSA5 Ljc0MTIgMTMuOTg4MiAxMiAxNC4wMTE4IFoiLz48L3N2Zz4nKTsKKyNlbHNlCiAgICAgLXdlYmtp dC1tYXNrLWltYWdlOiB1cmwoJ2RhdGE6aW1hZ2Uvc3ZnK3htbCw8c3ZnIHZpZXdCb3g9IjAgMCA0 NCAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxw YXRoIGQ9Ik0gMzAuMjUgOS4yNSBMIDM2LjUgMTUuNzUgTCA0Mi43NSA5LjI1IiBmaWxsPSJub25l IiBzdHJva2U9ImJsYWNrIiBzdHJva2Utd2lkdGg9IjIuNSIgc3Ryb2tlLWxpbmVjYXA9InJvdW5k IiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+PGNpcmNsZSBjeD0iMTIiIGN5PSIxMiIgcj0iMTEi IGZpbGw9Im5vbmUiIHN0cm9rZT0iYmxhY2siIHN0cm9rZS13aWR0aD0iMiIvPjxwYXRoIGQ9Ik0g MTIgMTEuNSBDIDEwLjMgMTEuNSA5IDEwLjEgOSA4LjIgQyA5IDYuNSAxMC4zIDUgMTIgNSBDIDEz LjYgNSAxNSA2LjUgMTUgOC4yIEMgMTUgMTAuMSAxMy42IDExLjUgMTIgMTEuNSBaIE0gNi42IDE4 IEMgNi4yIDE4IDYgMTcuNyA2IDE3LjQgQyA2IDE2LjIgNy45IDEzIDEyIDEzIEMgMTYuMSAxMyAx OCAxNi4yIDE4IDE3LjQgQyAxOCAxNy43IDE3LjggMTggMTcuNCAxOCBMIDYuNiAxOCBaIi8+PC9z dmc+Jyk7CiAjZW5kaWYKICAgICAtd2Via2l0LW1hc2stc2l6ZTogMjJweCAxMnB4OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1RoZW1lTWFjLm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbWFjL1RoZW1lTWFjLm1tCmluZGV4IDNhM2JiNmJmYjUxZGU0YzBiZmQz MGUxNjIxMDAzNGZjMDVhNzYyMGQuLmRhNzRkYzRiZTJhNTFhMWQzZjE0NTkzM2RkNWFkZTc1MDk4 MWIyMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9UaGVtZU1hYy5t bQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvVGhlbWVNYWMubW0KQEAgLTEyMCwx MCArMTIwLDYgQEAgQGVuZAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLSNpZiBVU0UoQVBQTEVf SU5URVJOQUxfU0RLKQotI2ltcG9ydCA8V2ViS2l0QWRkaXRpb25zL1RoZW1lTWFjQWRkaXRpb25z Lm1tPgotI2VuZGlmCi0KIGVudW0gewogICAgIHRvcE1hcmdpbiwKICAgICByaWdodE1hcmdpbiwK QEAgLTk4Niw2ICs5ODIsMjAgQEAgYm9vbCBUaGVtZU1hYzo6dXNlclByZWZlcnNSZWR1Y2VkTW90 aW9uKCkgY29uc3QKICAgICByZXR1cm4gW1tOU1dvcmtzcGFjZSBzaGFyZWRXb3Jrc3BhY2VdIGFj Y2Vzc2liaWxpdHlEaXNwbGF5U2hvdWxkUmVkdWNlTW90aW9uXTsKIH0KIAorI2lmIEhBVkUoTEFS R0VfQ09OVFJPTF9TSVpFKQorCitib29sIFRoZW1lTWFjOjpzdXBwb3J0c0xhcmdlRm9ybUNvbnRy b2xzKCkKK3sKKyAgICBzdGF0aWMgYm9vbCBoYXNTdXBwb3J0ID0gZmFsc2U7CisgICAgc3RhdGlj IGRpc3BhdGNoX29uY2VfdCBvbmNlVG9rZW47CisgICAgZGlzcGF0Y2hfb25jZSgmb25jZVRva2Vu LCBeeworICAgICAgICBoYXNTdXBwb3J0ID0gW1tOU0FwcGVhcmFuY2UgY3VycmVudEFwcGVhcmFu Y2VdIF91c2VzTWV0cmljc0FwcGVhcmFuY2VdOworICAgIH0pOworICAgIHJldHVybiBoYXNTdXBw b3J0OworfQorCisjZW5kaWYgLy8gSEFWRShMQVJHRV9DT05UUk9MX1NJWkUpCisKIH0KIAogI2Vu ZGlmIC8vIFBMQVRGT1JNKE1BQykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUaGVtZU1hYy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1l TWFjLmgKaW5kZXggOTI1NTkzZDI4NWNlODY5NTE3ZGY5NDUxNTY4MjVmYjFjZGY0MTI1Ny4uMDg3 Yjk4N2Q2M2Y2ZWZlNzc2ZTY2Nzk0ZDc3NDVkYzM2NWVhMjM1ZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLmgKQEAgLTEwMyw4ICsxMDMsNiBAQCBwdWJsaWM6CiBw cml2YXRlOgogICAgIFJlbmRlclRoZW1lTWFjKCk7CiAKLSAgICBTdHJpbmcgZXh0cmFEZWZhdWx0 U3R5bGVTaGVldCgpIGZpbmFsOwotCiAjaWYgRU5BQkxFKFZJREVPKQogICAgIC8vIE1lZGlhIGNv bnRyb2xzCiAgICAgU3RyaW5nIG1lZGlhQ29udHJvbHNTdHlsZVNoZWV0KCkgZmluYWw7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KaW5kZXggOGQ0NTAxYTA3NGU1 NDEwMDEzZGRiMzFiMWVmNTlkMDE0NjlhZmM5YS4uMDBhZjRlNzBiZmMxYzZmMWVhNmNjYTgzMWQ1 ODEwOTNjZGRkM2RmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clRoZW1lTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1h Yy5tbQpAQCAtMjczMiwyNCArMjczMiwyNyBAQCBzdGF0aWMgdm9pZCBwYWludEF0dGFjaG1lbnRJ Y29uKGNvbnN0IFJlbmRlckF0dGFjaG1lbnQmIGF0dGFjaG1lbnQsIEdyYXBoaWNzQ29udAogICAg IGljb24tPnBhaW50KGNvbnRleHQsIGxheW91dC5pY29uUmVjdCk7CiB9CiAKLSNpZiBIQVZFKEFM VEVSTkFURV9JQ09OUykgJiYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKLSNpbXBvcnQgPFdlYktp dEFkZGl0aW9ucy9SZW5kZXJUaGVtZU1hY0FkZGl0aW9ucy5tbT4KK3N0YXRpYyBzdGQ6OnBhaXI8 UmVmUHRyPEltYWdlPiwgZmxvYXQ+IGNyZWF0ZUF0dGFjaG1lbnRQbGFjZWhvbGRlckltYWdlKGZs b2F0IGRldmljZVNjYWxlRmFjdG9yLCBjb25zdCBBdHRhY2htZW50TGF5b3V0JiBsYXlvdXQpCit7 CisjaWYgSEFWRShBTFRFUk5BVEVfSUNPTlMpCisgICAgYXV0byBpbWFnZSA9IHJldGFpblB0cihb TlNJbWFnZSBfaW1hZ2VXaXRoU3lzdGVtU3ltYm9sTmFtZTpAImFycm93LmRvd24uY2lyY2xlIl0p OworICAgIGF1dG8gaW1hZ2VTaXplID0gRmxvYXRTaXplKFtpbWFnZSBzaXplXSk7CisgICAgYXV0 byBpbWFnZVNpemVTY2FsZXMgPSBkZXZpY2VTY2FsZUZhY3RvciAqIGxheW91dC5pY29uUmVjdC5z aXplKCkgLyBpbWFnZVNpemU7CisgICAgaW1hZ2VTaXplLnNjYWxlKHN0ZDo6bWluKGltYWdlU2l6 ZVNjYWxlcy53aWR0aCgpLCBpbWFnZVNpemVTY2FsZXMuaGVpZ2h0KCkpKTsKKyAgICBhdXRvIGlt YWdlUmVjdCA9IE5TTWFrZVJlY3QoMCwgMCwgaW1hZ2VTaXplLndpZHRoKCksIGltYWdlU2l6ZS5o ZWlnaHQoKSk7CisgICAgYXV0byBjZ0ltYWdlID0gcmV0YWluUHRyKFtpbWFnZSBDR0ltYWdlRm9y UHJvcG9zZWRSZWN0OiZpbWFnZVJlY3QgY29udGV4dDpuaWwgaGludHM6QHsKKyAgICAgICAgTlNJ bWFnZUhpbnRTeW1ib2xGb250IDogW05TRm9udCBzeXN0ZW1Gb250T2ZTaXplOjMyXSwKKyAgICAg ICAgTlNJbWFnZUhpbnRTeW1ib2xTY2FsZSA6IEAoTlNJbWFnZVN5bWJvbFNjYWxlTWVkaXVtKQor ICAgIH1dKTsKKyAgICByZXR1cm4geyBCaXRtYXBJbWFnZTo6Y3JlYXRlKGNnSW1hZ2UuZ2V0KCkp LCBkZXZpY2VTY2FsZUZhY3RvciB9OwogI2Vsc2UKLQotc3RhdGljIHN0ZDo6cGFpcjxSZWZQdHI8 SW1hZ2U+LCBmbG9hdD4gY3JlYXRlQXR0YWNobWVudFBsYWNlaG9sZGVySW1hZ2UoZmxvYXQgZGV2 aWNlU2NhbGVGYWN0b3IsIGNvbnN0IEF0dGFjaG1lbnRMYXlvdXQmKQoteworICAgIFVOVVNFRF9Q QVJBTShsYXlvdXQpOwogICAgIGlmIChkZXZpY2VTY2FsZUZhY3RvciA+PSAyKQogICAgICAgICBy ZXR1cm4geyBJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoIkF0dGFjaG1lbnRQbGFjZWhvbGRl ckAyeCIpLCAyIH07CiAKICAgICByZXR1cm4geyBJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2Uo IkF0dGFjaG1lbnRQbGFjZWhvbGRlciIpLCAxIH07Ci19Ci0KLVN0cmluZyBSZW5kZXJUaGVtZU1h Yzo6ZXh0cmFEZWZhdWx0U3R5bGVTaGVldCgpCi17Ci0gICAgcmV0dXJuIHsgfTsKLX0KLQogI2Vu ZGlmCit9CiAKIHN0YXRpYyB2b2lkIHBhaW50QXR0YWNobWVudEljb25QbGFjZWhvbGRlcihjb25z dCBSZW5kZXJBdHRhY2htZW50JiBhdHRhY2htZW50LCBHcmFwaGljc0NvbnRleHQmIGNvbnRleHQs IEF0dGFjaG1lbnRMYXlvdXQmIGxheW91dCkKIHsK 402742 2020-06-25 10:13:52 -0700 2020-06-25 10:39:49 -0700 Patch for landing bug-213608-20200625101351.patch text/plain 6593 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODBmOTllMmM3YTUyZjZk NjNkM2YwMjE5ZTJjNmYxNWUzNWY5ZjgyZi4uOGM1ZTMyOGM3N2Y0NGI1YmI3NDgzZTVkMTE2OTBi MTI2YWQ3M2E2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA2LTI1ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFVwc3RyZWFtIG1h Y09TIDExIGFkZGl0aW9ucyB0byBSZW5kZXJUaGVtZU1hYy5tbSBhbmQgVGhlbWVNYWMubW0KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzYwOAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNjQ3NTgyOTk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFy aW4gQWRsZXIuCisKKyAgICAgICAgUmVwbGFjZSBXZWJLaXRBZGRpdGlvbnMgaW1wb3J0cyB3aXRo IHRoZSBpbXBvcnRlZCBjb2RlLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBj c3MvaHRtbC5jc3M6CisgICAgICAgIChpbnB1dDo6LXdlYmtpdC1jb250YWN0cy1hdXRvLWZpbGwt YnV0dG9uKToKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvVGhlbWVNYWMubW06CisgICAgICAgIChX ZWJDb3JlOjpUaGVtZU1hYzo6c3VwcG9ydHNMYXJnZUZvcm1Db250cm9scyk6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRo ZW1lTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlQXR0YWNobWVudFBsYWNlaG9sZGVy SW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVNYWM6OmV4dHJhRGVmYXVsdFN0 eWxlU2hlZXQpOiBEZWxldGVkLgorCisgICAgICAgIFJlbW92ZSB0aGUgb3ZlcnJpZGUgZm9yIGV4 dHJhRGVmYXVsdFN0eWxlU2hlZXQgYWx0b2dldGhlciwgc2luY2UgdGhpcyB3YXMgb25seSB1c2Vk IHRvIHRlbXBvcmFyaWx5IGhpZGUgdGhlIG5ldworICAgICAgICBjb250YWN0IEF1dG9GaWxsIGJ1 dHRvbiBhcHBlYXJhbmNlIGZyb20gb3BlbiBzb3VyY2UgV2ViS2l0LgorCiAyMDIwLTA2LTI0ICBK YW1lcyBTYXZhZ2UgIDxqYW1lcy5zYXZhZ2VAYXBwbGUuY29tPgogCiAgICAgICAgIFVwc3RyZWFt IGlQYWRPUyAxMy4wIG11bHRpLXdpbmRvdyBzdXBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvaHRtbC5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvaHRtbC5jc3MKaW5kZXggMGE2 NDViM2MyNmYxZmU2ZTNkNWYwNTg4NGNiNDQ1MjZmMjkzNmU4OS4uYWY3ZjZkMjNmYWQ3YzM5ZDU0 ZjUyNDA2MTdlOWRkY2EyYmYxY2FkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL2h0 bWwuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9odG1sLmNzcwpAQCAtNTk3LDcgKzU5Nyw5 IEBAIGlucHV0Ojotd2Via2l0LWNyZWRlbnRpYWxzLWF1dG8tZmlsbC1idXR0b246YWN0aXZlIHsK IH0KIAogaW5wdXQ6Oi13ZWJraXQtY29udGFjdHMtYXV0by1maWxsLWJ1dHRvbiB7Ci0jaWYgIShk ZWZpbmVkKEhBVkVfQUxURVJOQVRFX0lDT05TKSAmJiBIQVZFX0FMVEVSTkFURV9JQ09OUykKKyNp ZiAoZGVmaW5lZChIQVZFX0FMVEVSTkFURV9JQ09OUykgJiYgSEFWRV9BTFRFUk5BVEVfSUNPTlMp CisgICAgLXdlYmtpdC1tYXNrLWltYWdlOiB1cmwoJ2RhdGE6aW1hZ2Uvc3ZnK3htbCw8c3ZnIHZp ZXdCb3g9IjAgMCA0NCAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv MjAwMC9zdmciPjxwYXRoIGQ9Ik0gMzAuMjUgOS4yNSBMIDM2LjUgMTUuNzUgTCA0Mi43NSA5LjI1 IiBmaWxsPSJub25lIiBzdHJva2U9ImJsYWNrIiBzdHJva2Utd2lkdGg9IjIuNSIgc3Ryb2tlLWxp bmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+PHBhdGggZD0iTSAxMiAyNCBD IDE4LjU2NDcgMjQgMjQgMTguNTUyOSAyNCAxMiBDIDI0IDUuNDM1MyAxOC41NTMgMCAxMS45ODgz IDAgQyA1LjQzNTMgMCAwIDUuNDM1MyAwIDEyIEMgMCAxOC41NTI5IDUuNDQ3MSAyNCAxMiAyNCBa IE0gMTIgMTYuMDExOCBDIDguNDcwNiAxNi4wMTE4IDUuNzQxMiAxNy4yNzA2IDQuNTUyOSAxOC42 ODIzIEMgMi45NjQ3IDE2LjkxNzYgMi4wMTE4IDE0LjU3NjUgMi4wMTE4IDEyIEMgMi4wMTE4IDYu NDQ3IDYuNDM1MyAyIDExLjk4ODMgMiBDIDE3LjU0MTIgMiAyMS45ODgzIDYuNDQ3IDIyIDEyIEMg MjIuMDExOSAxNC41NzY1IDIxLjA0NzEgMTYuOTE3NiAxOS40NTg5IDE4LjY5NDEgQyAxOC4yNzA2 IDE3LjI4MjMgMTUuNTQxMiAxNi4wMTE4IDEyIDE2LjAxMTggWiBNIDEyIDE0LjAxMTggQyAxNC4y NTg4IDE0LjAzNTMgMTYuMDM1MyAxMi4xMDU5IDE2LjAzNTMgOS41NzY1IEMgMTYuMDM1MyA3LjIg MTQuMjU4OCA1LjIyMzUgMTIgNS4yMjM1IEMgOS43NDEyIDUuMjIzNSA3Ljk1MjkgNy4yIDcuOTY0 NyA5LjU3NjUgQyA3Ljk3NjUgMTIuMTA1OSA5Ljc0MTIgMTMuOTg4MiAxMiAxNC4wMTE4IFoiLz48 L3N2Zz4nKTsKKyNlbHNlCiAgICAgLXdlYmtpdC1tYXNrLWltYWdlOiB1cmwoJ2RhdGE6aW1hZ2Uv c3ZnK3htbCw8c3ZnIHZpZXdCb3g9IjAgMCA0NCAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0 cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxwYXRoIGQ9Ik0gMzAuMjUgOS4yNSBMIDM2LjUgMTUu NzUgTCA0Mi43NSA5LjI1IiBmaWxsPSJub25lIiBzdHJva2U9ImJsYWNrIiBzdHJva2Utd2lkdGg9 IjIuNSIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+PGNp cmNsZSBjeD0iMTIiIGN5PSIxMiIgcj0iMTEiIGZpbGw9Im5vbmUiIHN0cm9rZT0iYmxhY2siIHN0 cm9rZS13aWR0aD0iMiIvPjxwYXRoIGQ9Ik0gMTIgMTEuNSBDIDEwLjMgMTEuNSA5IDEwLjEgOSA4 LjIgQyA5IDYuNSAxMC4zIDUgMTIgNSBDIDEzLjYgNSAxNSA2LjUgMTUgOC4yIEMgMTUgMTAuMSAx My42IDExLjUgMTIgMTEuNSBaIE0gNi42IDE4IEMgNi4yIDE4IDYgMTcuNyA2IDE3LjQgQyA2IDE2 LjIgNy45IDEzIDEyIDEzIEMgMTYuMSAxMyAxOCAxNi4yIDE4IDE3LjQgQyAxOCAxNy43IDE3Ljgg MTggMTcuNCAxOCBMIDYuNiAxOCBaIi8+PC9zdmc+Jyk7CiAjZW5kaWYKICAgICAtd2Via2l0LW1h c2stc2l6ZTogMjJweCAxMnB4OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL1RoZW1lTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1RoZW1lTWFjLm1t CmluZGV4IDNhM2JiNmJmYjUxZGU0YzBiZmQzMGUxNjIxMDAzNGZjMDVhNzYyMGQuLjNhMDVhNTYx Y2M1OWMzZGE2OTIzZjNkMWVlZGNhOTNkMTlhMGMzNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL21hYy9UaGVtZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tYWMvVGhlbWVNYWMubW0KQEAgLTEyMCwxMCArMTIwLDYgQEAgQGVuZAogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKLSNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQotI2ltcG9ydCA8V2ViS2l0 QWRkaXRpb25zL1RoZW1lTWFjQWRkaXRpb25zLm1tPgotI2VuZGlmCi0KIGVudW0gewogICAgIHRv cE1hcmdpbiwKICAgICByaWdodE1hcmdpbiwKQEAgLTk4Niw2ICs5ODIsMTYgQEAgYm9vbCBUaGVt ZU1hYzo6dXNlclByZWZlcnNSZWR1Y2VkTW90aW9uKCkgY29uc3QKICAgICByZXR1cm4gW1tOU1dv cmtzcGFjZSBzaGFyZWRXb3Jrc3BhY2VdIGFjY2Vzc2liaWxpdHlEaXNwbGF5U2hvdWxkUmVkdWNl TW90aW9uXTsKIH0KIAorI2lmIEhBVkUoTEFSR0VfQ09OVFJPTF9TSVpFKQorCitib29sIFRoZW1l TWFjOjpzdXBwb3J0c0xhcmdlRm9ybUNvbnRyb2xzKCkKK3sKKyAgICBzdGF0aWMgYm9vbCBoYXNT dXBwb3J0ID0gW1tOU0FwcGVhcmFuY2UgY3VycmVudEFwcGVhcmFuY2VdIF91c2VzTWV0cmljc0Fw cGVhcmFuY2VdOworICAgIHJldHVybiBoYXNTdXBwb3J0OworfQorCisjZW5kaWYgLy8gSEFWRShM QVJHRV9DT05UUk9MX1NJWkUpCisKIH0KIAogI2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5oIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLmgKaW5kZXggOTI1NTkzZDI4NWNlODY5 NTE3ZGY5NDUxNTY4MjVmYjFjZGY0MTI1Ny4uMDg3Yjk4N2Q2M2Y2ZWZlNzc2ZTY2Nzk0ZDc3NDVk YzM2NWVhMjM1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lTWFjLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLmgK QEAgLTEwMyw4ICsxMDMsNiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIFJlbmRlclRoZW1lTWFj KCk7CiAKLSAgICBTdHJpbmcgZXh0cmFEZWZhdWx0U3R5bGVTaGVldCgpIGZpbmFsOwotCiAjaWYg RU5BQkxFKFZJREVPKQogICAgIC8vIE1lZGlhIGNvbnRyb2xzCiAgICAgU3RyaW5nIG1lZGlhQ29u dHJvbHNTdHlsZVNoZWV0KCkgZmluYWw7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy VGhlbWVNYWMubW0KaW5kZXggOGQ0NTAxYTA3NGU1NDEwMDEzZGRiMzFiMWVmNTlkMDE0NjlhZmM5 YS4uNDYyZGNiYjlkOGYwNDM0NWZjNzYwOGUxNDA2NDkwYzUzZTRhMGY3YiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbQpAQCAtMjczMiwyNCArMjczMiwyNyBA QCBzdGF0aWMgdm9pZCBwYWludEF0dGFjaG1lbnRJY29uKGNvbnN0IFJlbmRlckF0dGFjaG1lbnQm IGF0dGFjaG1lbnQsIEdyYXBoaWNzQ29udAogICAgIGljb24tPnBhaW50KGNvbnRleHQsIGxheW91 dC5pY29uUmVjdCk7CiB9CiAKLSNpZiBIQVZFKEFMVEVSTkFURV9JQ09OUykgJiYgVVNFKEFQUExF X0lOVEVSTkFMX1NESykKLSNpbXBvcnQgPFdlYktpdEFkZGl0aW9ucy9SZW5kZXJUaGVtZU1hY0Fk ZGl0aW9ucy5tbT4KK3N0YXRpYyBzdGQ6OnBhaXI8UmVmUHRyPEltYWdlPiwgZmxvYXQ+IGNyZWF0 ZUF0dGFjaG1lbnRQbGFjZWhvbGRlckltYWdlKGZsb2F0IGRldmljZVNjYWxlRmFjdG9yLCBjb25z dCBBdHRhY2htZW50TGF5b3V0JiBsYXlvdXQpCit7CisjaWYgSEFWRShBTFRFUk5BVEVfSUNPTlMp CisgICAgYXV0byBpbWFnZSA9IFtOU0ltYWdlIF9pbWFnZVdpdGhTeXN0ZW1TeW1ib2xOYW1lOkAi YXJyb3cuZG93bi5jaXJjbGUiXTsKKyAgICBhdXRvIGltYWdlU2l6ZSA9IEZsb2F0U2l6ZShbaW1h Z2Ugc2l6ZV0pOworICAgIGF1dG8gaW1hZ2VTaXplU2NhbGVzID0gZGV2aWNlU2NhbGVGYWN0b3Ig KiBsYXlvdXQuaWNvblJlY3Quc2l6ZSgpIC8gaW1hZ2VTaXplOworICAgIGltYWdlU2l6ZS5zY2Fs ZShzdGQ6Om1pbihpbWFnZVNpemVTY2FsZXMud2lkdGgoKSwgaW1hZ2VTaXplU2NhbGVzLmhlaWdo dCgpKSk7CisgICAgYXV0byBpbWFnZVJlY3QgPSBOU01ha2VSZWN0KDAsIDAsIGltYWdlU2l6ZS53 aWR0aCgpLCBpbWFnZVNpemUuaGVpZ2h0KCkpOworICAgIGF1dG8gY2dJbWFnZSA9IFtpbWFnZSBD R0ltYWdlRm9yUHJvcG9zZWRSZWN0OiZpbWFnZVJlY3QgY29udGV4dDpuaWwgaGludHM6QHsKKyAg ICAgICAgTlNJbWFnZUhpbnRTeW1ib2xGb250IDogW05TRm9udCBzeXN0ZW1Gb250T2ZTaXplOjMy XSwKKyAgICAgICAgTlNJbWFnZUhpbnRTeW1ib2xTY2FsZSA6IEAoTlNJbWFnZVN5bWJvbFNjYWxl TWVkaXVtKQorICAgIH1dOworICAgIHJldHVybiB7IEJpdG1hcEltYWdlOjpjcmVhdGUoY2dJbWFn ZS5nZXQoKSksIGRldmljZVNjYWxlRmFjdG9yIH07CiAjZWxzZQotCi1zdGF0aWMgc3RkOjpwYWly PFJlZlB0cjxJbWFnZT4sIGZsb2F0PiBjcmVhdGVBdHRhY2htZW50UGxhY2Vob2xkZXJJbWFnZShm bG9hdCBkZXZpY2VTY2FsZUZhY3RvciwgY29uc3QgQXR0YWNobWVudExheW91dCYpCi17CisgICAg VU5VU0VEX1BBUkFNKGxheW91dCk7CiAgICAgaWYgKGRldmljZVNjYWxlRmFjdG9yID49IDIpCiAg ICAgICAgIHJldHVybiB7IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgiQXR0YWNobWVudFBs YWNlaG9sZGVyQDJ4IiksIDIgfTsKIAogICAgIHJldHVybiB7IEltYWdlOjpsb2FkUGxhdGZvcm1S ZXNvdXJjZSgiQXR0YWNobWVudFBsYWNlaG9sZGVyIiksIDEgfTsKLX0KLQotU3RyaW5nIFJlbmRl clRoZW1lTWFjOjpleHRyYURlZmF1bHRTdHlsZVNoZWV0KCkKLXsKLSAgICByZXR1cm4geyB9Owot fQotCiAjZW5kaWYKK30KIAogc3RhdGljIHZvaWQgcGFpbnRBdHRhY2htZW50SWNvblBsYWNlaG9s ZGVyKGNvbnN0IFJlbmRlckF0dGFjaG1lbnQmIGF0dGFjaG1lbnQsIEdyYXBoaWNzQ29udGV4dCYg Y29udGV4dCwgQXR0YWNobWVudExheW91dCYgbGF5b3V0KQogewo=