225375 2021-05-04 17:46:16 -0700 [macOS] Use system colors for ActiveButtonText 2021-05-05 23:15:13 -0700 1 1 1 Unclassified WebKit Forms Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 akeerthi akeerthi cdumez changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1756742 0 akeerthi 2021-05-04 17:46:16 -0700 ... 1756744 1 akeerthi 2021-05-04 17:46:39 -0700 <rdar://problem/75863443> 1756745 2 427716 akeerthi 2021-05-04 17:48:06 -0700 Created attachment 427716 Patch for EWS 1757043 3 427790 akeerthi 2021-05-05 12:43:26 -0700 Created attachment 427790 Patch 1757066 4 427790 thorton 2021-05-05 13:11:40 -0700 Comment on attachment 427790 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427790&action=review > Source/WebCore/rendering/RenderThemeMac.mm:414 > + if ([cell interiorBackgroundStyle] == NSBackgroundStyleEmphasized) Should also have a FIXME and an AppKit radar on all of this. 1757080 5 427801 akeerthi 2021-05-05 13:39:56 -0700 Created attachment 427801 Patch for landing 1757228 6 ews-feeder 2021-05-05 19:34:36 -0700 Committed r277067 (237370@main): <https://commits.webkit.org/237370@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 427801. 1757246 7 427801 simon.fraser 2021-05-05 21:23:28 -0700 Comment on attachment 427801 Patch for landing View in context: https://bugs.webkit.org/attachment.cgi?id=427801&action=review > Source/WebCore/rendering/RenderThemeMac.mm:423 > + auto cell = adoptNS([[NSButtonCell alloc] init]); > + [cell setBezelStyle:NSBezelStyleRounded]; > + [cell setHighlighted:YES]; > + > + NSColor *activeButtonTextColor; > + if ([cell interiorBackgroundStyle] == NSBackgroundStyleEmphasized) > + activeButtonTextColor = [NSColor alternateSelectedControlTextColor]; > + else > + activeButtonTextColor = [NSColor controlTextColor]; > + > + return semanticColorFromNSColor(activeButtonTextColor); Do we call this every time we paint a button? Can we cache it? 1757253 8 thorton 2021-05-05 23:15:13 -0700 (In reply to Simon Fraser (smfr) from comment #7) > Comment on attachment 427801 [details] > Patch for landing > Do we call this every time we paint a button? Can we cache it? See the changelog :) 427716 2021-05-04 17:48:06 -0700 2021-05-05 12:43:23 -0700 Patch for EWS bug-225375-20210504204805.patch text/plain 2008 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2OTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2ZiYmU0OGFhODU1ZTRl ODU2ZTgzZGZiY2U4NjczYjE3ZGUzNTY1ZC4uOWU3ZDU0YjE3YzdkZDM2ZGIyMTIwMzQ4NDM5MzAz Y2RiZjZhOTMzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTA1LTA0ICBBZGl0 eWEgS2VlcnRoaSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIFVzZSBz eXN0ZW0gY29sb3IgZm9yIEFjdGl2ZUJ1dHRvblRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNTM3NQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NzU4NjM0NDM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgRm9yIEVXUywgZG8gbm90IGxhbmQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhl bWVNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZU1hYzo6c3lzdGVtQ29sb3Ig Y29uc3QpOgorCiAyMDIxLTA1LTA0ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3Jn PgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyNjAzNjApOiBhbmltYXRpb24td2lkZSB0aW1pbmcg ZnVuY3Rpb24gZG9lcyBub3QgYXBwbHkgdG8gMi1rZXlmcmFtZSB0cmFuc2Zvcm0gV2ViIEFuaW1h dGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFj Lm1tIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCmluZGV4IDgy NjA0MjdjZGNjNzEwMzMzYTQ5NjAyNzczMTIwMDE3MmUzMzIxZDYuLjRkZmE1NWQwODg0MjA5N2Zh ZjliMTc5ZjJkMjQwZjdjZjBkMDhhMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJUaGVtZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGhlbWVNYWMubW0KQEAgLTQ5OSw2ICs0OTksOCBAQCBDb2xvciBSZW5kZXJUaGVtZU1hYzo6 c3lzdGVtQ29sb3IoQ1NTVmFsdWVJRCBjc3NWYWx1ZUlELCBPcHRpb25TZXQ8U3R5bGVDb2xvcjo6 TwogCiAgICAgICAgIGF1dG8gc2VsZWN0Q29jb2FDb2xvciA9IFtjc3NWYWx1ZUlEXSAoKSAtPiBT RUwgewogICAgICAgICAgICAgc3dpdGNoIChjc3NWYWx1ZUlEKSB7CisgICAgICAgICAgICBjYXNl IENTU1ZhbHVlQWN0aXZlYnV0dG9udGV4dDoKKyAgICAgICAgICAgICAgICByZXR1cm4gQHNlbGVj dG9yKGNvbnRyb2xUZXh0Q29sb3IpOwogICAgICAgICAgICAgY2FzZSBDU1NWYWx1ZUFjdGl2ZWNh cHRpb246CiAgICAgICAgICAgICAgICAgcmV0dXJuIEBzZWxlY3Rvcih3aW5kb3dGcmFtZVRleHRD b2xvcik7CiAgICAgICAgICAgICBjYXNlIENTU1ZhbHVlQXBwd29ya3NwYWNlOgpAQCAtNjQxLDEw ICs2NDMsNiBAQCBDb2xvciBSZW5kZXJUaGVtZU1hYzo6c3lzdGVtQ29sb3IoQ1NTVmFsdWVJRCBj c3NWYWx1ZUlELCBPcHRpb25TZXQ8U3R5bGVDb2xvcjo6TwogICAgICAgICB9CiAKICAgICAgICAg c3dpdGNoIChjc3NWYWx1ZUlEKSB7Ci0gICAgICAgIGNhc2UgQ1NTVmFsdWVBY3RpdmVidXR0b250 ZXh0OgotICAgICAgICAgICAgLy8gTm8gY29ycmVzcG9uZGluZyBOU0NvbG9yIGZvciB0aGlzIHNv IHdlIHVzZSBhIGhhcmQgY29kZWQgdmFsdWUuCi0gICAgICAgICAgICByZXR1cm4gQ29sb3I6Ondo aXRlOwotCiAgICAgICAgIGNhc2UgQ1NTVmFsdWVCdXR0b25mYWNlOgogICAgICAgICBjYXNlIENT U1ZhbHVlVGhyZWVkZmFjZToKICAgICAgICAgICAgIC8vIFdlIHNlbGVjdGVkIHRoaXMgdmFsdWUg aW5zdGVhZCBvZiBbTlNDb2xvciBjb250cm9sQ29sb3JdIHRvIGF2b2lkIHdlYnNpdGUgaW5jb21w YXRpYmlsaXRpZXMuCg== 427790 2021-05-05 12:43:26 -0700 2021-05-05 13:10:30 -0700 Patch bug-225375-20210505154325.patch text/plain 3194 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2OTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2ZiYmU0OGFhODU1ZTRl ODU2ZTgzZGZiY2U4NjczYjE3ZGUzNTY1ZC4uYzUyY2U1ZWFjMzhhZjY3ODI3ZGUxNjNkOGNjNjk5 ZDM0OTc1ZGM1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTA1LTA1ICBBZGl0 eWEgS2VlcnRoaSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIFVzZSBz eXN0ZW0gY29sb3JzIGZvciBBY3RpdmVCdXR0b25UZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUzNzUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt Lzc1ODYzNDQzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEN1cnJlbnRseSwgdGhlIEFjdGl2ZUJ1dHRvblRleHQgY29sb3Iga2V5d29yZCByZXR1cm5z IGEgaGFyZGNvZGVkIHZhbHVlCisgICAgICAgIG9uIG1hY09TLiBUaGlzIGJlaGF2aW9yIGlzIHBy b2JsZW1hdGljIHNpbmNlIEFwcEtpdCBjYW4gbWFrZSBjaGFuZ2VzIHRvCisgICAgICAgIHRoZSBi dXR0b24gc3R5bGUsIGxlYXZpbmcgdXMgd2l0aCBpbGxlZ2libGUgdGV4dCB3aGVuIGEgYnV0dG9u IGlzCisgICAgICAgIHByZXNzZWQuCisKKyAgICAgICAgVG8gZml4LCByZXR1cm4gYSBzeXN0ZW0g Y29sb3IgZm9yIEFjdGl2ZUJ1dHRvblRleHQsIHNvIHRoYXQgb3VyIHByZXNzZWQKKyAgICAgICAg YnV0dG9ucyBhcmUgY29uc2lzdGVudCB3aXRoIHRoZSByZXN0IG9mIHRoZSBzeXN0ZW0uCisKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW06CisgICAgICAgIChXZWJDb3JlOjph Y3RpdmVCdXR0b25UZXh0Q29sb3IpOgorCisgICAgICAgIEFwcEtpdCBkZXRlcm1pbmVzIHRoZSBw cmVzc2VkIChhY3RpdmUpIHRleHQgY29sb3IgdXNpbmcgdGhlIGNlbGwncworICAgICAgICBpbnRl cmlvckJhY2tncm91bmRTdHlsZS4gVGhlcmUgaXMgbm90IGEgc2luZ2xlIHN5c3RlbSBjb2xvciBl eHBvc2VkIGZvcgorICAgICAgICB0aGUgcHJlc3NlZCB0ZXh0IGNvbG9yLCBzbyBpdCBtdXN0IGJl IGRldGVybWluZWQgZHluYW1pY2FsbHkuCisKKyAgICAgICAgVW5mb3J0dW5hdGVseSwgdGhpcyBy ZXF1aXJlcyB1cyB0byBjcmVhdGUgYW4gTlNCdXR0b25DZWxsIHRvIGRldGVybWluZQorICAgICAg ICB0aGUgYXBwcm9wcmlhdGUgY29sb3IuIEhvd2V2ZXIsIHRoaXMgbG9naWMgaXMgcmVsYXRpdmVs eSBpbmV4cGVuc2l2ZSwKKyAgICAgICAgc2luY2Ugd2UgY2FjaGUgZXhwb3NlZCBzeXN0ZW0gY29s b3JzLgorCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZU1hYzo6c3lzdGVtQ29sb3IgY29u c3QpOgorCisgICAgICAgIFJlbW92ZSB0aGUgaGFyZGNvZGVkIHZhbHVlLgorCiAyMDIxLTA1LTA0 ICBBbnRvaW5lIFF1aW50ICA8Z3Jhb3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJ T04gKHIyNjAzNjApOiBhbmltYXRpb24td2lkZSB0aW1pbmcgZnVuY3Rpb24gZG9lcyBub3QgYXBw bHkgdG8gMi1rZXlmcmFtZSB0cmFuc2Zvcm0gV2ViIEFuaW1hdGlvbgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCmluZGV4IDgyNjA0MjdjZGNjNzEwMzMzYTQ5NjAy NzczMTIwMDE3MmUzMzIxZDYuLmIyZTI4NmE4ZDg0NGY5N2JmNmU3MWZjNWJmNjlmODVkMWQ2NWY2 ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5t bQorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KQEAgLTQw NCw2ICs0MDQsMjEgQEAgQ29sb3IgUmVuZGVyVGhlbWVNYWM6OnBsYXRmb3JtQXBwSGlnaGxpZ2h0 Q29sb3IoT3B0aW9uU2V0PFN0eWxlQ29sb3I6Ok9wdGlvbnM+KQogfQogI2VuZGlmCiAKK3N0YXRp YyBDb2xvciBhY3RpdmVCdXR0b25UZXh0Q29sb3IoKQoreworICAgIGF1dG8gY2VsbCA9IGFkb3B0 TlMoW1tOU0J1dHRvbkNlbGwgYWxsb2NdIGluaXRdKTsKKyAgICBbY2VsbCBzZXRCZXplbFN0eWxl Ok5TQmV6ZWxTdHlsZVJvdW5kZWRdOworICAgIFtjZWxsIHNldEhpZ2hsaWdodGVkOllFU107CisK KyAgICBOU0NvbG9yICphY3RpdmVCdXR0b25UZXh0Q29sb3I7CisgICAgaWYgKFtjZWxsIGludGVy aW9yQmFja2dyb3VuZFN0eWxlXSA9PSBOU0JhY2tncm91bmRTdHlsZUVtcGhhc2l6ZWQpCisgICAg ICAgIGFjdGl2ZUJ1dHRvblRleHRDb2xvciA9IFtOU0NvbG9yIGFsdGVybmF0ZVNlbGVjdGVkQ29u dHJvbFRleHRDb2xvcl07CisgICAgZWxzZQorICAgICAgICBhY3RpdmVCdXR0b25UZXh0Q29sb3Ig PSBbTlNDb2xvciBjb250cm9sVGV4dENvbG9yXTsKKworICAgIHJldHVybiBzZW1hbnRpY0NvbG9y RnJvbU5TQ29sb3IoYWN0aXZlQnV0dG9uVGV4dENvbG9yKTsKK30KKwogc3RhdGljIFNSR0JBPHVp bnQ4X3Q+IG1lbnVCYWNrZ3JvdW5kQ29sb3IoKQogewogICAgIFJldGFpblB0cjxOU0JpdG1hcElt YWdlUmVwPiBvZmZzY3JlZW5SZXAgPSBhZG9wdE5TKFtbTlNCaXRtYXBJbWFnZVJlcCBhbGxvY10g aW5pdFdpdGhCaXRtYXBEYXRhUGxhbmVzOm5pbCBwaXhlbHNXaWRlOjEgcGl4ZWxzSGlnaDoxCkBA IC02NDIsOCArNjU3LDcgQEAgQ29sb3IgUmVuZGVyVGhlbWVNYWM6OnN5c3RlbUNvbG9yKENTU1Zh bHVlSUQgY3NzVmFsdWVJRCwgT3B0aW9uU2V0PFN0eWxlQ29sb3I6Ok8KIAogICAgICAgICBzd2l0 Y2ggKGNzc1ZhbHVlSUQpIHsKICAgICAgICAgY2FzZSBDU1NWYWx1ZUFjdGl2ZWJ1dHRvbnRleHQ6 Ci0gICAgICAgICAgICAvLyBObyBjb3JyZXNwb25kaW5nIE5TQ29sb3IgZm9yIHRoaXMgc28gd2Ug dXNlIGEgaGFyZCBjb2RlZCB2YWx1ZS4KLSAgICAgICAgICAgIHJldHVybiBDb2xvcjo6d2hpdGU7 CisgICAgICAgICAgICByZXR1cm4gYWN0aXZlQnV0dG9uVGV4dENvbG9yKCk7CiAKICAgICAgICAg Y2FzZSBDU1NWYWx1ZUJ1dHRvbmZhY2U6CiAgICAgICAgIGNhc2UgQ1NTVmFsdWVUaHJlZWRmYWNl Ogo= 427801 2021-05-05 13:39:56 -0700 2021-05-05 19:34:37 -0700 Patch for landing bug-225375-20210505163955.patch text/plain 3479 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2OTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2ZiYmU0OGFhODU1ZTRl ODU2ZTgzZGZiY2U4NjczYjE3ZGUzNTY1ZC4uNTk3NDFkM2YzMmFhZDkwZWI4NDU2ZWNhZjdlYzlj ZDA5MmZmYjI2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTA1LTA1ICBBZGl0 eWEgS2VlcnRoaSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KKworICAgICAgICBbbWFjT1NdIFVzZSBz eXN0ZW0gY29sb3JzIGZvciBBY3RpdmVCdXR0b25UZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjUzNzUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt Lzc1ODYzNDQzPgorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAg Q3VycmVudGx5LCB0aGUgQWN0aXZlQnV0dG9uVGV4dCBjb2xvciBrZXl3b3JkIHJldHVybnMgYSBo YXJkY29kZWQgdmFsdWUKKyAgICAgICAgb24gbWFjT1MuIFRoaXMgYmVoYXZpb3IgaXMgcHJvYmxl bWF0aWMgc2luY2UgQXBwS2l0IGNhbiBtYWtlIGNoYW5nZXMgdG8KKyAgICAgICAgdGhlIGJ1dHRv biBzdHlsZSwgbGVhdmluZyB1cyB3aXRoIGlsbGVnaWJsZSB0ZXh0IHdoZW4gYSBidXR0b24gaXMK KyAgICAgICAgcHJlc3NlZC4KKworICAgICAgICBUbyBmaXgsIHJldHVybiBhIHN5c3RlbSBjb2xv ciBmb3IgQWN0aXZlQnV0dG9uVGV4dCwgc28gdGhhdCBvdXIgcHJlc3NlZAorICAgICAgICBidXR0 b25zIGFyZSBjb25zaXN0ZW50IHdpdGggdGhlIHJlc3Qgb2YgdGhlIHN5c3RlbS4KKworICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OmFjdGl2 ZUJ1dHRvblRleHRDb2xvcik6CisKKyAgICAgICAgQXBwS2l0IGRldGVybWluZXMgdGhlIHByZXNz ZWQgKGFjdGl2ZSkgdGV4dCBjb2xvciB1c2luZyB0aGUgY2VsbCdzCisgICAgICAgIGludGVyaW9y QmFja2dyb3VuZFN0eWxlLiBUaGVyZSBpcyBub3QgYSBzaW5nbGUgc3lzdGVtIGNvbG9yIGV4cG9z ZWQgZm9yCisgICAgICAgIHRoZSBwcmVzc2VkIHRleHQgY29sb3IsIHNvIGl0IG11c3QgYmUgZGV0 ZXJtaW5lZCBkeW5hbWljYWxseS4KKworICAgICAgICBVbmZvcnR1bmF0ZWx5LCB0aGlzIHJlcXVp cmVzIHVzIHRvIGNyZWF0ZSBhbiBOU0J1dHRvbkNlbGwgdG8gZGV0ZXJtaW5lCisgICAgICAgIHRo ZSBhcHByb3ByaWF0ZSBjb2xvci4gSG93ZXZlciwgdGhpcyBsb2dpYyBpcyByZWxhdGl2ZWx5IGlu ZXhwZW5zaXZlLAorICAgICAgICBzaW5jZSB3ZSBjYWNoZSBleHBvc2VkIHN5c3RlbSBjb2xvcnMu CisKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lTWFjOjpzeXN0ZW1Db2xvciBjb25zdCk6 CisKKyAgICAgICAgUmVtb3ZlIHRoZSBoYXJkY29kZWQgdmFsdWUuCisKIDIwMjEtMDUtMDQgIEFu dG9pbmUgUXVpbnQgIDxncmFvdXRzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUkVHUkVTU0lPTiAo cjI2MDM2MCk6IGFuaW1hdGlvbi13aWRlIHRpbWluZyBmdW5jdGlvbiBkb2VzIG5vdCBhcHBseSB0 byAyLWtleWZyYW1lIHRyYW5zZm9ybSBXZWIgQW5pbWF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KaW5kZXggODI2MDQyN2NkY2M3MTAzMzNhNDk2MDI3NzMx MjAwMTcyZTMzMjFkNi4uNDEwM2UxM2YxNjZiZjlmNjMzY2MzNzk0MWJlNDI0YmRhNTBiODc4MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbQpAQCAtNDA0LDYg KzQwNCwyNSBAQCBDb2xvciBSZW5kZXJUaGVtZU1hYzo6cGxhdGZvcm1BcHBIaWdobGlnaHRDb2xv cihPcHRpb25TZXQ8U3R5bGVDb2xvcjo6T3B0aW9ucz4pCiB9CiAjZW5kaWYKIAorc3RhdGljIENv bG9yIGFjdGl2ZUJ1dHRvblRleHRDb2xvcigpCit7CisgICAgLy8gRklYTUU6IDxyZGFyOi8vcHJv YmxlbS83NzU3MjYyMj4gVGhlcmUgaXMgbm8gc2luZ2xlIGNvcnJlc3BvbmRpbmcgTlNDb2xvciBm b3IgQWN0aXZlQnV0dG9uVGV4dC4KKyAgICAvLyBJbnN0ZWFkLCB0aGUgTlNDb2xvciB1c2VkIGlz IGRlcGVuZGVudCBvbiBOU0J1dHRvbkNlbGwncyBpbnRlcmlvckJhY2tncm91bmRTdHlsZS4gQ29u c2VxdWVudGx5LAorICAgIC8vIHdlIG5lZWQgdG8gY3JlYXRlIGFuIE5TQnV0dG9uQ2VsbCBqdXN0 IHRvIGRldGVybWluZSB0aGUgY29ycmVjdCBjb2xvci4KKworICAgIGF1dG8gY2VsbCA9IGFkb3B0 TlMoW1tOU0J1dHRvbkNlbGwgYWxsb2NdIGluaXRdKTsKKyAgICBbY2VsbCBzZXRCZXplbFN0eWxl Ok5TQmV6ZWxTdHlsZVJvdW5kZWRdOworICAgIFtjZWxsIHNldEhpZ2hsaWdodGVkOllFU107CisK KyAgICBOU0NvbG9yICphY3RpdmVCdXR0b25UZXh0Q29sb3I7CisgICAgaWYgKFtjZWxsIGludGVy aW9yQmFja2dyb3VuZFN0eWxlXSA9PSBOU0JhY2tncm91bmRTdHlsZUVtcGhhc2l6ZWQpCisgICAg ICAgIGFjdGl2ZUJ1dHRvblRleHRDb2xvciA9IFtOU0NvbG9yIGFsdGVybmF0ZVNlbGVjdGVkQ29u dHJvbFRleHRDb2xvcl07CisgICAgZWxzZQorICAgICAgICBhY3RpdmVCdXR0b25UZXh0Q29sb3Ig PSBbTlNDb2xvciBjb250cm9sVGV4dENvbG9yXTsKKworICAgIHJldHVybiBzZW1hbnRpY0NvbG9y RnJvbU5TQ29sb3IoYWN0aXZlQnV0dG9uVGV4dENvbG9yKTsKK30KKwogc3RhdGljIFNSR0JBPHVp bnQ4X3Q+IG1lbnVCYWNrZ3JvdW5kQ29sb3IoKQogewogICAgIFJldGFpblB0cjxOU0JpdG1hcElt YWdlUmVwPiBvZmZzY3JlZW5SZXAgPSBhZG9wdE5TKFtbTlNCaXRtYXBJbWFnZVJlcCBhbGxvY10g aW5pdFdpdGhCaXRtYXBEYXRhUGxhbmVzOm5pbCBwaXhlbHNXaWRlOjEgcGl4ZWxzSGlnaDoxCkBA IC02NDIsOCArNjYxLDcgQEAgQ29sb3IgUmVuZGVyVGhlbWVNYWM6OnN5c3RlbUNvbG9yKENTU1Zh bHVlSUQgY3NzVmFsdWVJRCwgT3B0aW9uU2V0PFN0eWxlQ29sb3I6Ok8KIAogICAgICAgICBzd2l0 Y2ggKGNzc1ZhbHVlSUQpIHsKICAgICAgICAgY2FzZSBDU1NWYWx1ZUFjdGl2ZWJ1dHRvbnRleHQ6 Ci0gICAgICAgICAgICAvLyBObyBjb3JyZXNwb25kaW5nIE5TQ29sb3IgZm9yIHRoaXMgc28gd2Ug dXNlIGEgaGFyZCBjb2RlZCB2YWx1ZS4KLSAgICAgICAgICAgIHJldHVybiBDb2xvcjo6d2hpdGU7 CisgICAgICAgICAgICByZXR1cm4gYWN0aXZlQnV0dG9uVGV4dENvbG9yKCk7CiAKICAgICAgICAg Y2FzZSBDU1NWYWx1ZUJ1dHRvbmZhY2U6CiAgICAgICAgIGNhc2UgQ1NTVmFsdWVUaHJlZWRmYWNl Ogo=