174116 2017-07-03 19:18:17 -0700 [iOS DnD] [WK2] Callout bar should reappear after dragging ends for a text selection 2017-07-03 21:33:26 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin commit-queue megan_gardner rniwa thorton oldest_to_newest 1325364 0 wenson_hsieh 2017-07-03 19:18:17 -0700 <rdar://problem/33017845> 1325366 1 314545 wenson_hsieh 2017-07-03 19:41:03 -0700 Created attachment 314545 Patch 1325367 2 314546 wenson_hsieh 2017-07-03 19:45:36 -0700 Created attachment 314546 Guard selection UI hiding against multiple item drags. 1325369 3 314546 rniwa 2017-07-03 19:56:34 -0700 Comment on attachment 314546 Guard selection UI hiding against multiple item drags. Oh my, new code surely looks very strange :( Can we somehow fix it in UIKit before making this change? 1325371 4 wenson_hsieh 2017-07-03 20:00:21 -0700 (In reply to Ryosuke Niwa from comment #3) > Comment on attachment 314546 [details] > Guard selection UI hiding against multiple item drags. > > Oh my, new code surely looks very strange :( Can we somehow fix it in UIKit > before making this change? That would be nice, but I preferred not to block this change on a UIKit submission as well :P Since it's just renaming (but exposing the same functionality) I'll work on a UIKit renaming tweak in parallel, and then when that's in the build, transition WebKit2 over to use the renamed methods. 1325382 5 314546 commit-queue 2017-07-03 21:33:24 -0700 Comment on attachment 314546 Guard selection UI hiding against multiple item drags. Clearing flags on attachment: 314546 Committed r219113: <http://trac.webkit.org/changeset/219113> 1325383 6 commit-queue 2017-07-03 21:33:26 -0700 All reviewed patches have been landed. Closing bug. 314545 2017-07-03 19:41:03 -0700 2017-07-03 19:45:35 -0700 Patch bug-174116-20170703194102.patch text/plain 6435 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MDcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTNiMmRmNWQ4NWIyMDc4 NzZiYmQ2OTZmNzE5NjI2YWYxY2Q2MmYyZC4uODQ1MTZhNWI3ZGIzMzE3Y2E5ZGE1MjFhZThhYzI4 NDc1MTZmZTE0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMyIEBACiAyMDE3LTA3LTAzICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCisgICAgICAgIFtpT1MgRG5EXSBb V0syXSBDYWxsb3V0IGJhciBzaG91bGQgcmVhcHBlYXIgYWZ0ZXIgZHJhZ2dpbmcgZW5kcyBmb3Ig YSB0ZXh0IHNlbGVjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTc0MTE2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMzAxNzg0NT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtd2lsbFN0YXJ0U2Ny b2xsaW5nT3ZlcmZsb3cgLWRpZEVuZFNjcm9sbGluZ092ZXJmbG93IGFyZSBoZWxwZXIgbWV0aG9k cyBvbiBib3RoIHRoZSBVSVdLVGV4dEludGVyYWN0aW9uQXNzaXN0YW50CisgICAgICAgIGFuZCBV SVdlYlNlbGVjdGlvbkFzc2lzdGFudCB0aGF0IGhhbmRsZSBoaWRpbmcgc2VsZWN0aW9uIGFuZCBj YWxsb3V0IGJhciBVSSBkdXJpbmcgb3ZlcmZsb3cgc2Nyb2xsaW5nIGFuZCBtYWtpbmcKKyAgICAg ICAgaXQgcmVhcHBlYXIgYWZ0ZXIgc2Nyb2xsaW5nIGVuZHMuIEhvd2V2ZXIsIHRoZXNlIGhvb2tz IGRvIG5vdCBjb250YWluIGxvZ2ljIHNwZWNpZmljIHRvIHNjcm9sbGluZywgYW5kIHNpbXBseQor ICAgICAgICB0ZWxsIHRoZSBpbm5lciBVSVdlYlNlbGVjdGlvblZpZXcgdG8gZWl0aGVyIHNob3cg b3IgaGlkZSBhbmQgYXJlIHNhZmUgdG8gaW52b2tlIG91dHNpZGUgb2YgdGhlIGNvbnRleHQgb2YK KyAgICAgICAgc2Nyb2xsaW5nLgorCisgICAgICAgIFRoaXMgcGF0Y2ggaW52b2tlcyB0aGVzZSBo b29rcyB3aGVuIGJlZ2lubmluZyBhIGRyYWcgb24gYSBzZWxlY3Rpb24sIGFuZCB3aGVuIGEgZHJh Z2dpbmcgZW5kcywgaWYgaXQgY2FsbGVkCisgICAgICAgIC13aWxsU3RhcnRTY3JvbGxpbmdPdmVy ZmxvdyB0byBiZWdpbiB3aXRoLiBXZSBzaG91bGQgcmVuYW1lIHRoZXNlIGluIHRoZSBmdXR1cmUg dG8gYmUgc29tZXRoaW5nIGFsb25nIHRoZSBsaW5lcworICAgICAgICBvZiAtaGlkZVNlbGVjdGlv blZpZXdBbmRDb250cm9scyBhbmQgLXNob3dTZWxlY3Rpb25WaWV3QW5kQ29udHJvbHMsIHJlc3Bl Y3RpdmVseSwgYW5kIGFkb3B0IHRoZXNlIG5ldyBuYW1lcyBpbgorICAgICAgICBXZWJLaXQuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAg ICAoLVtXS0NvbnRlbnRWaWV3IGNsZWFuVXBEcmFnU291cmNlU2Vzc2lvblN0YXRlXSk6CisgICAg ICAgICgtW1dLQ29udGVudFZpZXcgX3Jlc3RvcmVDYWxsb3V0QmFySWZOZWVkZWRdKToKKyAgICAg ICAgKC1bV0tDb250ZW50VmlldyBkcmFnSW50ZXJhY3Rpb246aXRlbXNGb3JCZWdpbm5pbmdTZXNz aW9uOl0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGRyYWdJbnRlcmFjdGlvbjp3aWxsQW5p bWF0ZUxpZnRXaXRoQW5pbWF0b3I6c2Vzc2lvbjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50Vmll dyBkcmFnSW50ZXJhY3Rpb246c2Vzc2lvbjpkaWRFbmRXaXRoT3BlcmF0aW9uOl0pOgorCisyMDE3 LTA3LTAzICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCiAgICAgICAg IFBhc3Rpbmcgc2luZ2xlIHdvcmRzIGNvcGllZCB0byBVSVBhc3RlYm9hcmQgaW5zZXJ0cyBVUkxz IGluIGVkaXRhYmxlIGFyZWFzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNzQwODIKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMzMDQ2OTkyPgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJh Y3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLmgKaW5kZXggN2JkMWFjOGQ5MjZlNWEzZjg5OTk3MjVmZTgyZDdjNzJkYjUyOWEyZi4u MzI3NDIzNjhhODAwOTllYjc1NzE2NGVkODY4ODA0NWE5YzBhNzhmMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5o CkBAIC0xMjUsNiArMTI1LDcgQEAgc3RydWN0IFdLRGF0YUludGVyYWN0aW9uU3RhdGUgewogICAg IEJPT0wgZGlkQmVnaW5EcmFnZ2luZyB7IE5PIH07CiAgICAgQk9PTCBpc1BlcmZvcm1pbmdPcGVy YXRpb24geyBOTyB9OwogICAgIEJPT0wgaXNBbmltYXRpbmdDb25jbHVkZUVkaXREcmFnIHsgTk8g fTsKKyAgICBCT09MIHNob3VsZFJlc3RvcmVDYWxsb3V0QmFyIHsgTk8gfTsKICAgICBSZXRhaW5Q dHI8aWQgPFVJRHJhZ1Nlc3Npb24+PiBkcmFnU2Vzc2lvbjsKICAgICBSZXRhaW5QdHI8aWQgPFVJ RHJvcFNlc3Npb24+PiBkcm9wU2Vzc2lvbjsKICAgICBCbG9ja1B0cjx2b2lkKCk+IGRyYWdTdGFy dENvbXBsZXRpb25CbG9jazsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggYWU5NTRmMjE5ZmU5YjdjMTIw NTIxNzI1NjRmOGJhNmQ1ZDQwM2I3Yi4uNzM2YmFkZDUwYzQ4MDI5NWVkYTFjMWE4MjFmZTlkODU2 NjI0ZGRlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRl bnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTQzNzYsNiArNDM3Niw3IEBAIC0gKHZvaWQp Y2xlYW5VcERyYWdTb3VyY2VTZXNzaW9uU3RhdGUKICAgICAgICAgY29tcGxldGlvbkJsb2NrKCk7 CiAgICAgfQogCisgICAgW3NlbGYgX3Jlc3RvcmVDYWxsb3V0QmFySWZOZWVkZWRdOwogICAgIFtf ZGF0YUludGVyYWN0aW9uU3RhdGUuY2FyZXRWaWV3IHJlbW92ZV07CiAgICAgW19kYXRhSW50ZXJh Y3Rpb25TdGF0ZS52aXNpYmxlQ29udGVudFZpZXdTbmFwc2hvdCByZW1vdmVGcm9tU3VwZXJ2aWV3 XTsKIApAQCAtNDUwNiw2ICs0NTA3LDE3IEBAIC0gKGlkIDxVSURyYWdEcm9wU2Vzc2lvbj4pY3Vy cmVudERyYWdPckRyb3BTZXNzaW9uCiAgICAgcmV0dXJuIF9kYXRhSW50ZXJhY3Rpb25TdGF0ZS5k cmFnU2Vzc2lvbi5nZXQoKTsKIH0KIAorLSAodm9pZClfcmVzdG9yZUNhbGxvdXRCYXJJZk5lZWRl ZAoreworICAgIGlmICghX2RhdGFJbnRlcmFjdGlvblN0YXRlLnNob3VsZFJlc3RvcmVDYWxsb3V0 QmFyKQorICAgICAgICByZXR1cm47CisKKyAgICAvLyBGSVhNRTogVGhpcyBTUEkgc2hvdWxkIGJl IHJlbmFtZWQgaW4gVUlLaXQgdG8gcmVmbGVjdCBhIG1vcmUgZ2VuZXJhbCBwdXJwb3NlIG9mIHJl dmVhbGluZyBoaWRkZW4gaW50ZXJhY3Rpb24gYXNzaXN0YW50IGNvbnRyb2xzLgorICAgIFtfd2Vi U2VsZWN0aW9uQXNzaXN0YW50IGRpZEVuZFNjcm9sbGluZ092ZXJmbG93XTsKKyAgICBbX3RleHRT ZWxlY3Rpb25Bc3Npc3RhbnQgZGlkRW5kU2Nyb2xsaW5nT3ZlcmZsb3ddOworICAgIF9kYXRhSW50 ZXJhY3Rpb25TdGF0ZS5zaG91bGRSZXN0b3JlQ2FsbG91dEJhciA9IE5POworfQorCiAjcHJhZ21h IG1hcmsgLSBVSURyYWdJbnRlcmFjdGlvbkRlbGVnYXRlCiAKIC0gKHZvaWQpX2RyYWdJbnRlcmFj dGlvbjooVUlEcmFnSW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBwcmVwYXJlRm9yU2Vzc2lvbjoo aWQgPFVJRHJhZ1Nlc3Npb24+KXNlc3Npb24gY29tcGxldGlvbjooZGlzcGF0Y2hfYmxvY2tfdClj b21wbGV0aW9uCkBAIC00NTUyLDggKzQ1NjQsNiBAQCAtIChOU0FycmF5PFVJRHJhZ0l0ZW0gKj4g KilkcmFnSW50ZXJhY3Rpb246KFVJRHJhZ0ludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gaXRlbQog ICAgICAgICByZXR1cm4gQFsgXTsKICAgICB9CiAKLSAgICBbVUlDYWxsb3V0QmFyIGZhZGVTaGFy ZWRDYWxsb3V0QmFyXTsKLQogICAgIC8vIEdpdmUgaW50ZXJuYWwgY2xpZW50cyBzdWNoIGFzIE1h aWwgb25lIGZpbmFsIGNoYW5jZSB0byBhdWdtZW50IHRoZSBjb250ZW50cyBvZiBlYWNoIFVJSXRl bVByb3ZpZGVyIGJlZm9yZSBzZW5kaW5nIHRoZSBkcmFnIGl0ZW1zIG9mZiB0byBVSUtpdC4KICAg ICBpZCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4gdWlEZWxlZ2F0ZSA9IHNlbGYud2ViVmlld1VJRGVs ZWdhdGU7CiAgICAgaWYgKFt1aURlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Io X3dlYlZpZXc6YWRqdXN0ZWREYXRhSW50ZXJhY3Rpb25JdGVtUHJvdmlkZXJzRm9ySXRlbVByb3Zp ZGVyOnJlcHJlc2VudGluZ09iamVjdHM6YWRkaXRpb25hbERhdGE6KV0pIHsKQEAgLTQ2MDAsNiAr NDYxMCwxMyBAQCAtIChVSVRhcmdldGVkRHJhZ1ByZXZpZXcgKilkcmFnSW50ZXJhY3Rpb246KFVJ RHJhZ0ludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gcHJldgogCiAtICh2b2lkKWRyYWdJbnRlcmFj dGlvbjooVUlEcmFnSW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiB3aWxsQW5pbWF0ZUxpZnRXaXRo QW5pbWF0b3I6KGlkIDxVSURyYWdBbmltYXRpbmc+KWFuaW1hdG9yIHNlc3Npb246KGlkIDxVSURy YWdTZXNzaW9uPilzZXNzaW9uCiB7CisgICAgaWYgKF9kYXRhSW50ZXJhY3Rpb25TdGF0ZS5zb3Vy Y2VBY3Rpb24gJiBEcmFnU291cmNlQWN0aW9uU2VsZWN0aW9uKSB7CisgICAgICAgIC8vIEZJWE1F OiBUaGlzIFNQSSBzaG91bGQgYmUgcmVuYW1lZCBpbiBVSUtpdCB0byByZWZsZWN0IGEgbW9yZSBn ZW5lcmFsIHB1cnBvc2Ugb2YgaGlkaW5nIGludGVyYWN0aW9uIGFzc2lzdGFudCBjb250cm9scy4K KyAgICAgICAgW193ZWJTZWxlY3Rpb25Bc3Npc3RhbnQgd2lsbFN0YXJ0U2Nyb2xsaW5nT3ZlcmZs b3ddOworICAgICAgICBbX3RleHRTZWxlY3Rpb25Bc3Npc3RhbnQgd2lsbFN0YXJ0U2Nyb2xsaW5n T3ZlcmZsb3ddOworICAgICAgICBfZGF0YUludGVyYWN0aW9uU3RhdGUuc2hvdWxkUmVzdG9yZUNh bGxvdXRCYXIgPSBZRVM7CisgICAgfQorCiAgICAgYXV0byBhZGp1c3RlZE9yaWdpbiA9IF9kYXRh SW50ZXJhY3Rpb25TdGF0ZS5hZGp1c3RlZE9yaWdpbjsKICAgICBSZXRhaW5QdHI8V0tDb250ZW50 Vmlldz4gcHJvdGVjdGVkU2VsZihzZWxmKTsKICAgICBbYW5pbWF0b3IgYWRkQ29tcGxldGlvbjpb c2Vzc2lvbiwgYWRqdXN0ZWRPcmlnaW4sIHByb3RlY3RlZFNlbGYsIHBhZ2UgPSBfcGFnZV0gKFVJ Vmlld0FuaW1hdGluZ1Bvc2l0aW9uIGZpbmFsUG9zaXRpb24pIHsKQEAgLTQ2MzEsNiArNDY0OCw5 IEBAIC0gKHZvaWQpZHJhZ0ludGVyYWN0aW9uOihVSURyYWdJbnRlcmFjdGlvbiAqKWludGVyYWN0 aW9uIHNlc3Npb25XaWxsQmVnaW46KGlkIDxVCiAtICh2b2lkKWRyYWdJbnRlcmFjdGlvbjooVUlE cmFnSW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBzZXNzaW9uOihpZCA8VUlEcmFnU2Vzc2lvbj4p c2Vzc2lvbiBkaWRFbmRXaXRoT3BlcmF0aW9uOihVSURyb3BPcGVyYXRpb24pb3BlcmF0aW9uCiB7 CiAgICAgUkVMRUFTRV9MT0coRHJhZ0FuZERyb3AsICJEcmFnIHNlc3Npb24gZW5kZWQ6ICVwICh3 aXRoIG9wZXJhdGlvbjogJXR1LCBwZXJmb3JtaW5nIG9wZXJhdGlvbjogJWQsIGJlZ2FuIGRyYWdn aW5nOiAlZCkiLCBzZXNzaW9uLCBvcGVyYXRpb24sIF9kYXRhSW50ZXJhY3Rpb25TdGF0ZS5pc1Bl cmZvcm1pbmdPcGVyYXRpb24sIF9kYXRhSW50ZXJhY3Rpb25TdGF0ZS5kaWRCZWdpbkRyYWdnaW5n KTsKKworICAgIFtzZWxmIF9yZXN0b3JlQ2FsbG91dEJhcklmTmVlZGVkXTsKKwogICAgIGlkIDxX S1VJRGVsZWdhdGVQcml2YXRlPiB1aURlbGVnYXRlID0gc2VsZi53ZWJWaWV3VUlEZWxlZ2F0ZTsK ICAgICBpZiAoW3VpRGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmll dzpkYXRhSW50ZXJhY3Rpb246c2Vzc2lvbjpkaWRFbmRXaXRoT3BlcmF0aW9uOildKQogICAgICAg ICBbdWlEZWxlZ2F0ZSBfd2ViVmlldzpfd2ViVmlldyBkYXRhSW50ZXJhY3Rpb246aW50ZXJhY3Rp b24gc2Vzc2lvbjpzZXNzaW9uIGRpZEVuZFdpdGhPcGVyYXRpb246b3BlcmF0aW9uXTsK 314546 2017-07-03 19:45:36 -0700 2017-07-03 21:33:24 -0700 Guard selection UI hiding against multiple item drags. bug-174116-20170703194535.patch text/plain 6640 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5MDcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTNiMmRmNWQ4NWIyMDc4 NzZiYmQ2OTZmNzE5NjI2YWYxY2Q2MmYyZC4uZmI0ODEzOTQ5ZmZmYjg4NWFkN2Q3ZWEwM2E3Mjk3 NTg1ZmY1Mzg5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMzIEBACiAyMDE3LTA3LTAzICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCisgICAgICAgIFtpT1MgRG5EXSBb V0syXSBDYWxsb3V0IGJhciBzaG91bGQgcmVhcHBlYXIgYWZ0ZXIgZHJhZ2dpbmcgZW5kcyBmb3Ig YSB0ZXh0IHNlbGVjdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTc0MTE2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMzAxNzg0NT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtd2lsbFN0YXJ0U2Ny b2xsaW5nT3ZlcmZsb3cgLWRpZEVuZFNjcm9sbGluZ092ZXJmbG93IGFyZSBoZWxwZXIgbWV0aG9k cyBvbiBib3RoIHRoZSBVSVdLVGV4dEludGVyYWN0aW9uQXNzaXN0YW50CisgICAgICAgIGFuZCBV SVdlYlNlbGVjdGlvbkFzc2lzdGFudCB0aGF0IGhhbmRsZSBoaWRpbmcgc2VsZWN0aW9uIGFuZCBj YWxsb3V0IGJhciBVSSBkdXJpbmcgb3ZlcmZsb3cgc2Nyb2xsaW5nIGFuZCBtYWtpbmcKKyAgICAg ICAgaXQgcmVhcHBlYXIgYWZ0ZXIgc2Nyb2xsaW5nIGVuZHMuIEhvd2V2ZXIsIHRoZXNlIGhvb2tz IGRvIG5vdCBjb250YWluIGxvZ2ljIHNwZWNpZmljIHRvIHNjcm9sbGluZywgYW5kIHNpbXBseQor ICAgICAgICB0ZWxsIHRoZSBpbm5lciBVSVdlYlNlbGVjdGlvblZpZXcgdG8gZWl0aGVyIHNob3cg b3IgaGlkZSBhbmQgYXJlIHNhZmUgdG8gaW52b2tlIG91dHNpZGUgb2YgdGhlIGNvbnRleHQgb2YK KyAgICAgICAgc2Nyb2xsaW5nLgorCisgICAgICAgIFRoaXMgcGF0Y2ggaW52b2tlcyB0aGVzZSBo b29rcyB3aGVuIGJlZ2lubmluZyBhIGRyYWcgb24gYSBzZWxlY3Rpb24sIGFuZCB3aGVuIGEgZHJh Z2dpbmcgZW5kcywgaWYgaXQgY2FsbGVkCisgICAgICAgIC13aWxsU3RhcnRTY3JvbGxpbmdPdmVy ZmxvdyB0byBiZWdpbiB3aXRoLiBXZSBzaG91bGQgcmVuYW1lIHRoZXNlIGluIHRoZSBmdXR1cmUg dG8gYmUgc29tZXRoaW5nIGFsb25nIHRoZSBsaW5lcworICAgICAgICBvZiAtaGlkZVNlbGVjdGlv blZpZXdBbmRDb250cm9scyBhbmQgLXNob3dTZWxlY3Rpb25WaWV3QW5kQ29udHJvbHMsIHJlc3Bl Y3RpdmVseSwgYW5kIGFkb3B0IHRoZXNlIG5ldyBuYW1lcyBpbgorICAgICAgICBXZWJLaXQuIFdl IGFsc28gbW92ZSBsb2dpYyB0byBoaWRlIHRoZSBjYWxsb3V0IG91dCBvZiAtaXRlbXNGb3JCZWdp bm5pbmdTZXNzaW9uOiBhbmQgaW50bworICAgICAgICAtd2lsbEFuaW1hdGVMaWZ0V2l0aEFuaW1h dG9yOiwgd2hlbiB0aGUgbGlmdCBhY3R1YWxseSBiZWdpbnMuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3 IGNsZWFuVXBEcmFnU291cmNlU2Vzc2lvblN0YXRlXSk6CisgICAgICAgICgtW1dLQ29udGVudFZp ZXcgX3Jlc3RvcmVDYWxsb3V0QmFySWZOZWVkZWRdKToKKyAgICAgICAgKC1bV0tDb250ZW50Vmll dyBkcmFnSW50ZXJhY3Rpb246aXRlbXNGb3JCZWdpbm5pbmdTZXNzaW9uOl0pOgorICAgICAgICAo LVtXS0NvbnRlbnRWaWV3IGRyYWdJbnRlcmFjdGlvbjp3aWxsQW5pbWF0ZUxpZnRXaXRoQW5pbWF0 b3I6c2Vzc2lvbjpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBkcmFnSW50ZXJhY3Rpb246 c2Vzc2lvbjpkaWRFbmRXaXRoT3BlcmF0aW9uOl0pOgorCisyMDE3LTA3LTAzICBXZW5zb24gSHNp ZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCiAgICAgICAgIFBhc3Rpbmcgc2luZ2xlIHdv cmRzIGNvcGllZCB0byBVSVBhc3RlYm9hcmQgaW5zZXJ0cyBVUkxzIGluIGVkaXRhYmxlIGFyZWFz CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQwODIK ICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMzMDQ2OTkyPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKaW5kZXggN2Jk MWFjOGQ5MjZlNWEzZjg5OTk3MjVmZTgyZDdjNzJkYjUyOWEyZi4uMzI3NDIzNjhhODAwOTllYjc1 NzE2NGVkODY4ODA0NWE5YzBhNzhmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCkBAIC0xMjUsNiArMTI1LDcg QEAgc3RydWN0IFdLRGF0YUludGVyYWN0aW9uU3RhdGUgewogICAgIEJPT0wgZGlkQmVnaW5EcmFn Z2luZyB7IE5PIH07CiAgICAgQk9PTCBpc1BlcmZvcm1pbmdPcGVyYXRpb24geyBOTyB9OwogICAg IEJPT0wgaXNBbmltYXRpbmdDb25jbHVkZUVkaXREcmFnIHsgTk8gfTsKKyAgICBCT09MIHNob3Vs ZFJlc3RvcmVDYWxsb3V0QmFyIHsgTk8gfTsKICAgICBSZXRhaW5QdHI8aWQgPFVJRHJhZ1Nlc3Np b24+PiBkcmFnU2Vzc2lvbjsKICAgICBSZXRhaW5QdHI8aWQgPFVJRHJvcFNlc3Npb24+PiBkcm9w U2Vzc2lvbjsKICAgICBCbG9ja1B0cjx2b2lkKCk+IGRyYWdTdGFydENvbXBsZXRpb25CbG9jazsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW0KaW5kZXggYWU5NTRmMjE5ZmU5YjdjMTIwNTIxNzI1NjRmOGJhNmQ1ZDQw M2I3Yi4uMWRlNTRmZTU0ZTg0MmIzNDYyYzRjNmM4ZGM3ZmE4ZDg2Zjk2MDU1YyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJh Y3Rpb24ubW0KQEAgLTQzNzYsNiArNDM3Niw3IEBAIC0gKHZvaWQpY2xlYW5VcERyYWdTb3VyY2VT ZXNzaW9uU3RhdGUKICAgICAgICAgY29tcGxldGlvbkJsb2NrKCk7CiAgICAgfQogCisgICAgW3Nl bGYgX3Jlc3RvcmVDYWxsb3V0QmFySWZOZWVkZWRdOwogICAgIFtfZGF0YUludGVyYWN0aW9uU3Rh dGUuY2FyZXRWaWV3IHJlbW92ZV07CiAgICAgW19kYXRhSW50ZXJhY3Rpb25TdGF0ZS52aXNpYmxl Q29udGVudFZpZXdTbmFwc2hvdCByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKIApAQCAtNDUwNiw2ICs0 NTA3LDE3IEBAIC0gKGlkIDxVSURyYWdEcm9wU2Vzc2lvbj4pY3VycmVudERyYWdPckRyb3BTZXNz aW9uCiAgICAgcmV0dXJuIF9kYXRhSW50ZXJhY3Rpb25TdGF0ZS5kcmFnU2Vzc2lvbi5nZXQoKTsK IH0KIAorLSAodm9pZClfcmVzdG9yZUNhbGxvdXRCYXJJZk5lZWRlZAoreworICAgIGlmICghX2Rh dGFJbnRlcmFjdGlvblN0YXRlLnNob3VsZFJlc3RvcmVDYWxsb3V0QmFyKQorICAgICAgICByZXR1 cm47CisKKyAgICAvLyBGSVhNRTogVGhpcyBTUEkgc2hvdWxkIGJlIHJlbmFtZWQgaW4gVUlLaXQg dG8gcmVmbGVjdCBhIG1vcmUgZ2VuZXJhbCBwdXJwb3NlIG9mIHJldmVhbGluZyBoaWRkZW4gaW50 ZXJhY3Rpb24gYXNzaXN0YW50IGNvbnRyb2xzLgorICAgIFtfd2ViU2VsZWN0aW9uQXNzaXN0YW50 IGRpZEVuZFNjcm9sbGluZ092ZXJmbG93XTsKKyAgICBbX3RleHRTZWxlY3Rpb25Bc3Npc3RhbnQg ZGlkRW5kU2Nyb2xsaW5nT3ZlcmZsb3ddOworICAgIF9kYXRhSW50ZXJhY3Rpb25TdGF0ZS5zaG91 bGRSZXN0b3JlQ2FsbG91dEJhciA9IE5POworfQorCiAjcHJhZ21hIG1hcmsgLSBVSURyYWdJbnRl cmFjdGlvbkRlbGVnYXRlCiAKIC0gKHZvaWQpX2RyYWdJbnRlcmFjdGlvbjooVUlEcmFnSW50ZXJh Y3Rpb24gKilpbnRlcmFjdGlvbiBwcmVwYXJlRm9yU2Vzc2lvbjooaWQgPFVJRHJhZ1Nlc3Npb24+ KXNlc3Npb24gY29tcGxldGlvbjooZGlzcGF0Y2hfYmxvY2tfdCljb21wbGV0aW9uCkBAIC00NTUy LDggKzQ1NjQsNiBAQCAtIChOU0FycmF5PFVJRHJhZ0l0ZW0gKj4gKilkcmFnSW50ZXJhY3Rpb246 KFVJRHJhZ0ludGVyYWN0aW9uICopaW50ZXJhY3Rpb24gaXRlbQogICAgICAgICByZXR1cm4gQFsg XTsKICAgICB9CiAKLSAgICBbVUlDYWxsb3V0QmFyIGZhZGVTaGFyZWRDYWxsb3V0QmFyXTsKLQog ICAgIC8vIEdpdmUgaW50ZXJuYWwgY2xpZW50cyBzdWNoIGFzIE1haWwgb25lIGZpbmFsIGNoYW5j ZSB0byBhdWdtZW50IHRoZSBjb250ZW50cyBvZiBlYWNoIFVJSXRlbVByb3ZpZGVyIGJlZm9yZSBz ZW5kaW5nIHRoZSBkcmFnIGl0ZW1zIG9mZiB0byBVSUtpdC4KICAgICBpZCA8V0tVSURlbGVnYXRl UHJpdmF0ZT4gdWlEZWxlZ2F0ZSA9IHNlbGYud2ViVmlld1VJRGVsZWdhdGU7CiAgICAgaWYgKFt1 aURlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6YWRqdXN0ZWRE YXRhSW50ZXJhY3Rpb25JdGVtUHJvdmlkZXJzRm9ySXRlbVByb3ZpZGVyOnJlcHJlc2VudGluZ09i amVjdHM6YWRkaXRpb25hbERhdGE6KV0pIHsKQEAgLTQ2MDAsNiArNDYxMCwxMyBAQCAtIChVSVRh cmdldGVkRHJhZ1ByZXZpZXcgKilkcmFnSW50ZXJhY3Rpb246KFVJRHJhZ0ludGVyYWN0aW9uICop aW50ZXJhY3Rpb24gcHJldgogCiAtICh2b2lkKWRyYWdJbnRlcmFjdGlvbjooVUlEcmFnSW50ZXJh Y3Rpb24gKilpbnRlcmFjdGlvbiB3aWxsQW5pbWF0ZUxpZnRXaXRoQW5pbWF0b3I6KGlkIDxVSURy YWdBbmltYXRpbmc+KWFuaW1hdG9yIHNlc3Npb246KGlkIDxVSURyYWdTZXNzaW9uPilzZXNzaW9u CiB7CisgICAgaWYgKCFfZGF0YUludGVyYWN0aW9uU3RhdGUuc2hvdWxkUmVzdG9yZUNhbGxvdXRC YXIgJiYgKF9kYXRhSW50ZXJhY3Rpb25TdGF0ZS5zb3VyY2VBY3Rpb24gJiBEcmFnU291cmNlQWN0 aW9uU2VsZWN0aW9uKSkgeworICAgICAgICAvLyBGSVhNRTogVGhpcyBTUEkgc2hvdWxkIGJlIHJl bmFtZWQgaW4gVUlLaXQgdG8gcmVmbGVjdCBhIG1vcmUgZ2VuZXJhbCBwdXJwb3NlIG9mIGhpZGlu ZyBpbnRlcmFjdGlvbiBhc3Npc3RhbnQgY29udHJvbHMuCisgICAgICAgIFtfd2ViU2VsZWN0aW9u QXNzaXN0YW50IHdpbGxTdGFydFNjcm9sbGluZ092ZXJmbG93XTsKKyAgICAgICAgW190ZXh0U2Vs ZWN0aW9uQXNzaXN0YW50IHdpbGxTdGFydFNjcm9sbGluZ092ZXJmbG93XTsKKyAgICAgICAgX2Rh dGFJbnRlcmFjdGlvblN0YXRlLnNob3VsZFJlc3RvcmVDYWxsb3V0QmFyID0gWUVTOworICAgIH0K KwogICAgIGF1dG8gYWRqdXN0ZWRPcmlnaW4gPSBfZGF0YUludGVyYWN0aW9uU3RhdGUuYWRqdXN0 ZWRPcmlnaW47CiAgICAgUmV0YWluUHRyPFdLQ29udGVudFZpZXc+IHByb3RlY3RlZFNlbGYoc2Vs Zik7CiAgICAgW2FuaW1hdG9yIGFkZENvbXBsZXRpb246W3Nlc3Npb24sIGFkanVzdGVkT3JpZ2lu LCBwcm90ZWN0ZWRTZWxmLCBwYWdlID0gX3BhZ2VdIChVSVZpZXdBbmltYXRpbmdQb3NpdGlvbiBm aW5hbFBvc2l0aW9uKSB7CkBAIC00NjMxLDYgKzQ2NDgsOSBAQCAtICh2b2lkKWRyYWdJbnRlcmFj dGlvbjooVUlEcmFnSW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBzZXNzaW9uV2lsbEJlZ2luOihp ZCA8VQogLSAodm9pZClkcmFnSW50ZXJhY3Rpb246KFVJRHJhZ0ludGVyYWN0aW9uICopaW50ZXJh Y3Rpb24gc2Vzc2lvbjooaWQgPFVJRHJhZ1Nlc3Npb24+KXNlc3Npb24gZGlkRW5kV2l0aE9wZXJh dGlvbjooVUlEcm9wT3BlcmF0aW9uKW9wZXJhdGlvbgogewogICAgIFJFTEVBU0VfTE9HKERyYWdB bmREcm9wLCAiRHJhZyBzZXNzaW9uIGVuZGVkOiAlcCAod2l0aCBvcGVyYXRpb246ICV0dSwgcGVy Zm9ybWluZyBvcGVyYXRpb246ICVkLCBiZWdhbiBkcmFnZ2luZzogJWQpIiwgc2Vzc2lvbiwgb3Bl cmF0aW9uLCBfZGF0YUludGVyYWN0aW9uU3RhdGUuaXNQZXJmb3JtaW5nT3BlcmF0aW9uLCBfZGF0 YUludGVyYWN0aW9uU3RhdGUuZGlkQmVnaW5EcmFnZ2luZyk7CisKKyAgICBbc2VsZiBfcmVzdG9y ZUNhbGxvdXRCYXJJZk5lZWRlZF07CisKICAgICBpZCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4gdWlE ZWxlZ2F0ZSA9IHNlbGYud2ViVmlld1VJRGVsZWdhdGU7CiAgICAgaWYgKFt1aURlbGVnYXRlIHJl c3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6ZGF0YUludGVyYWN0aW9uOnNlc3Np b246ZGlkRW5kV2l0aE9wZXJhdGlvbjopXSkKICAgICAgICAgW3VpRGVsZWdhdGUgX3dlYlZpZXc6 X3dlYlZpZXcgZGF0YUludGVyYWN0aW9uOmludGVyYWN0aW9uIHNlc3Npb246c2Vzc2lvbiBkaWRF bmRXaXRoT3BlcmF0aW9uOm9wZXJhdGlvbl07Cg==