199301 2019-06-27 17:42:03 -0700 Provide overrides for UIKit's suggested actions in UIContextMenuInteraction 2019-06-27 18:06:51 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino thorton webkit-bug-importer oldest_to_newest 1548679 0 dino 2019-06-27 17:42:03 -0700 Provide overrides for UIKit's suggested actions in UIContextMenuInteraction 1548680 1 webkit-bug-importer 2019-06-27 17:43:42 -0700 <rdar://problem/52297380> 1548681 2 373073 dino 2019-06-27 17:47:36 -0700 Created attachment 373073 Patch 1548682 3 373073 thorton 2019-06-27 17:50:15 -0700 Comment on attachment 373073 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373073&action=review > Source/WebKit/Platform/spi/ios/UIKitSPI.h:1191 > -@interface UIContextMenuConfiguration (NeededUntil51288435Fixed) > +@interface UIContextMenuConfiguration (NeededUntil52295535Fixed) oO that's quite the coincidence > Source/WebKit/Platform/spi/ios/UIKitSPI.h:1202 > +// FIXME: I don't think this Radar is correct. 51288435 is about something else. Seems like a silly comment :) Just fix it? 1548687 4 373073 dino 2019-06-27 18:05:24 -0700 Comment on attachment 373073 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=373073&action=review >> Source/WebKit/Platform/spi/ios/UIKitSPI.h:1191 >> +@interface UIContextMenuConfiguration (NeededUntil52295535Fixed) > > oO that's quite the coincidence Haha. They fixed the original radar, which helped a bit, but not completely, so I filed a new one. >> Source/WebKit/Platform/spi/ios/UIKitSPI.h:1202 >> +// FIXME: I don't think this Radar is correct. 51288435 is about something else. > > Seems like a silly comment :) Just fix it? It seems like there was never a radar filed for this. I just created one. 1548688 5 dino 2019-06-27 18:06:51 -0700 Committed r246912: <https://trac.webkit.org/changeset/246912> 373073 2019-06-27 17:47:36 -0700 2019-06-27 17:50:15 -0700 Patch bug-199301-20190628104735.patch text/plain 11921 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2OTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGY5ZDliMTczMTg3NWJlMTdl OTRhNTkyYjAzYzU0OGVjZWFlYTU2OTkuLmNkYmU3MDM2OWI1MGVmOTBkOWUwODNjZGRmMWU3MWQ0 NmE0MjA3ZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTktMDYtMjcgIERlYW4gSmFj a3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAgICAgIFByb3ZpZGUgb3ZlcnJpZGVzIGZvciBV SUtpdCdzIHN1Z2dlc3RlZCBhY3Rpb25zIGluIFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MzAxCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS81MjI5NzM4MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXZSB3ZXJlIHByZXZpb3VzbHkgd3JhcHBpbmcgdGhlIGFj dGlvbk1lbnVQcm92aWRlciB3aXRoIG91ciBvd24gYmxvY2sKKyAgICAgICAgaW4gb3JkZXIgdG8g ZW5zdXJlIHRoZSBjb3JyZWN0IHN1Z2dlc3RlZEFjdGlvbnMgd2VyZSBwYXNzZWQgdG8gdGhlIHBy b3ZpZGVyLgorICAgICAgICBVSUtpdCBhZGRlZCBBUEkgZm9yIHVzIHRvIG92ZXJyaWRlIHRoZSBh Y3Rpb25zIHNlcGFyYXRlbHkuCisKKyAgICAgICAgVW5mb3J0dW5hdGVseSB3ZSBjYW4ndCBxdWl0 ZSB5ZXQgZ2V0IHJpZCBvZiBvdXIgYWNjZXNzIGludG8gdGhlCisgICAgICAgIFVJQ29udGV4dE1l bnVDb25maWd1cmF0aW9uLCBiZWNhdXNlIHdlIHN0aWxsIG5lZWQgdG8gb3ZlcnJpZGUgdGhlIHBy ZXZpZXcKKyAgICAgICAgaGFuZGxlciBpbiB0aGUgY2FzZSB3aGVyZSB0aGUgdXNlciBkb2VzIG5v dCB3YW50IGxpbmsgcHJldmlld3MuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9zcGkvaW9zL1VJS2l0 U1BJLmg6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToK KyAgICAgICAgKC1bV0tDb250ZW50VmlldyBjb250aW51ZUNvbnRleHRNZW51SW50ZXJhY3Rpb246 XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2NvbnRleHRNZW51SW50ZXJhY3Rpb246b3Zl cnJpZGVTdWdnZXN0ZWRBY3Rpb25zRm9yQ29uZmlndXJhdGlvbjpdKToKKyAgICAgICAgSW1wbGVt ZW50IHRoZSBuZXcgZGVsZWdhdGUgU1BJIHRvIHByb3ZpZGUgb3VyIG93biBhY3Rpb25zLgorCiAy MDE5LTA2LTI3ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBb aU9TXSBTZWxlY3QgYWxsIHdpdGggZXhpc3RpbmcgcmFuZ2Ugc2VsZWN0aW9uIHJlcGxhY2VzIHJh bmdlIGluc3RlYWQgb2Ygc2VsZWN0aW5nIGFsbCB0ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0v c3BpL2lvcy9VSUtpdFNQSS5oCmluZGV4IDEzMzE1YWMzYmU3MjhmYTZjNGMxZDRmYzM3NzUzZTVi YmIwZGJmZjYuLjRjY2YyMGU3Y2E4MTMxYjY3YWJmMDllMTVmZDFkN2Y2YjYwOTdiMDMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCkBAIC04OSw2ICs4OSw5IEBA CiAjaWYgSEFWRShMSU5LX1BSRVZJRVcpCiAjaW1wb3J0IDxVSUtpdC9VSVByZXZpZXdBY3Rpb25f UHJpdmF0ZS5oPgogI2ltcG9ydCA8VUlLaXQvVUlQcmV2aWV3SXRlbUNvbnRyb2xsZXIuaD4KKyNp ZiBVU0UoVUlDT05URVhUTUVOVSkKKyNpbXBvcnQgPFVJS2l0L1VJQ29udGV4dE1lbnVJbnRlcmFj dGlvbl9Gb3JXZWJLaXRPbmx5Lmg+CisjZW5kaWYKICNlbmRpZgogCiAjaWYgRU5BQkxFKERSQUdf U1VQUE9SVCkKQEAgLTExODUsNyArMTE4OCw3IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBjdXJyZW50 VXNlckludGVyZmFjZUlkaW9tSXNQYWQoKQogQGVuZAogCiAjaWYgSEFWRShMSU5LX1BSRVZJRVcp ICYmIFVTRShVSUNPTlRFWFRNRU5VKQotQGludGVyZmFjZSBVSUNvbnRleHRNZW51Q29uZmlndXJh dGlvbiAoTmVlZGVkVW50aWw1MTI4ODQzNUZpeGVkKQorQGludGVyZmFjZSBVSUNvbnRleHRNZW51 Q29uZmlndXJhdGlvbiAoTmVlZGVkVW50aWw1MjI5NTUzNUZpeGVkKQogQHByb3BlcnR5IChub25h dG9taWMsIGNvcHkpIGlkIDxOU0NvcHlpbmc+IGlkZW50aWZpZXI7CiBAcHJvcGVydHkgKG5vbmF0 b21pYywgY29weSkgVUlDb250ZXh0TWVudUNvbnRlbnRQcmV2aWV3UHJvdmlkZXIgcHJldmlld1By b3ZpZGVyOwogQHByb3BlcnR5IChub25hdG9taWMsIGNvcHkpIFVJQ29udGV4dE1lbnVBY3Rpb25Q cm92aWRlciBhY3Rpb25Qcm92aWRlcjsKQEAgLTExOTYsNiArMTE5OSw3IEBAIHN0YXRpYyBpbmxp bmUgYm9vbCBjdXJyZW50VXNlckludGVyZmFjZUlkaW9tSXNQYWQoKQogQHByb3BlcnR5IChub25h dG9taWMsIHdlYWspIGlkIDxfVUlDbGlja0ludGVyYWN0aW9uRHJpdmVyRGVsZWdhdGU+IGRlbGVn YXRlOwogQGVuZAogCisvLyBGSVhNRTogSSBkb24ndCB0aGluayB0aGlzIFJhZGFyIGlzIGNvcnJl Y3QuIDUxMjg4NDM1IGlzIGFib3V0IHNvbWV0aGluZyBlbHNlLgogQGNsYXNzIF9VSUNsaWNrUHJl c2VudGF0aW9uSW50ZXJhY3Rpb247CiBAaW50ZXJmYWNlIFVJQ29udGV4dE1lbnVJbnRlcmFjdGlv biAoUmFkYXI1MTI4ODQzNSkKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBzdHJvbmcpIF9VSUNsaWNr UHJlc2VudGF0aW9uSW50ZXJhY3Rpb24gKnByZXNlbnRhdGlvbkludGVyYWN0aW9uOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5oCmluZGV4IDkwZjc4NGRiOTc5N2U2Njg4NTNlOGQ3ZTI4Yzk5YzlkYjFhMWY1NjUuLmRiNTIw MjBhMTViZGNmYTE2MWJkYmZhNjBjYmNkN2UzMjllNWU5Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKQEAgLTI1 NCw2ICsyNTQsNyBAQCBzdHJ1Y3QgV0tBdXRvQ29ycmVjdGlvbkRhdGEgewogICAgIFJldGFpblB0 cjxVSVZpZXdDb250cm9sbGVyPiBfY29udGV4dE1lbnVMZWdhY3lQcmV2aWV3Q29udHJvbGxlcjsK ICAgICBSZXRhaW5QdHI8VUlNZW51PiBfY29udGV4dE1lbnVMZWdhY3lNZW51OwogICAgIEJPT0wg X2NvbnRleHRNZW51SGFzUmVxdWVzdGVkTGVnYWN5RGF0YTsKKyAgICBCT09MIF9jb250ZXh0TWVu dUFjdGlvblByb3ZpZGVyRGVsZWdhdGVOZWVkc092ZXJyaWRlOwogICAgIFJldGFpblB0cjxVSVRh cmdldGVkUHJldmlldz4gX2NvbnRleHRNZW51SW50ZXJhY3Rpb25UYXJnZXRlZFByZXZpZXc7CiAj ZW5kaWYKICAgICBSZXRhaW5QdHI8VUlQcmV2aWV3SXRlbUNvbnRyb2xsZXI+IF9wcmV2aWV3SXRl bUNvbnRyb2xsZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dL Q29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRleCBmYTI1ZWE5MWZhNzk5N2Q0ZTdlMTFiM2Iz Y2Q0ODBhY2RmMjhiYThjLi5hZTYxMzVjYmEzM2NhYzM4ZWM5M2ZkMzc3NjkyYjQzYTJjMGY3NWE0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW0KQEAgLTc3NzYsOCArNzc3Niw5IEBAIHN0YXRpYyBOU1N0cmluZyAq dGl0bGVGb3JNZW51KGJvb2wgaXNMaW5rLCBib29sIHNob3dMaW5rUHJldmlld3MsIGNvbnN0IFVS TCYgdXJsCiAgICAgICAgIF9jb250ZXh0TWVudUxlZ2FjeVByZXZpZXdDb250cm9sbGVyID0gbnVs bHB0cjsKICAgICAgICAgX2NvbnRleHRNZW51TGVnYWN5TWVudSA9IG51bGxwdHI7CiAgICAgICAg IF9jb250ZXh0TWVudUhhc1JlcXVlc3RlZExlZ2FjeURhdGEgPSBOTzsKKyAgICAgICAgX2NvbnRl eHRNZW51QWN0aW9uUHJvdmlkZXJEZWxlZ2F0ZU5lZWRzT3ZlcnJpZGUgPSBOTzsKIAotICAgICAg ICBVSUNvbnRleHRNZW51QWN0aW9uUHJvdmlkZXIgYWN0aW9uTWVudVByb3ZpZGVyID0gW3dlYWtT ZWxmID0gV2Vha09iakNQdHI8V0tDb250ZW50Vmlldz4oc2VsZildIChOU0FycmF5PFVJTWVudUVs ZW1lbnQgKj4gKnN1Z2dlc3RlZEFjdGlvbnMpIC0+IFVJTWVudSAqIHsKKyAgICAgICAgVUlDb250 ZXh0TWVudUFjdGlvblByb3ZpZGVyIGFjdGlvbk1lbnVQcm92aWRlciA9IFt3ZWFrU2VsZiA9IFdl YWtPYmpDUHRyPFdLQ29udGVudFZpZXc+KHNlbGYpXSAoTlNBcnJheTxVSU1lbnVFbGVtZW50ICo+ ICopIC0+IFVJTWVudSAqIHsKICAgICAgICAgICAgIGF1dG8gc3Ryb25nU2VsZiA9IHdlYWtTZWxm LmdldCgpOwogICAgICAgICAgICAgaWYgKCFzdHJvbmdTZWxmKQogICAgICAgICAgICAgICAgIHJl dHVybiBuaWw7CkBAIC03ODA3LDU3ICs3ODA4LDM5IEBAIHN0YXRpYyBOU1N0cmluZyAqdGl0bGVG b3JNZW51KGJvb2wgaXNMaW5rLCBib29sIHNob3dMaW5rUHJldmlld3MsIGNvbnN0IFVSTCYgdXJs CiAgICAgICAgIGlmICghc3Ryb25nU2VsZikKICAgICAgICAgICAgIHJldHVybiBjb21wbGV0aW9u KG5pbCk7CiAKLSAgICAgICAgaWYgKCFjb25maWd1cmF0aW9uRnJvbVdLVUlEZWxlZ2F0ZSkgewor ICAgICAgICBpZiAoY29uZmlndXJhdGlvbkZyb21XS1VJRGVsZWdhdGUpIHsKKyAgICAgICAgICAg IHN0cm9uZ1NlbGYtPl9jb250ZXh0TWVudUFjdGlvblByb3ZpZGVyRGVsZWdhdGVOZWVkc092ZXJy aWRlID0gWUVTOworICAgICAgICAgICAgY29tcGxldGlvbihjb25maWd1cmF0aW9uRnJvbVdLVUlE ZWxlZ2F0ZSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KIAotICAgICAgICAgICAg c3Ryb25nU2VsZi0+X2NvbnRleHRNZW51RWxlbWVudEluZm8gPSBuaWw7CisgICAgICAgIC8vIEF0 IHRoaXMgcG9pbnQgd2UgaGF2ZSBhbiBvYmplY3Qgd2UgbWlnaHQgd2FudCB0byBzaG93IGEgY29u dGV4dCBtZW51IGZvciwgYnV0IHRoZQorICAgICAgICAvLyBjbGllbnQgd2FzIHVuYWJsZSB0byBo YW5kbGUgaXQuIEJlZm9yZSBnaXZpbmcgdXAsIHdlIGFzayBEYXRhRGV0ZWN0b3JzLgogCi0gICAg ICAgICAgICAvLyBBdCB0aGlzIHBvaW50IHdlIGhhdmUgYW4gb2JqZWN0IHdlIG1pZ2h0IHdhbnQg dG8gc2hvdyBhIGNvbnRleHQgbWVudSBmb3IsIGJ1dCB0aGUKLSAgICAgICAgICAgIC8vIGNsaWVu dCB3YXMgdW5hYmxlIHRvIGhhbmRsZSBpdC4gQmVmb3JlIGdpdmluZyB1cCwgd2UgYXNrIERhdGFE ZXRlY3RvcnMuCisgICAgICAgIHN0cm9uZ1NlbGYtPl9jb250ZXh0TWVudUVsZW1lbnRJbmZvID0g bmlsOwogCiAjaWYgRU5BQkxFKERBVEFfREVURUNUSU9OKQotICAgICAgICAgICAgLy8gRklYTUU6 IFN1cHBvcnQgSmF2YVNjcmlwdCB1cmxzIGhlcmUuIEJ1dCBtYWtlIHN1cmUgdGhleSBkb24ndCBz aG93IGEgcHJldmlldy4KLSAgICAgICAgICAgIC8vIDxyZGFyOi8vcHJvYmxlbS81MDU3MjI4Mz4K LSAgICAgICAgICAgIGlmICghbGlua1VSTC5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkgJiYgIVdl YkNvcmU6OkRhdGFEZXRlY3Rpb246OmNhbkJlUHJlc2VudGVkQnlEYXRhRGV0ZWN0b3JzKGxpbmtV UkwpKQotICAgICAgICAgICAgICAgIHJldHVybiBjb21wbGV0aW9uKG5pbCk7Ci0KLSAgICAgICAg ICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKLSAgICAgICAgICAgIGF1dG8gZGRDb250 ZXh0TWVudUFjdGlvbkNsYXNzID0gZ2V0RERDb250ZXh0TWVudUFjdGlvbkNsYXNzKCk7Ci0gICAg ICAgICAgICBpZiAoW2RkQ29udGV4dE1lbnVBY3Rpb25DbGFzcyByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKGNvbnRleHRNZW51Q29uZmlndXJhdGlvbldpdGhVUkw6aW5WaWV3OmNvbnRleHQ6 bWVudUlkZW50aWZpZXI6KV0pIHsKLSAgICAgICAgICAgICAgICBOU0RpY3Rpb25hcnkgKmNvbnRl eHQgPSBbc3Ryb25nU2VsZiBkYXRhRGV0ZWN0aW9uQ29udGV4dEZvclBvc2l0aW9uSW5mb3JtYXRp b246c3Ryb25nU2VsZi0+X3Bvc2l0aW9uSW5mb3JtYXRpb25dOwotICAgICAgICAgICAgICAgIFVJ Q29udGV4dE1lbnVDb25maWd1cmF0aW9uICpjb25maWd1cmF0aW9uRnJvbUREID0gW2RkQ29udGV4 dE1lbnVBY3Rpb25DbGFzcyBjb250ZXh0TWVudUNvbmZpZ3VyYXRpb25Gb3JVUkw6bGlua1VSTCBp ZGVudGlmaWVyOnN0cm9uZ1NlbGYtPl9wb3NpdGlvbkluZm9ybWF0aW9uLmRhdGFEZXRlY3Rvcklk ZW50aWZpZXIgc2VsZWN0ZWRUZXh0OltzdHJvbmdTZWxmIHNlbGVjdGVkVGV4dF0gcmVzdWx0czpz dHJvbmdTZWxmLT5fcG9zaXRpb25JbmZvcm1hdGlvbi5kYXRhRGV0ZWN0b3JSZXN1bHRzLmdldCgp IGluVmlldzpzdHJvbmdTZWxmLmdldCgpIGNvbnRleHQ6Y29udGV4dCBtZW51SWRlbnRpZmllcjpu aWxdOwotICAgICAgICAgICAgICAgIGlmIChzdHJvbmdTZWxmLT5fc2hvd0xpbmtQcmV2aWV3cykK LSAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGNvbXBsZXRpb24oY29uZmlndXJhdGlvbkZyb21E RCk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIGNvbXBsZXRpb24oW1VJQ29udGV4dE1lbnVDb25m aWd1cmF0aW9uIGNvbmZpZ3VyYXRpb25XaXRoSWRlbnRpZmllcjpbY29uZmlndXJhdGlvbkZyb21E RCBpZGVudGlmaWVyXSBwcmV2aWV3UHJvdmlkZXI6W2NvbmZpZ3VyYXRpb25Gcm9tREQgcHJldmll d1Byb3ZpZGVyXSBhY3Rpb25Qcm92aWRlcjpbY29uZmlndXJhdGlvbkZyb21ERCBhY3Rpb25Qcm92 aWRlcl1dKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQ VElPTlM7Ci0jZW5kaWYKKyAgICAgICAgLy8gRklYTUU6IFN1cHBvcnQgSmF2YVNjcmlwdCB1cmxz IGhlcmUuIEJ1dCBtYWtlIHN1cmUgdGhleSBkb24ndCBzaG93IGEgcHJldmlldy4KKyAgICAgICAg Ly8gPHJkYXI6Ly9wcm9ibGVtLzUwNTcyMjgzPgorICAgICAgICBpZiAoIWxpbmtVUkwucHJvdG9j b2xJc0luSFRUUEZhbWlseSgpICYmICFXZWJDb3JlOjpEYXRhRGV0ZWN0aW9uOjpjYW5CZVByZXNl bnRlZEJ5RGF0YURldGVjdG9ycyhsaW5rVVJMKSkKICAgICAgICAgICAgIHJldHVybiBjb21wbGV0 aW9uKG5pbCk7Ci0gICAgICAgIH0KLQotICAgICAgICBpZDxOU0NvcHlpbmc+IGlkZW50aWZpZXIg PSBbY29uZmlndXJhdGlvbkZyb21XS1VJRGVsZWdhdGUgaWRlbnRpZmllcl07Ci0gICAgICAgIFVJ Q29udGV4dE1lbnVDb250ZW50UHJldmlld1Byb3ZpZGVyIGNvbnRlbnRQcmV2aWV3UHJvdmlkZXIg PSBbY29uZmlndXJhdGlvbkZyb21XS1VJRGVsZWdhdGUgcHJldmlld1Byb3ZpZGVyXTsKLSAgICAg ICAgVUlDb250ZXh0TWVudUFjdGlvblByb3ZpZGVyIGFjdGlvbk1lbnVQcm92aWRlciA9IFtjb25m aWd1cmF0aW9uRnJvbVdLVUlEZWxlZ2F0ZSBhY3Rpb25Qcm92aWRlcl07Ci0KLSAgICAgICAgYXV0 byBhY3Rpb25Qcm92aWRlcldyYXBwZXIgPSBbYWN0aW9uUHJvdmlkZXJGcm9tVUlEZWxlZ2F0ZSA9 IG1ha2VCbG9ja1B0cihhY3Rpb25NZW51UHJvdmlkZXIpLCB3ZWFrU2VsZiA9IFdURk1vdmUod2Vh a1NlbGYpXSAoTlNBcnJheTxVSU1lbnVFbGVtZW50ICo+ICpzdWdnZXN0ZWRBY3Rpb25zKSAtPiBV SU1lbnUgKiB7Ci0gICAgICAgICAgICBhdXRvIHN0cm9uZ1NlbGYgPSB3ZWFrU2VsZi5nZXQoKTsK LSAgICAgICAgICAgIGlmICghc3Ryb25nU2VsZikKLSAgICAgICAgICAgICAgICByZXR1cm4gbmls OwogCi0gICAgICAgICAgICBhdXRvIGVsZW1lbnRJbmZvID0gYWRvcHROUyhbW19XS0FjdGl2YXRl ZEVsZW1lbnRJbmZvIGFsbG9jXSBfaW5pdFdpdGhJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3Np dGlvbjpzdHJvbmdTZWxmLT5fcG9zaXRpb25JbmZvcm1hdGlvbl0pOwotICAgICAgICAgICAgUmV0 YWluUHRyPE5TQXJyYXk8X1dLRWxlbWVudEFjdGlvbiAqPj4gZGVmYXVsdEFjdGlvbnNGcm9tQXNz aXN0YW50ID0gc3Ryb25nU2VsZi0+X3Bvc2l0aW9uSW5mb3JtYXRpb24uaXNMaW5rID8gW3N0cm9u Z1NlbGYtPl9hY3Rpb25TaGVldEFzc2lzdGFudCBkZWZhdWx0QWN0aW9uc0ZvckxpbmtTaGVldDpl bGVtZW50SW5mby5nZXQoKV0gOiBbc3Ryb25nU2VsZi0+X2FjdGlvblNoZWV0QXNzaXN0YW50IGRl ZmF1bHRBY3Rpb25zRm9ySW1hZ2VTaGVldDplbGVtZW50SW5mby5nZXQoKV07Ci0KLSAgICAgICAg ICAgIGF1dG8gbWVudUVsZW1lbnRzID0gbWVudUVsZW1lbnRzRnJvbURlZmF1bHRBY3Rpb25zKGRl ZmF1bHRBY3Rpb25zRnJvbUFzc2lzdGFudCwgZWxlbWVudEluZm8pOwotCi0gICAgICAgICAgICBp ZiAoYWN0aW9uUHJvdmlkZXJGcm9tVUlEZWxlZ2F0ZSkKLSAgICAgICAgICAgICAgICByZXR1cm4g YWN0aW9uUHJvdmlkZXJGcm9tVUlEZWxlZ2F0ZShtZW51RWxlbWVudHMpOwotCi0gICAgICAgICAg ICBhdXRvIHRpdGxlID0gdGl0bGVGb3JNZW51KHN0cm9uZ1NlbGYtPl9wb3NpdGlvbkluZm9ybWF0 aW9uLmlzTGluaywgc3Ryb25nU2VsZi0+X3Nob3dMaW5rUHJldmlld3MsIHN0cm9uZ1NlbGYtPl9w b3NpdGlvbkluZm9ybWF0aW9uLnVybCwgc3Ryb25nU2VsZi0+X3Bvc2l0aW9uSW5mb3JtYXRpb24u dGl0bGUpOwotICAgICAgICAgICAgcmV0dXJuIFtVSU1lbnUgbWVudVdpdGhUaXRsZTp0aXRsZSBj aGlsZHJlbjptZW51RWxlbWVudHNdOwotICAgICAgICB9OwotCi0gICAgICAgIGNvbXBsZXRpb24o W1VJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uIGNvbmZpZ3VyYXRpb25XaXRoSWRlbnRpZmllcjpp ZGVudGlmaWVyIHByZXZpZXdQcm92aWRlcjpjb250ZW50UHJldmlld1Byb3ZpZGVyIGFjdGlvblBy b3ZpZGVyOmFjdGlvblByb3ZpZGVyV3JhcHBlcl0pOworICAgICAgICBCRUdJTl9CTE9DS19PQkpD X0VYQ0VQVElPTlM7CisgICAgICAgIGF1dG8gZGRDb250ZXh0TWVudUFjdGlvbkNsYXNzID0gZ2V0 RERDb250ZXh0TWVudUFjdGlvbkNsYXNzKCk7CisgICAgICAgIGlmIChbZGRDb250ZXh0TWVudUFj dGlvbkNsYXNzIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoY29udGV4dE1lbnVDb25maWd1 cmF0aW9uV2l0aFVSTDppblZpZXc6Y29udGV4dDptZW51SWRlbnRpZmllcjopXSkgeworICAgICAg ICAgICAgTlNEaWN0aW9uYXJ5ICpjb250ZXh0ID0gW3N0cm9uZ1NlbGYgZGF0YURldGVjdGlvbkNv bnRleHRGb3JQb3NpdGlvbkluZm9ybWF0aW9uOnN0cm9uZ1NlbGYtPl9wb3NpdGlvbkluZm9ybWF0 aW9uXTsKKyAgICAgICAgICAgIFVJQ29udGV4dE1lbnVDb25maWd1cmF0aW9uICpjb25maWd1cmF0 aW9uRnJvbUREID0gW2RkQ29udGV4dE1lbnVBY3Rpb25DbGFzcyBjb250ZXh0TWVudUNvbmZpZ3Vy YXRpb25Gb3JVUkw6bGlua1VSTCBpZGVudGlmaWVyOnN0cm9uZ1NlbGYtPl9wb3NpdGlvbkluZm9y bWF0aW9uLmRhdGFEZXRlY3RvcklkZW50aWZpZXIgc2VsZWN0ZWRUZXh0OltzdHJvbmdTZWxmIHNl bGVjdGVkVGV4dF0gcmVzdWx0czpzdHJvbmdTZWxmLT5fcG9zaXRpb25JbmZvcm1hdGlvbi5kYXRh RGV0ZWN0b3JSZXN1bHRzLmdldCgpIGluVmlldzpzdHJvbmdTZWxmLmdldCgpIGNvbnRleHQ6Y29u dGV4dCBtZW51SWRlbnRpZmllcjpuaWxdOworICAgICAgICAgICAgc3Ryb25nU2VsZi0+X2NvbnRl eHRNZW51QWN0aW9uUHJvdmlkZXJEZWxlZ2F0ZU5lZWRzT3ZlcnJpZGUgPSBZRVM7CisgICAgICAg ICAgICBpZiAoc3Ryb25nU2VsZi0+X3Nob3dMaW5rUHJldmlld3MpCisgICAgICAgICAgICAgICAg cmV0dXJuIGNvbXBsZXRpb24oY29uZmlndXJhdGlvbkZyb21ERCk7CisgICAgICAgICAgICByZXR1 cm4gY29tcGxldGlvbihbVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gY29uZmlndXJhdGlvbldp dGhJZGVudGlmaWVyOltjb25maWd1cmF0aW9uRnJvbUREIGlkZW50aWZpZXJdIHByZXZpZXdQcm92 aWRlcjpuaWwgYWN0aW9uUHJvdmlkZXI6W2NvbmZpZ3VyYXRpb25Gcm9tREQgYWN0aW9uUHJvdmlk ZXJdXSk7CisgICAgICAgIH0KKyAgICAgICAgRU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKKyNl bmRpZgorICAgICAgICByZXR1cm4gY29tcGxldGlvbihuaWwpOwogICAgIH0pOwogCisgICAgX2Nv bnRleHRNZW51QWN0aW9uUHJvdmlkZXJEZWxlZ2F0ZU5lZWRzT3ZlcnJpZGUgPSBOTzsKICAgICBf Y29udGV4dE1lbnVFbGVtZW50SW5mbyA9IHdyYXBwZXIoQVBJOjpDb250ZXh0TWVudUVsZW1lbnRJ bmZvOjpjcmVhdGUoX3Bvc2l0aW9uSW5mb3JtYXRpb24pKTsKICAgICBpZiAoW3VpRGVsZWdhdGUg cmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpjb250ZXh0TWVudUNvbmZpZ3Vy YXRpb25Gb3JFbGVtZW50OmNvbXBsZXRpb25IYW5kbGVyOildKSB7CiAgICAgICAgIGF1dG8gY2hl Y2tlciA9IFdlYktpdDo6Q29tcGxldGlvbkhhbmRsZXJDYWxsQ2hlY2tlcjo6Y3JlYXRlKHVpRGVs ZWdhdGUsIEBzZWxlY3Rvcihfd2ViVmlldzpjb250ZXh0TWVudUNvbmZpZ3VyYXRpb25Gb3JFbGVt ZW50OmNvbXBsZXRpb25IYW5kbGVyOikpOwpAQCAtNzg3OSw2ICs3ODYyLDE3IEBAIHN0YXRpYyBO U1N0cmluZyAqdGl0bGVGb3JNZW51KGJvb2wgaXNMaW5rLCBib29sIHNob3dMaW5rUHJldmlld3Ms IGNvbnN0IFVSTCYgdXJsCiAgICAgICAgIGNvbXBsZXRpb25CbG9jayhuaWwpOwogfQogCistIChO U0FycmF5PFVJTWVudUVsZW1lbnQgKj4gKilfY29udGV4dE1lbnVJbnRlcmFjdGlvbjooVUlDb250 ZXh0TWVudUludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gb3ZlcnJpZGVTdWdnZXN0ZWRBY3Rpb25z Rm9yQ29uZmlndXJhdGlvbjooVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKiljb25maWd1cmF0 aW9uCit7CisgICAgaWYgKF9jb250ZXh0TWVudUFjdGlvblByb3ZpZGVyRGVsZWdhdGVOZWVkc092 ZXJyaWRlKSB7CisgICAgICAgIGF1dG8gZWxlbWVudEluZm8gPSBhZG9wdE5TKFtbX1dLQWN0aXZh dGVkRWxlbWVudEluZm8gYWxsb2NdIF9pbml0V2l0aEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBv c2l0aW9uOl9wb3NpdGlvbkluZm9ybWF0aW9uXSk7CisgICAgICAgIFJldGFpblB0cjxOU0FycmF5 PF9XS0VsZW1lbnRBY3Rpb24gKj4+IGRlZmF1bHRBY3Rpb25zRnJvbUFzc2lzdGFudCA9IF9wb3Np dGlvbkluZm9ybWF0aW9uLmlzTGluayA/IFtfYWN0aW9uU2hlZXRBc3Npc3RhbnQgZGVmYXVsdEFj dGlvbnNGb3JMaW5rU2hlZXQ6ZWxlbWVudEluZm8uZ2V0KCldIDogW19hY3Rpb25TaGVldEFzc2lz dGFudCBkZWZhdWx0QWN0aW9uc0ZvckltYWdlU2hlZXQ6ZWxlbWVudEluZm8uZ2V0KCldOworICAg ICAgICByZXR1cm4gbWVudUVsZW1lbnRzRnJvbURlZmF1bHRBY3Rpb25zKGRlZmF1bHRBY3Rpb25z RnJvbUFzc2lzdGFudCwgZWxlbWVudEluZm8pOworICAgIH0KKyAgICAvLyBJZiB3ZSdyZSBoZXJl IHdlJ3JlIGluIHRoZSBsZWdhY3kgcGF0aCwgd2hpY2ggaWdub3JlcyB0aGUgc3VnZ2VzdGVkIGFj dGlvbnMgYW55d2F5LgorICAgIHJldHVybiBuaWw7Cit9CisKIHN0YXRpYyBSZXRhaW5QdHI8VUlJ bWFnZT4gdWlJbWFnZUZvckltYWdlKFdlYkNvcmU6OkltYWdlKiBpbWFnZSkKIHsKICAgICBpZiAo IWltYWdlKQo=