236806 2022-02-17 14:46:32 -0800 Refactor share menu item presentation 2022-02-17 18:32:38 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney akeerthi hi megan_gardner thorton wenson_hsieh oldest_to_newest 1843126 0 katherine_cheney 2022-02-17 14:46:32 -0800 Refactor share menu item presentation 1843135 1 452436 katherine_cheney 2022-02-17 15:02:02 -0800 Created attachment 452436 Patch 1843137 2 katherine_cheney 2022-02-17 15:03:31 -0800 rdar://88858591 1843139 3 katherine_cheney 2022-02-17 15:04:20 -0800 rdar://problem/88858606 1843144 4 452436 akeerthi 2022-02-17 15:20:45 -0800 Comment on attachment 452436 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452436&action=review > Source/WebCore/PAL/pal/spi/mac/NSSharingServicePickerSPI.h:31 > +@interface NSSharingServicePicker (Internal) Nit: "Staging" is a more accurate name for the category. > Source/WebCore/PAL/pal/spi/mac/NSSharingServicePickerSPI.h:-44 > -- (void)getMenuWithCompletion:(void(^)(NSMenu *))completion; I think this deletion will cause open source builds to fail, `getMenuWithCompletion:` is still used in `WebContextMenuProxyMac`. 1843145 5 452436 megan_gardner 2022-02-17 15:21:50 -0800 Comment on attachment 452436 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452436&action=review > Source/WebCore/PAL/pal/spi/mac/NSSharingServicePickerSPI.h:32 > +- (NSMenuItem *)standardShareMenuItem; Staging_rdarNumber to be specific 1843146 6 452436 katherine_cheney 2022-02-17 15:23:23 -0800 Comment on attachment 452436 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452436&action=review thanks for the review! >> Source/WebCore/PAL/pal/spi/mac/NSSharingServicePickerSPI.h:32 >> +- (NSMenuItem *)standardShareMenuItem; > > Staging_rdarNumber to be specific will fix! >> Source/WebCore/PAL/pal/spi/mac/NSSharingServicePickerSPI.h:-44 >> -- (void)getMenuWithCompletion:(void(^)(NSMenu *))completion; > > I think this deletion will cause open source builds to fail, `getMenuWithCompletion:` is still used in `WebContextMenuProxyMac`. Ah you're right, this is leftover from a previous iteration. 1843160 7 452442 katherine_cheney 2022-02-17 15:55:22 -0800 Created attachment 452442 Patch 1843228 8 ews-feeder 2022-02-17 18:32:34 -0800 Committed r290103 (247449@main): <https://commits.webkit.org/247449@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452442. 452436 2022-02-17 15:02:02 -0800 2022-02-17 15:55:19 -0800 Patch bug-236806-20220217150201.patch text/plain 5541 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5OTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRlM2JkNTJhY2UyOGZl YjdlNDgwZjIxZTU3NDVmNTkyN2QyOThlOC4uYzhmMWQzODFhOWI4YWRiOTQ1YmYxN2U1MmI1MGJh ZTVjMmM5NGQ4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIyLTAyLTE3ICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFJlZmFjdG9y IHNoYXJlIG1lbnUgaXRlbSBwcmVzZW50YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjgwNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODg4 NTg2MDY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBwYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250 ZXh0TWVudUNvbnRyb2xsZXI6OnBvcHVsYXRlKToKKwogMjAyMi0wMi0xNSAgTXlsZXMgQy4gTWF4 ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJHUFVdIFVwZGF0ZSBJ RExzIGFuZCBzdHVicyB0byBsYXRlc3QgdmVyc2lvbiBvZiB0aGUgc3BlYwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VM b2cKaW5kZXggMjNjNDMwMWVmZmEzOTRiZTlhZWFhNWYwNGE4NWE5OTRiMGQ1OGIxYi4uNWJhZjNj NjkyYjA3ZDJkMDYxZjE3ZjAyNzJhZTI2ZGE4ZTU2YzQ2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvUEFML0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTMgQEAKKzIwMjItMDItMTcgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5l eUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVmYWN0b3Igc2hhcmUgbWVudSBpdGVtIHByZXNlbnRh dGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2 ODA2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84ODg1ODYwNj4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBhbC9zcGkvbWFjL05TU2hhcmluZ1Nl cnZpY2VQaWNrZXJTUEkuaDoKKwogMjAyMi0wMi0xNSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4 ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJHUFVdIFVwZGF0ZSBJRExzIGFuZCBzdHVi cyB0byBsYXRlc3QgdmVyc2lvbiBvZiB0aGUgc3BlYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA2YzU5ODkyYmEyMTdi NTkxMzNlOGQxZGM3M2E0NjUwZWZkMzY0YzBmLi5mMDA4OTJiNWFhYzExN2Y1OTM0YjQ1N2MwZWFm NjBlYzIxMGVhYmIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAyLTE3ICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFJlZmFjdG9y IHNoYXJlIG1lbnUgaXRlbSBwcmVzZW50YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjgwNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODg4 NTg2MDY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW06CisgICAgICAgIChXZWJL aXQ6OldlYkNvbnRleHRNZW51UHJveHlNYWM6OnNldHVwU2VydmljZXNNZW51KToKKyAgICAgICAg KFdlYktpdDo6V2ViQ29udGV4dE1lbnVQcm94eU1hYzo6Z2V0U2hhcmVNZW51SXRlbSk6CisKIDIw MjItMDItMTUgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAg ICAgICBbV2ViR1BVXSBVcGRhdGUgSURMcyBhbmQgc3R1YnMgdG8gbGF0ZXN0IHZlcnNpb24gb2Yg dGhlIHNwZWMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL21hYy9OU1No YXJpbmdTZXJ2aWNlUGlja2VyU1BJLmggYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9tYWMv TlNTaGFyaW5nU2VydmljZVBpY2tlclNQSS5oCmluZGV4IGQzYjE5OTViMTVmNWEyNDNmNGM2NTI1 MWI5ZjMzNDRlZDE1NGZmMTEuLmY4MmQ4ZmRiY2RkZDEyZWExNjBmYTQ0NWI1OTg3NzgxZGNmZTU5 YTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL21hYy9OU1NoYXJpbmdT ZXJ2aWNlUGlja2VyU1BJLmgKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvbWFjL05T U2hhcmluZ1NlcnZpY2VQaWNrZXJTUEkuaApAQCAtMjcsNiArMjcsMTEgQEAKIAogI2ltcG9ydCA8 QXBwS2l0L05TU2hhcmluZ1NlcnZpY2VfUHJpdmF0ZS5oPgogCisvLyBUT0RPOiBSZW1vdmUgb25j ZSByZGFyOi8vODg4NTUwMTcgaGFzIGJlZW4gaW4gdGhlIGJ1aWxkIGZvciBhIHdoaWxlLgorQGlu dGVyZmFjZSBOU1NoYXJpbmdTZXJ2aWNlUGlja2VyIChJbnRlcm5hbCkKKy0gKE5TTWVudUl0ZW0g KilzdGFuZGFyZFNoYXJlTWVudUl0ZW07CitAZW5kCisKICNlbHNlCiAKICNpbXBvcnQgPEFwcEtp dC9OU1NoYXJpbmdTZXJ2aWNlLmg+CkBAIC00MCw4ICs0NSw4IEBAIHR5cGVkZWYgTlNfRU5VTShO U0ludGVnZXIsIE5TU2hhcmluZ1NlcnZpY2VQaWNrZXJTdHlsZSkgewogCiBAaW50ZXJmYWNlIE5T U2hhcmluZ1NlcnZpY2VQaWNrZXIgKFByaXZhdGUpCiBAcHJvcGVydHkgTlNTaGFyaW5nU2Vydmlj ZVBpY2tlclN0eWxlIHN0eWxlOworLSAoTlNNZW51SXRlbSAqKXN0YW5kYXJkU2hhcmVNZW51SXRl bTsKIC0gKE5TTWVudSAqKW1lbnU7Ci0tICh2b2lkKWdldE1lbnVXaXRoQ29tcGxldGlvbjoodm9p ZCheKShOU01lbnUgKikpY29tcGxldGlvbjsKIC0gKHZvaWQpaGlkZTsKIEBlbmQKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCmluZGV4IGVmZjU3ZDk0 Mzg3NmRjOTBjNjdlMjFlOTczNjA3ZjQ3MWNhNWZmMmUuLmYzMjg2NTVkOTRlNmEzMDZhMjU4NzFj ZjIyYzM2YTQ3ZWY4OGZkN2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGV4 dE1lbnVDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51 Q29udHJvbGxlci5jcHAKQEAgLTg0MCw3ICs4NDAsNyBAQCB2b2lkIENvbnRleHRNZW51Q29udHJv bGxlcjo6cG9wdWxhdGUoKQogI2lmIFBMQVRGT1JNKEdUSykgfHwgUExBVEZPUk0oV0lOKQogICAg IENvbnRleHRNZW51SXRlbSBTaGFyZU1lbnVJdGVtOwogI2Vsc2UKLSAgICBDb250ZXh0TWVudUl0 ZW0gU2hhcmVNZW51SXRlbShTdWJtZW51VHlwZSwgQ29udGV4dE1lbnVJdGVtVGFnU2hhcmVNZW51 LCBlbXB0eVN0cmluZygpKTsKKyAgICBDb250ZXh0TWVudUl0ZW0gU2hhcmVNZW51SXRlbShBY3Rp b25UeXBlLCBDb250ZXh0TWVudUl0ZW1UYWdTaGFyZU1lbnUsIGVtcHR5U3RyaW5nKCkpOwogI2Vu ZGlmCiAKICNpZiBFTkFCTEUoSU1BR0VfQU5BTFlTSVNfRU5IQU5DRU1FTlRTKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0g Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5tbQpp bmRleCBlMTJmOWNlM2YwZjNhNGIyYTVkMDA1MTVkY2EzOTE0YjYwNjJkOWFlLi44Mjk3N2I3YzY1 NmQ4ZTVjNjIwZjNlZmYyNWYyYWYxODEyY2VhOTBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5tbQpAQCAtMjU4LDcgKzI1 OCwxMCBAQCB2b2lkIFdlYkNvbnRleHRNZW51UHJveHlNYWM6OnNldHVwU2VydmljZXNNZW51KCkK ICAgICBbW1dLU2hhcmluZ1NlcnZpY2VQaWNrZXJEZWxlZ2F0ZSBzaGFyZWRTaGFyaW5nU2Vydmlj ZVBpY2tlckRlbGVnYXRlXSBzZXRTb3VyY2VGcmFtZTppbWFnZVJlY3RdOwogICAgIFtbV0tTaGFy aW5nU2VydmljZVBpY2tlckRlbGVnYXRlIHNoYXJlZFNoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdh dGVdIHNldEF0dGFjaG1lbnRJRDptX2NvbnRleHQuY29udHJvbGxlZEltYWdlQXR0YWNobWVudElE KCldOwogCi0gICAgbV9tZW51ID0gYWRvcHROUyhbW3BpY2tlciBtZW51XSBjb3B5XSk7CisgICAg aWYgKFtwaWNrZXIgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihzdGFuZGFyZFNoYXJlTWVu dUl0ZW0pXSkKKyAgICAgICAgbV9tZW51ID0gYWRvcHROUyhbW1twaWNrZXIgc3RhbmRhcmRTaGFy ZU1lbnVJdGVtXSBtZW51XSBjb3B5XSk7CisgICAgZWxzZQorICAgICAgICBtX21lbnUgPSBhZG9w dE5TKFtbcGlja2VyIG1lbnVdIGNvcHldKTsKIAogICAgIGlmICghaGFzQ29udHJvbGxlZEltYWdl KQogICAgICAgICBbbV9tZW51IHNldFNob3dzU3RhdGVDb2x1bW46WUVTXTsKQEAgLTQwNSw2ICs0 MDgsMTQgQEAgdm9pZCBXZWJDb250ZXh0TWVudVByb3h5TWFjOjpnZXRTaGFyZU1lbnVJdGVtKENv bXBsZXRpb25IYW5kbGVyPHZvaWQoTlNNZW51SXRlbQogICAgICAgICByZXR1cm47CiAgICAgfQog CisgICAgYXV0byBzaGFyaW5nU2VydmljZVBpY2tlciA9IGFkb3B0TlMoW1tOU1NoYXJpbmdTZXJ2 aWNlUGlja2VyIGFsbG9jXSBpbml0V2l0aEl0ZW1zOml0ZW1zLmdldCgpXSk7CisgICAgaWYgKFtz aGFyaW5nU2VydmljZVBpY2tlciByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHN0YW5kYXJk U2hhcmVNZW51SXRlbSldKSB7CisgICAgICAgIE5TTWVudUl0ZW0gKnNoYXJlTWVudUl0ZW0gPSBb c2hhcmluZ1NlcnZpY2VQaWNrZXIgc3RhbmRhcmRTaGFyZU1lbnVJdGVtXTsKKyAgICAgICAgc2hh cmVNZW51SXRlbS5pZGVudGlmaWVyID0gX1dLTWVudUl0ZW1JZGVudGlmaWVyU2hhcmVNZW51Owor ICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihzaGFyZU1lbnVJdGVtKTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKwogICAgIGdldFN0YW5kYXJkU2hhcmVNZW51SXRlbShpdGVtcy5nZXQoKSwgbWFr ZUJsb2NrUHRyKFtjb21wbGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIp LCBwcm90ZWN0ZWRUaGlzID0gUmVmIHsgKnRoaXMgfSwgdGhpc10oTlNNZW51SXRlbSAqaXRlbSkg bXV0YWJsZSB7CiAgICAgICAgIGlmICghaXRlbSkgewogICAgICAgICAgICAgY29tcGxldGlvbkhh bmRsZXIobmlsKTsK 452442 2022-02-17 15:55:22 -0800 2022-02-17 18:32:36 -0800 Patch bug-236806-20220217155521.patch text/plain 5469 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5OTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRlM2JkNTJhY2UyOGZl YjdlNDgwZjIxZTU3NDVmNTkyN2QyOThlOC4uZDZjOWU2OTg3MWE5Nzk0OTk3NTBlZDE3NzdiOTZl YWE2ZTU4MjhmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIyLTAyLTE3ICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFJlZmFjdG9y IHNoYXJlIG1lbnUgaXRlbSBwcmVzZW50YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjgwNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODg4 NTg2MDY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRpdHlhIEtlZXJ0aGkuCisKKyAgICAgICAg KiBwYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250 ZXh0TWVudUNvbnRyb2xsZXI6OnBvcHVsYXRlKToKKwogMjAyMi0wMi0xNSAgTXlsZXMgQy4gTWF4 ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJHUFVdIFVwZGF0ZSBJ RExzIGFuZCBzdHVicyB0byBsYXRlc3QgdmVyc2lvbiBvZiB0aGUgc3BlYwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvUEFML0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL1BBTC9DaGFuZ2VM b2cKaW5kZXggMjNjNDMwMWVmZmEzOTRiZTlhZWFhNWYwNGE4NWE5OTRiMGQ1OGIxYi4uODBjZjgz NjFhZDBjYjUxYTkyNWMzM2Y3OWU4ZWUwN2Y5NDg3M2E2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvUEFML0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9QQUwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTMgQEAKKzIwMjItMDItMTcgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5l eUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVmYWN0b3Igc2hhcmUgbWVudSBpdGVtIHByZXNlbnRh dGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2 ODA2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84ODg1ODYwNj4KKworICAgICAgICBSZXZpZXdl ZCBieSBBZGl0eWEgS2VlcnRoaS4KKworICAgICAgICAqIHBhbC9zcGkvbWFjL05TU2hhcmluZ1Nl cnZpY2VQaWNrZXJTUEkuaDoKKwogMjAyMi0wMi0xNSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4 ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJHUFVdIFVwZGF0ZSBJRExzIGFuZCBzdHVi cyB0byBsYXRlc3QgdmVyc2lvbiBvZiB0aGUgc3BlYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCA2YzU5ODkyYmEyMTdi NTkxMzNlOGQxZGM3M2E0NjUwZWZkMzY0YzBmLi5iMzBlYzU3MjZmODI2MTRiMmIyZDA2MzE1YjU4 MmQxODFiMGVhMzZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAyLTE3ICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFJlZmFjdG9y IHNoYXJlIG1lbnUgaXRlbSBwcmVzZW50YXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjgwNgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODg4 NTg2MDY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRpdHlhIEtlZXJ0aGkuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW06CisgICAgICAgIChXZWJL aXQ6OldlYkNvbnRleHRNZW51UHJveHlNYWM6OnNldHVwU2VydmljZXNNZW51KToKKyAgICAgICAg KFdlYktpdDo6V2ViQ29udGV4dE1lbnVQcm94eU1hYzo6Z2V0U2hhcmVNZW51SXRlbSk6CisKIDIw MjItMDItMTUgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAg ICAgICBbV2ViR1BVXSBVcGRhdGUgSURMcyBhbmQgc3R1YnMgdG8gbGF0ZXN0IHZlcnNpb24gb2Yg dGhlIHNwZWMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL21hYy9OU1No YXJpbmdTZXJ2aWNlUGlja2VyU1BJLmggYi9Tb3VyY2UvV2ViQ29yZS9QQUwvcGFsL3NwaS9tYWMv TlNTaGFyaW5nU2VydmljZVBpY2tlclNQSS5oCmluZGV4IGQzYjE5OTViMTVmNWEyNDNmNGM2NTI1 MWI5ZjMzNDRlZDE1NGZmMTEuLjMxYjQ5MGVjM2M2ZmQ1OGJmMTcyZGQ3NWZiZjM5Zjk2ZGFkYjc1 Y2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BBTC9wYWwvc3BpL21hYy9OU1NoYXJpbmdT ZXJ2aWNlUGlja2VyU1BJLmgKKysrIGIvU291cmNlL1dlYkNvcmUvUEFML3BhbC9zcGkvbWFjL05T U2hhcmluZ1NlcnZpY2VQaWNrZXJTUEkuaApAQCAtMjcsNiArMjcsMTAgQEAKIAogI2ltcG9ydCA8 QXBwS2l0L05TU2hhcmluZ1NlcnZpY2VfUHJpdmF0ZS5oPgogCitAaW50ZXJmYWNlIE5TU2hhcmlu Z1NlcnZpY2VQaWNrZXIgKFN0YWdpbmdfcjg4ODU1MDE3KQorLSAoTlNNZW51SXRlbSAqKXN0YW5k YXJkU2hhcmVNZW51SXRlbTsKK0BlbmQKKwogI2Vsc2UKIAogI2ltcG9ydCA8QXBwS2l0L05TU2hh cmluZ1NlcnZpY2UuaD4KQEAgLTQwLDYgKzQ0LDcgQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdl ciwgTlNTaGFyaW5nU2VydmljZVBpY2tlclN0eWxlKSB7CiAKIEBpbnRlcmZhY2UgTlNTaGFyaW5n U2VydmljZVBpY2tlciAoUHJpdmF0ZSkKIEBwcm9wZXJ0eSBOU1NoYXJpbmdTZXJ2aWNlUGlja2Vy U3R5bGUgc3R5bGU7CistIChOU01lbnVJdGVtICopc3RhbmRhcmRTaGFyZU1lbnVJdGVtOwogLSAo TlNNZW51ICopbWVudTsKIC0gKHZvaWQpZ2V0TWVudVdpdGhDb21wbGV0aW9uOih2b2lkKF4pKE5T TWVudSAqKSljb21wbGV0aW9uOwogLSAodm9pZCloaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9Db250ZXh0TWVudUNvbnRyb2xsZXIuY3BwCmluZGV4IGVmZjU3ZDk0Mzg3NmRjOTBjNjdlMjFl OTczNjA3ZjQ3MWNhNWZmMmUuLmYzMjg2NTVkOTRlNmEzMDZhMjU4NzFjZjIyYzM2YTQ3ZWY4OGZk N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGV4dE1lbnVDb250cm9sbGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRleHRNZW51Q29udHJvbGxlci5jcHAK QEAgLTg0MCw3ICs4NDAsNyBAQCB2b2lkIENvbnRleHRNZW51Q29udHJvbGxlcjo6cG9wdWxhdGUo KQogI2lmIFBMQVRGT1JNKEdUSykgfHwgUExBVEZPUk0oV0lOKQogICAgIENvbnRleHRNZW51SXRl bSBTaGFyZU1lbnVJdGVtOwogI2Vsc2UKLSAgICBDb250ZXh0TWVudUl0ZW0gU2hhcmVNZW51SXRl bShTdWJtZW51VHlwZSwgQ29udGV4dE1lbnVJdGVtVGFnU2hhcmVNZW51LCBlbXB0eVN0cmluZygp KTsKKyAgICBDb250ZXh0TWVudUl0ZW0gU2hhcmVNZW51SXRlbShBY3Rpb25UeXBlLCBDb250ZXh0 TWVudUl0ZW1UYWdTaGFyZU1lbnUsIGVtcHR5U3RyaW5nKCkpOwogI2VuZGlmCiAKICNpZiBFTkFC TEUoSU1BR0VfQU5BTFlTSVNfRU5IQU5DRU1FTlRTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0gYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5tbQppbmRleCBlMTJmOWNlM2Yw ZjNhNGIyYTVkMDA1MTVkY2EzOTE0YjYwNjJkOWFlLi44Mjk3N2I3YzY1NmQ4ZTVjNjIwZjNlZmYy NWYyYWYxODEyY2VhOTBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9tYWMv V2ViQ29udGV4dE1lbnVQcm94eU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9t YWMvV2ViQ29udGV4dE1lbnVQcm94eU1hYy5tbQpAQCAtMjU4LDcgKzI1OCwxMCBAQCB2b2lkIFdl YkNvbnRleHRNZW51UHJveHlNYWM6OnNldHVwU2VydmljZXNNZW51KCkKICAgICBbW1dLU2hhcmlu Z1NlcnZpY2VQaWNrZXJEZWxlZ2F0ZSBzaGFyZWRTaGFyaW5nU2VydmljZVBpY2tlckRlbGVnYXRl XSBzZXRTb3VyY2VGcmFtZTppbWFnZVJlY3RdOwogICAgIFtbV0tTaGFyaW5nU2VydmljZVBpY2tl ckRlbGVnYXRlIHNoYXJlZFNoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGVdIHNldEF0dGFjaG1l bnRJRDptX2NvbnRleHQuY29udHJvbGxlZEltYWdlQXR0YWNobWVudElEKCldOwogCi0gICAgbV9t ZW51ID0gYWRvcHROUyhbW3BpY2tlciBtZW51XSBjb3B5XSk7CisgICAgaWYgKFtwaWNrZXIgcmVz cG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihzdGFuZGFyZFNoYXJlTWVudUl0ZW0pXSkKKyAgICAg ICAgbV9tZW51ID0gYWRvcHROUyhbW1twaWNrZXIgc3RhbmRhcmRTaGFyZU1lbnVJdGVtXSBtZW51 XSBjb3B5XSk7CisgICAgZWxzZQorICAgICAgICBtX21lbnUgPSBhZG9wdE5TKFtbcGlja2VyIG1l bnVdIGNvcHldKTsKIAogICAgIGlmICghaGFzQ29udHJvbGxlZEltYWdlKQogICAgICAgICBbbV9t ZW51IHNldFNob3dzU3RhdGVDb2x1bW46WUVTXTsKQEAgLTQwNSw2ICs0MDgsMTQgQEAgdm9pZCBX ZWJDb250ZXh0TWVudVByb3h5TWFjOjpnZXRTaGFyZU1lbnVJdGVtKENvbXBsZXRpb25IYW5kbGVy PHZvaWQoTlNNZW51SXRlbQogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgYXV0byBzaGFy aW5nU2VydmljZVBpY2tlciA9IGFkb3B0TlMoW1tOU1NoYXJpbmdTZXJ2aWNlUGlja2VyIGFsbG9j XSBpbml0V2l0aEl0ZW1zOml0ZW1zLmdldCgpXSk7CisgICAgaWYgKFtzaGFyaW5nU2VydmljZVBp Y2tlciByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHN0YW5kYXJkU2hhcmVNZW51SXRlbSld KSB7CisgICAgICAgIE5TTWVudUl0ZW0gKnNoYXJlTWVudUl0ZW0gPSBbc2hhcmluZ1NlcnZpY2VQ aWNrZXIgc3RhbmRhcmRTaGFyZU1lbnVJdGVtXTsKKyAgICAgICAgc2hhcmVNZW51SXRlbS5pZGVu dGlmaWVyID0gX1dLTWVudUl0ZW1JZGVudGlmaWVyU2hhcmVNZW51OworICAgICAgICBjb21wbGV0 aW9uSGFuZGxlcihzaGFyZU1lbnVJdGVtKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAg IGdldFN0YW5kYXJkU2hhcmVNZW51SXRlbShpdGVtcy5nZXQoKSwgbWFrZUJsb2NrUHRyKFtjb21w bGV0aW9uSGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpLCBwcm90ZWN0ZWRUaGlz ID0gUmVmIHsgKnRoaXMgfSwgdGhpc10oTlNNZW51SXRlbSAqaXRlbSkgbXV0YWJsZSB7CiAgICAg ICAgIGlmICghaXRlbSkgewogICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIobmlsKTsK