130437 2014-03-18 17:41:05 -0700 Filter out editable services from image menu for non-contenteditable images 2014-03-19 13:13:13 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac All RESOLVED FIXED InRadar P2 Normal --- 1 beidson beidson thorton oldest_to_newest 991965 0 beidson 2014-03-18 17:41:05 -0700 Filter out editable services from image menu for non-contenteditable images In radar <rdar://problem/16319645> 992133 1 227188 beidson 2014-03-19 09:40:55 -0700 Created attachment 227188 Patch v1 992201 2 227188 thorton 2014-03-19 12:18:47 -0700 Comment on attachment 227188 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=227188&action=review > Source/WebKit/mac/Misc/WebSharingServicePickerController.mm:55 > +- (instancetype)initWithImage:(NSImage *)image includeEditorServices:(BOOL)includeEditorServices menuClient:(WebContextMenuClient*)menuClient Is the list of things to exclude likely to expand? If so, we might want to consider doing something different here. 992208 3 beidson 2014-03-19 12:26:15 -0700 (In reply to comment #2) > (From update of attachment 227188 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=227188&action=review > > > Source/WebKit/mac/Misc/WebSharingServicePickerController.mm:55 > > +- (instancetype)initWithImage:(NSImage *)image includeEditorServices:(BOOL)includeEditorServices menuClient:(WebContextMenuClient*)menuClient > > Is the list of things to exclude likely to expand? If so, we might want to consider doing something different here. I don't predict the list expanding. That said, I'm comfortable with the principal of doing it this way for the one known thing, then if a second thing comes up later we can reassess. 992220 4 thorton 2014-03-19 12:53:29 -0700 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 227188 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=227188&action=review > > > > > Source/WebKit/mac/Misc/WebSharingServicePickerController.mm:55 > > > +- (instancetype)initWithImage:(NSImage *)image includeEditorServices:(BOOL)includeEditorServices menuClient:(WebContextMenuClient*)menuClient > > > > Is the list of things to exclude likely to expand? If so, we might want to consider doing something different here. > > I don't predict the list expanding. > > That said, I'm comfortable with the principal of doing it this way for the one known thing, then if a second thing comes up later we can reassess. Yeah, that's fine. 992223 5 beidson 2014-03-19 13:13:13 -0700 https://trac.webkit.org/changeset/165911 227188 2014-03-19 09:40:55 -0700 2014-03-19 12:18:43 -0700 Patch v1 patch text/plain 10959 beidson ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3NGNiYWNhYy4uMWFhMTUwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEy IEBACisyMDE0LTAzLTE5ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAg ICAgICBGaWx0ZXIgb3V0IGVkaXRhYmxlIHNlcnZpY2VzIGZyb20gaW1hZ2UgbWVudSBmb3Igbm9u LWNvbnRlbnRlZGl0YWJsZSBpbWFnZXMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE2MzE5NjQ1 PiBhbmQgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDQzNworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZS5l eHAuaW46CisKIDIwMTQtMDMtMTggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNv bT4KIAogICAgICAgICBGaXggYSB0cml2aWFsIEZJWE1FCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLmV4cC5pbiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCmluZGV4 IDcwZTAyODIuLmVkODAxNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhw LmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCkBAIC0xMDE3LDYgKzEwMTcs NyBAQCBfX1pON1dlYkNvcmU0Tm9kZTExcmVtb3ZlQ2hpbGRFUFMwX1JpCiBfX1pON1dlYkNvcmU0 Tm9kZTEyaW5zZXJ0QmVmb3JlRU4zV1RGMTBQYXNzUmVmUHRySVMwX0VFUFMwX1JpCiBfX1pON1dl YkNvcmU0Tm9kZTE0cmVtb3ZlZExhc3RSZWZFdgogX19aTjdXZWJDb3JlNE5vZGUxNHNldFRleHRD b250ZW50RVJLTjNXVEY2U3RyaW5nRVJpCitfX1pON1dlYkNvcmU0Tm9kZTE3aXNDb250ZW50RWRp dGFibGVFTlMwXzIyVXNlclNlbGVjdEFsbFRyZWF0bWVudEUKIF9fWk43V2ViQ29yZTROb2RlMTdz dG9wSWdub3JpbmdMZWFrc0V2CiBfX1pON1dlYkNvcmU0Tm9kZTE4c3RhcnRJZ25vcmluZ0xlYWtz RXYKIF9fWk43V2ViQ29yZTROb2RlMTlzZXROZWVkc1N0eWxlUmVjYWxjRU5TXzE1U3R5bGVDaGFu Z2VUeXBlRQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IGI4M2I0ZWIuLjBjMmNiNmIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxNC0wMy0xOSAgQnJhZHkgRWlkc29uICA8YmVpZHNv bkBhcHBsZS5jb20+CisKKyAgICAgICAgRmlsdGVyIG91dCBlZGl0YWJsZSBzZXJ2aWNlcyBmcm9t IGltYWdlIG1lbnUgZm9yIG5vbi1jb250ZW50ZWRpdGFibGUgaW1hZ2VzCisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS8xNjMxOTY0NT4gYW5kIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzA0MzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIE1pc2MvV2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyLmg6CisgICAg ICAgICogTWlzYy9XZWJTaGFyaW5nU2VydmljZVBpY2tlckNvbnRyb2xsZXIubW06CisgICAgICAg ICgtW1dlYlNoYXJpbmdTZXJ2aWNlUGlja2VyQ29udHJvbGxlciBzaGFyaW5nU2VydmljZVBpY2tl cjpzaGFyaW5nU2VydmljZXNGb3JJdGVtczptYXNrOnByb3Bvc2VkU2hhcmluZ1NlcnZpY2VzOl0p OgorICAgICAgICAgIEZpbHRlciBvdXQgZWRpdGluZyBzZXJ2aWNlcyBiYXNlZCBvbiB0aGUgaW5j bHVkZUVkaXRvclNlcnZpY2VzIGZsYWcuCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViQ29u dGV4dE1lbnVDbGllbnQubW06CisgICAgICAgIChXZWJDb250ZXh0TWVudUNsaWVudDo6Y29udGV4 dE1lbnVGb3JFdmVudCk6CisKIDIwMTQtMDMtMTcgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxl LmNvbT4KIAogICAgICAgICBNb3JlIEZUTCBlbmFibGluZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvbWFjL01pc2MvV2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyLmggYi9Tb3Vy Y2UvV2ViS2l0L21hYy9NaXNjL1dlYlNoYXJpbmdTZXJ2aWNlUGlja2VyQ29udHJvbGxlci5oCmlu ZGV4IDIyMGYwZjIuLmQwOWI4NGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL01pc2Mv V2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9t YWMvTWlzYy9XZWJTaGFyaW5nU2VydmljZVBpY2tlckNvbnRyb2xsZXIuaApAQCAtMzYsOSArMzYs MTAgQEAgY2xhc3MgV2ViQ29udGV4dE1lbnVDbGllbnQ7CiBAaW50ZXJmYWNlIFdlYlNoYXJpbmdT ZXJ2aWNlUGlja2VyQ29udHJvbGxlciA6IE5TT2JqZWN0IDxOU1NoYXJpbmdTZXJ2aWNlRGVsZWdh dGUsIE5TU2hhcmluZ1NlcnZpY2VQaWNrZXJEZWxlZ2F0ZT4gewogICAgIFdlYkNvbnRleHRNZW51 Q2xpZW50KiBfbWVudUNsaWVudDsKICAgICBSZXRhaW5QdHI8TlNTaGFyaW5nU2VydmljZVBpY2tl cj4gX3BpY2tlcjsKKyAgICBCT09MIF9pbmNsdWRlRWRpdG9yU2VydmljZXM7CiB9CiAKLS0gKGlu c3RhbmNldHlwZSlpbml0V2l0aEltYWdlOihOU0ltYWdlICopaW1hZ2UgbWVudUNsaWVudDooV2Vi Q29udGV4dE1lbnVDbGllbnQqKW1lbnVDbGllbnQ7CistIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhJ bWFnZTooTlNJbWFnZSAqKWltYWdlIGluY2x1ZGVFZGl0b3JTZXJ2aWNlczooQk9PTClpbmNsdWRl RWRpdG9yU2VydmljZXMgbWVudUNsaWVudDooV2ViQ29udGV4dE1lbnVDbGllbnQqKW1lbnVDbGll bnQ7CiAtIChOU01lbnUgKiltZW51OwogCiBAZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L21hYy9NaXNjL1dlYlNoYXJpbmdTZXJ2aWNlUGlja2VyQ29udHJvbGxlci5tbSBiL1NvdXJjZS9X ZWJLaXQvbWFjL01pc2MvV2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyLm1tCmluZGV4 IDVkMGE0Y2UuLjAyNWFhZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL01pc2MvV2Vi U2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFj L01pc2MvV2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyLm1tCkBAIC01Miw3ICs1Miw3 IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBAaW1wbGVtZW50YXRpb24gV2ViU2hhcmlu Z1NlcnZpY2VQaWNrZXJDb250cm9sbGVyCiAKLS0gKGluc3RhbmNldHlwZSlpbml0V2l0aEltYWdl OihOU0ltYWdlICopaW1hZ2UgbWVudUNsaWVudDooV2ViQ29udGV4dE1lbnVDbGllbnQqKW1lbnVD bGllbnQKKy0gKGluc3RhbmNldHlwZSlpbml0V2l0aEltYWdlOihOU0ltYWdlICopaW1hZ2UgaW5j bHVkZUVkaXRvclNlcnZpY2VzOihCT09MKWluY2x1ZGVFZGl0b3JTZXJ2aWNlcyBtZW51Q2xpZW50 OihXZWJDb250ZXh0TWVudUNsaWVudCopbWVudUNsaWVudAogewogICAgIGlmICghKHNlbGYgPSBb c3VwZXIgaW5pdF0pKQogICAgICAgICByZXR1cm4gbmlsOwpAQCAtNjEsNiArNjEsNyBAQCAtIChp bnN0YW5jZXR5cGUpaW5pdFdpdGhJbWFnZTooTlNJbWFnZSAqKWltYWdlIG1lbnVDbGllbnQ6KFdl YkNvbnRleHRNZW51Q2xpZW50KgogICAgIFtfcGlja2VyIHNldFN0eWxlOk5TU2hhcmluZ1NlcnZp Y2VQaWNrZXJTdHlsZVJvbGxvdmVyXTsKICAgICBbX3BpY2tlciBzZXREZWxlZ2F0ZTpzZWxmXTsK IAorICAgIF9pbmNsdWRlRWRpdG9yU2VydmljZXMgPSBpbmNsdWRlRWRpdG9yU2VydmljZXM7CiAg ICAgX21lbnVDbGllbnQgPSBtZW51Q2xpZW50OwogCiAgICAgcmV0dXJuIHNlbGY7CkBAIC04MSw2 ICs4MiwyMiBAQCAtIChOU01lbnUgKiltZW51CiAKICNwcmFnbWEgbWFyayBOU1NoYXJpbmdTZXJ2 aWNlUGlja2VyRGVsZWdhdGUgbWV0aG9kcwogCisKKy0gKE5TQXJyYXkgKilzaGFyaW5nU2Vydmlj ZVBpY2tlcjooTlNTaGFyaW5nU2VydmljZVBpY2tlciAqKXNoYXJpbmdTZXJ2aWNlUGlja2VyIHNo YXJpbmdTZXJ2aWNlc0Zvckl0ZW1zOihOU0FycmF5ICopaXRlbXMgbWFzazooTlNTaGFyaW5nU2Vy dmljZU1hc2spbWFzayBwcm9wb3NlZFNoYXJpbmdTZXJ2aWNlczooTlNBcnJheSAqKXByb3Bvc2Vk U2VydmljZXMKK3sKKyAgICBpZiAoX2luY2x1ZGVFZGl0b3JTZXJ2aWNlcykKKyAgICAgICAgcmV0 dXJuIHByb3Bvc2VkU2VydmljZXM7CisgICAgICAgIAorICAgIE5TTXV0YWJsZUFycmF5ICpzZXJ2 aWNlcyA9IFtbTlNNdXRhYmxlQXJyYXkgYWxsb2NdIGluaXRXaXRoQ2FwYWNpdHk6W3Byb3Bvc2Vk U2VydmljZXMgY291bnRdXTsKKyAgICAKKyAgICBmb3IgKE5TU2hhcmluZ1NlcnZpY2UgKnNlcnZp Y2UgaW4gcHJvcG9zZWRTZXJ2aWNlcykgeworICAgICAgICBpZiAoc2VydmljZS50eXBlICE9IE5T U2hhcmluZ1NlcnZpY2VUeXBlRWRpdG9yKQorICAgICAgICAgICAgW3NlcnZpY2VzIGFkZE9iamVj dDpzZXJ2aWNlXTsKKyAgICB9CisgICAgCisgICAgcmV0dXJuIHNlcnZpY2VzOworfQorCiAtIChp ZCA8TlNTaGFyaW5nU2VydmljZURlbGVnYXRlPilzaGFyaW5nU2VydmljZVBpY2tlcjooTlNTaGFy aW5nU2VydmljZVBpY2tlciAqKXNoYXJpbmdTZXJ2aWNlUGlja2VyIGRlbGVnYXRlRm9yU2hhcmlu Z1NlcnZpY2U6KE5TU2hhcmluZ1NlcnZpY2UgKilzaGFyaW5nU2VydmljZQogewogICAgIHJldHVy biBzZWxmOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2Vi Q29udGV4dE1lbnVDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9X ZWJDb250ZXh0TWVudUNsaWVudC5tbQppbmRleCBhNjU0YzY2Li4yNzE1NDAwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5t bQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNs aWVudC5tbQpAQCAtMzYyLDcgKzM2MiwxMCBAQCBOU01lbnUgKldlYkNvbnRleHRNZW51Q2xpZW50 Ojpjb250ZXh0TWVudUZvckV2ZW50KE5TRXZlbnQgKmV2ZW50LCBOU1ZpZXcgKnZpZXcpCiAKICNp ZiBFTkFCTEUoSU1BR0VfQ09OVFJPTFMpCiAgICAgaWYgKEltYWdlKiBpbWFnZSA9IHBhZ2UtPmNv bnRleHRNZW51Q29udHJvbGxlcigpLmNvbnRleHQoKS5jb250cm9sbGVkSW1hZ2UoKSkgewotICAg ICAgICBtX3NoYXJpbmdTZXJ2aWNlUGlja2VyQ29udHJvbGxlciA9IGFkb3B0TlMoW1tXZWJTaGFy aW5nU2VydmljZVBpY2tlckNvbnRyb2xsZXIgYWxsb2NdIGluaXRXaXRoSW1hZ2U6aW1hZ2UtPmdl dE5TSW1hZ2UoKSBtZW51Q2xpZW50OnRoaXNdKTsKKyAgICAgICAgQVNTRVJUKHBhZ2UtPmNvbnRl eHRNZW51Q29udHJvbGxlcigpLmNvbnRleHQoKS5oaXRUZXN0UmVzdWx0KCkuaW5uZXJOb2RlKCkp OworICAgICAgICBib29sIGlzQ29udGVudEVkaXRhYmxlID0gcGFnZS0+Y29udGV4dE1lbnVDb250 cm9sbGVyKCkuY29udGV4dCgpLmhpdFRlc3RSZXN1bHQoKS5pbm5lck5vZGUoKS0+aXNDb250ZW50 RWRpdGFibGUoKTsKKyAgICAgICAgbV9zaGFyaW5nU2VydmljZVBpY2tlckNvbnRyb2xsZXIgPSBh ZG9wdE5TKFtbV2ViU2hhcmluZ1NlcnZpY2VQaWNrZXJDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0 aEltYWdlOmltYWdlLT5nZXROU0ltYWdlKCkgaW5jbHVkZUVkaXRvclNlcnZpY2VzOmlzQ29udGVu dEVkaXRhYmxlIG1lbnVDbGllbnQ6dGhpc10pOworICAgICAgICAKICAgICAgICAgcmV0dXJuIFtt X3NoYXJpbmdTZXJ2aWNlUGlja2VyQ29udHJvbGxlciBtZW51XTsKICAgICB9CiAjZW5kaWYKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwppbmRleCAyZDU2YzU5Li4wNzRlNTg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAK KzIwMTQtMDMtMTkgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAg IEZpbHRlciBvdXQgZWRpdGFibGUgc2VydmljZXMgZnJvbSBpbWFnZSBtZW51IGZvciBub24tY29u dGVudGVkaXRhYmxlIGltYWdlcworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTYzMTk2NDU+IGFu ZCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwNDM3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFj L1dlYkNvbnRleHRNZW51UHJveHlNYWMuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkNv bnRleHRNZW51UHJveHlNYWMubW06CisgICAgICAgICgtW1dLU2hhcmluZ1NlcnZpY2VQaWNrZXJE ZWxlZ2F0ZSBzZXRJbmNsdWRlRWRpdG9yU2VydmljZXM6XSk6CisgICAgICAgICgtW1dLU2hhcmlu Z1NlcnZpY2VQaWNrZXJEZWxlZ2F0ZSBzaGFyaW5nU2VydmljZVBpY2tlcjpzaGFyaW5nU2Vydmlj ZXNGb3JJdGVtczptYXNrOnByb3Bvc2VkU2hhcmluZ1NlcnZpY2VzOl0pOgorICAgICAgICAgIEZp bHRlciBvdXQgZWRpdGluZyBzZXJ2aWNlcyBiYXNlZCBvbiB0aGUgaW5jbHVkZUVkaXRvclNlcnZp Y2VzIGZsYWcuCisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHRNZW51UHJveHlNYWM6OnNldHVw SW1hZ2VTZXJ2aWNlc01lbnUpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0TWVudVByb3h5 TWFjOjpwb3B1bGF0ZSk6CisKIDIwMTQtMDMtMTggIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBw bGUuY29tPgogCiAgICAgICAgIE1ha2UgaW1hZ2UgY29udHJvbHMgbWVudSB3b3JrIGluIFdLMgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWVudVBy b3h5TWFjLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJv eHlNYWMuaAppbmRleCA1YmE5YmI0Li5iODc0OTM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMuaApAQCAtNjYsNyArNjYs NyBAQCBwcml2YXRlOgogICAgIHZvaWQgcG9wdWxhdGUoY29uc3QgVmVjdG9yPFdlYkNvbnRleHRN ZW51SXRlbURhdGE+JiwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYpOwogCiAjaWYgRU5B QkxFKElNQUdFX0NPTlRST0xTKQotICAgIHZvaWQgc2V0dXBJbWFnZVNlcnZpY2VzTWVudShTaGFy ZWFibGVCaXRtYXAmKTsKKyAgICB2b2lkIHNldHVwSW1hZ2VTZXJ2aWNlc01lbnUoU2hhcmVhYmxl Qml0bWFwJiwgYm9vbCBpbmNsdWRlRWRpdG9yU2VydmljZXMpOwogI2VuZGlmCiAKICAgICBSZXRh aW5QdHI8TlNQb3BVcEJ1dHRvbkNlbGw+IG1fcG9wdXA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0gYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNZW51UHJveHlNYWMubW0KaW5kZXggODZlYjRj My4uMmIxOWJlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJD b250ZXh0TWVudVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMv V2ViQ29udGV4dE1lbnVQcm94eU1hYy5tbQpAQCAtMTMxLDEyICsxMzEsMTQgQEAgQGVuZAogQGlu dGVyZmFjZSBXS1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGUgOiBOU09iamVjdCA8TlNTaGFy aW5nU2VydmljZURlbGVnYXRlLCBOU1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGU+IHsKICAg ICBXZWJLaXQ6OldlYkNvbnRleHRNZW51UHJveHlNYWMqIF9tZW51UHJveHk7CiAgICAgUmV0YWlu UHRyPE5TU2hhcmluZ1NlcnZpY2VQaWNrZXI+IF9waWNrZXI7CisgICAgQk9PTCBfaW5jbHVkZUVk aXRvclNlcnZpY2VzOwogfQogCiArIChXS1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGUgKilz aGFyZWRTaGFyaW5nU2VydmljZVBpY2tlckRlbGVnYXRlOwogLSAoV2ViS2l0OjpXZWJDb250ZXh0 TWVudVByb3h5TWFjKiltZW51UHJveHk7CiAtICh2b2lkKXNldE1lbnVQcm94eTooV2ViS2l0OjpX ZWJDb250ZXh0TWVudVByb3h5TWFjKiltZW51UHJveHk7CiAtICh2b2lkKXNldFBpY2tlcjooTlNT aGFyaW5nU2VydmljZVBpY2tlciAqKXBpY2tlcjsKKy0gKHZvaWQpc2V0SW5jbHVkZUVkaXRvclNl cnZpY2VzOihCT09MKWluY2x1ZGVFZGl0b3JTZXJ2aWNlczsKIEBlbmQKIAogLy8gRklYTUU6IFdl IHByb2JhYmx5IG5lZWQgdG8gaGFuZyBvbiB0aGUgcGlja2VyIGl0c2VsZiB1bnRpbCB0aGUgY29u dGV4dCBtZW51IG9wZXJhdGlvbiBpcyBkb25lLCBhbmQgdGhpcyBvYmplY3Qgd2lsbCBwcm9iYWJs eSBkbyB0aGF0LgpAQCAtMTYyLDYgKzE2NCwyNiBAQCAtICh2b2lkKXNldFBpY2tlcjooTlNTaGFy aW5nU2VydmljZVBpY2tlciAqKXBpY2tlcgogICAgIF9waWNrZXIgPSBwaWNrZXI7CiB9CiAKKy0g KHZvaWQpc2V0SW5jbHVkZUVkaXRvclNlcnZpY2VzOihCT09MKWluY2x1ZGVFZGl0b3JTZXJ2aWNl cworeworICAgIF9pbmNsdWRlRWRpdG9yU2VydmljZXMgPSBpbmNsdWRlRWRpdG9yU2VydmljZXM7 Cit9CisKKy0gKE5TQXJyYXkgKilzaGFyaW5nU2VydmljZVBpY2tlcjooTlNTaGFyaW5nU2Vydmlj ZVBpY2tlciAqKXNoYXJpbmdTZXJ2aWNlUGlja2VyIHNoYXJpbmdTZXJ2aWNlc0Zvckl0ZW1zOihO U0FycmF5ICopaXRlbXMgbWFzazooTlNTaGFyaW5nU2VydmljZU1hc2spbWFzayBwcm9wb3NlZFNo YXJpbmdTZXJ2aWNlczooTlNBcnJheSAqKXByb3Bvc2VkU2VydmljZXMKK3sKKyAgICBpZiAoX2lu Y2x1ZGVFZGl0b3JTZXJ2aWNlcykKKyAgICAgICAgcmV0dXJuIHByb3Bvc2VkU2VydmljZXM7Cisg ICAgICAgIAorICAgIE5TTXV0YWJsZUFycmF5ICpzZXJ2aWNlcyA9IFtbTlNNdXRhYmxlQXJyYXkg YWxsb2NdIGluaXRXaXRoQ2FwYWNpdHk6W3Byb3Bvc2VkU2VydmljZXMgY291bnRdXTsKKyAgICAK KyAgICBmb3IgKE5TU2hhcmluZ1NlcnZpY2UgKnNlcnZpY2UgaW4gcHJvcG9zZWRTZXJ2aWNlcykg eworICAgICAgICBpZiAoc2VydmljZS50eXBlICE9IE5TU2hhcmluZ1NlcnZpY2VUeXBlRWRpdG9y KQorICAgICAgICAgICAgW3NlcnZpY2VzIGFkZE9iamVjdDpzZXJ2aWNlXTsKKyAgICB9CisgICAg CisgICAgcmV0dXJuIHNlcnZpY2VzOworfQorCiAtIChpZCA8TlNTaGFyaW5nU2VydmljZURlbGVn YXRlPilzaGFyaW5nU2VydmljZVBpY2tlcjooTlNTaGFyaW5nU2VydmljZVBpY2tlciAqKXNoYXJp bmdTZXJ2aWNlUGlja2VyIGRlbGVnYXRlRm9yU2hhcmluZ1NlcnZpY2U6KE5TU2hhcmluZ1NlcnZp Y2UgKilzaGFyaW5nU2VydmljZQogewogICAgIHJldHVybiBzZWxmOwpAQCAtMjc0LDcgKzI5Niw3 IEBAIHN0YXRpYyBWZWN0b3I8UmV0YWluUHRyPE5TTWVudUl0ZW0+PiBuc01lbnVJdGVtVmVjdG9y KGNvbnN0IFZlY3RvcjxXZWJDb250ZXh0TWVuCiB9CiAKICNpZiBFTkFCTEUoSU1BR0VfQ09OVFJP TFMpCi12b2lkIFdlYkNvbnRleHRNZW51UHJveHlNYWM6OnNldHVwSW1hZ2VTZXJ2aWNlc01lbnUo U2hhcmVhYmxlQml0bWFwJiBpbWFnZSkKK3ZvaWQgV2ViQ29udGV4dE1lbnVQcm94eU1hYzo6c2V0 dXBJbWFnZVNlcnZpY2VzTWVudShTaGFyZWFibGVCaXRtYXAmIGltYWdlLCBib29sIGluY2x1ZGVF ZGl0b3JTZXJ2aWNlcykKIHsKICAgICBSZXRhaW5QdHI8Q0dJbWFnZVJlZj4gY2dJbWFnZSA9IGlt YWdlLm1ha2VDR0ltYWdlKCk7CiAgICAgUmV0YWluUHRyPE5TSW1hZ2U+IG5zSW1hZ2UgPSBhZG9w dE5TKFtbTlNJbWFnZSBhbGxvY10gaW5pdFdpdGhDR0ltYWdlOmNnSW1hZ2UuZ2V0KCkgc2l6ZTpp bWFnZS5zaXplKCldKTsKQEAgLTI4Myw2ICszMDUsNyBAQCB2b2lkIFdlYkNvbnRleHRNZW51UHJv eHlNYWM6OnNldHVwSW1hZ2VTZXJ2aWNlc01lbnUoU2hhcmVhYmxlQml0bWFwJiBpbWFnZSkKICAg ICBbcGlja2VyIHNldFN0eWxlOk5TU2hhcmluZ1NlcnZpY2VQaWNrZXJTdHlsZVJvbGxvdmVyXTsK ICAgICBbcGlja2VyIHNldERlbGVnYXRlOltXS1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGUg c2hhcmVkU2hhcmluZ1NlcnZpY2VQaWNrZXJEZWxlZ2F0ZV1dOwogICAgIFtbV0tTaGFyaW5nU2Vy dmljZVBpY2tlckRlbGVnYXRlIHNoYXJlZFNoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGVdIHNl dFBpY2tlcjpwaWNrZXIuZ2V0KCldOworICAgIFtbV0tTaGFyaW5nU2VydmljZVBpY2tlckRlbGVn YXRlIHNoYXJlZFNoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGVdIHNldEluY2x1ZGVFZGl0b3JT ZXJ2aWNlczppbmNsdWRlRWRpdG9yU2VydmljZXNdOwogCiAgICAgbV9zZXJ2aWNlc01lbnUgPSBb cGlja2VyIG1lbnVdOwogfQpAQCAtMjk4LDcgKzMyMSw3IEBAIHZvaWQgV2ViQ29udGV4dE1lbnVQ cm94eU1hYzo6cG9wdWxhdGUoY29uc3QgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+JiBp dGVtCiB7CiAjaWYgRU5BQkxFKElNQUdFX0NPTlRST0xTKQogICAgIGlmIChSZWZQdHI8U2hhcmVh YmxlQml0bWFwPiBpbWFnZSA9IFNoYXJlYWJsZUJpdG1hcDo6Y3JlYXRlKGNvbnRleHQuY29udHJv bGxlZEltYWdlSGFuZGxlKCkpKSB7Ci0gICAgICAgIHNldHVwSW1hZ2VTZXJ2aWNlc01lbnUoKmlt YWdlKTsKKyAgICAgICAgc2V0dXBJbWFnZVNlcnZpY2VzTWVudSgqaW1hZ2UsIGNvbnRleHQud2Vi SGl0VGVzdFJlc3VsdERhdGEoKS5pc0NvbnRlbnRFZGl0YWJsZSk7CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAjZW5kaWYK