213251 2020-06-16 09:10:49 -0700 Text manipulation should handle nested item boundary elements 2020-06-16 11:11:28 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin ews-watchlist megan_gardner mifenton sihui_liu thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1663107 0 wenson_hsieh 2020-06-16 09:10:49 -0700 <rdar://problem/63371514> 1663111 1 402011 wenson_hsieh 2020-06-16 09:23:04 -0700 Created attachment 402011 Patch 1663139 2 402011 sihui_liu 2020-06-16 10:18:00 -0700 Comment on attachment 402011 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402011&action=review > Source/WebCore/editing/TextManipulationController.cpp:419 > + bool crossedItemBoundary = false; This boolean is probably not needed. addItemIfPossible does not add item when units is empty. 1663147 3 wenson_hsieh 2020-06-16 10:35:51 -0700 (In reply to Sihui Liu from comment #2) > Comment on attachment 402011 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=402011&action=review > > > Source/WebCore/editing/TextManipulationController.cpp:419 > > + bool crossedItemBoundary = false; > > This boolean is probably not needed. addItemIfPossible does not add item > when units is empty. Good point! Removed crossedItemBoundary. 1663153 4 402022 wenson_hsieh 2020-06-16 10:40:02 -0700 Created attachment 402022 Patch for landing 1663170 5 ews-feeder 2020-06-16 11:11:28 -0700 Committed r263101: <https://trac.webkit.org/changeset/263101> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402022. 402011 2020-06-16 09:23:04 -0700 2020-06-16 10:18:00 -0700 Patch bug-213251-20200616092303.patch text/plain 6710 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMDY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWYxZDg1YmY2MjljMWU5 MDQ4NzY3YWI3NDA1OTQ4Mjk4NGZjYWY0Ny4uN2Q4OGJmNzU5YzFkM2U5OTMzYzZhZGJkYWVlMmI4 MWZiNmI2N2Q4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA2LTE2ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFRleHQgbWFuaXB1 bGF0aW9uIHNob3VsZCBoYW5kbGUgbmVzdGVkIGl0ZW0gYm91bmRhcnkgZWxlbWVudHMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzI1MQorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNjMzNzE1MTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgSW4gdGhlIGNhc2Ugd2hlcmUgdGhlcmUgYXJlIG5lc3RlZCBp dGVtIGJvdW5kYXJ5IGVsZW1lbnRzIChlLmcuIGJsb2NrLWxldmVsIGxpc3QgaXRlbXMgb3IgbGlu a3MpLCB0ZXh0CisgICAgICAgIG1hbmlwdWxhdGlvbiB3aWxsIGN1cnJlbnRseSBvbmx5IG9ic2Vy dmUgdGhhdCB3ZSd2ZSBjcm9zc2VkIHRoZSB0b3AtbGV2ZWwgaXRlbSBib3VuZGFyeSwgYW5kIHBy b2NlZWQgdG8gZXh0cmFjdAorICAgICAgICB0ZXh0IGZyb20gdGhlIG5lc3RlZCBib3VuZGFyeSBl bGVtZW50cyBhcyB0b2tlbnMgaW4gdGhlIHNhbWUgaXRlbS4KKworICAgICAgICBBZGRyZXNzIHRo aXMgYnkgbWFpbnRhaW5pbmcgYSBzdGFjayBvZiBib3VuZGFyeSBlbGVtZW50cyByYXRoZXIgdGhh biBqdXN0IGEgc2luZ2xlIGl0ZW0uIEFkZGl0aW9uYWxseSwgY3JlYXRlCisgICAgICAgIGFuZCBh ZGQgYW4gaXRlbSB3aGVuIGNyb3NzaW5nIGludG8gYSBuZXcgaXRlbSBib3VuZGFyeSwgcmF0aGVy IHRoYW4gb25seSB3aGVuIHdlIGV4aXQgYSBib3VuZGFyeTsgdGhpcyBoYW5kbGVzCisgICAgICAg IHRoZSBjYXNlIHdoZXJlIHdlIGRlc2NlbmQgZnJvbSBvbmUgYm91bmRhcnkgZWxlbWVudCBpbnRv IGFub3RoZXIgYm91bmRhcnkgZWxlbWVudCB0aGF0IGlzIGEgY2hpbGQuCisKKyAgICAgICAgVGVz dDogVGV4dE1hbmlwdWxhdGlvbi5TdGFydFRleHRNYW5pcHVsYXRpb25UcmVhdHNOZXN0ZWRJbmxp bmVCbG9ja0xpc3RJdGVtc0FuZExpbmtzQXNQYXJhZ3JhcGhzCisKKyAgICAgICAgKiBlZGl0aW5n L1RleHRNYW5pcHVsYXRpb25Db250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHRN YW5pcHVsYXRpb25Db250cm9sbGVyOjpvYnNlcnZlUGFyYWdyYXBocyk6CisKIDIwMjAtMDYtMTUg IEtlaXRoIE1pbGxlciAgPGtlaXRoX21pbGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgSklUIHRo dW5rcyBzaG91bGQgd29yayBvbiBhcm02NF8zMgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv ZWRpdGluZy9UZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL1RleHRNYW5pcHVsYXRpb25Db250cm9sbGVyLmNwcAppbmRleCAyZTRiNDkwOTI0OTUz ZWNiODg4ZWU0MWY5YzMyNjhhN2M1MDFiNzE1Li45ZjdhMzc0ZGJiNWEwMDQ1YjYwYzNkNmVkMjE4 NzMwMWY3MTU1MDk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRNYW5p cHVsYXRpb25Db250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRN YW5pcHVsYXRpb25Db250cm9sbGVyLmNwcApAQCAtNDA5LDE2ICs0MDksMjAgQEAgdm9pZCBUZXh0 TWFuaXB1bGF0aW9uQ29udHJvbGxlcjo6b2JzZXJ2ZVBhcmFncmFwaHMoY29uc3QgUG9zaXRpb24m IHN0YXJ0LCBjb25zdAogICAgICAgICByZXR1cm47CiAKICAgICBWZWN0b3I8TWFuaXB1bGF0aW9u VW5pdD4gdW5pdHNJbkN1cnJlbnRQYXJhZ3JhcGg7Ci0gICAgUmVmUHRyPEVsZW1lbnQ+IGVuY2xv c2luZ0l0ZW1Cb3VuZGFyeUVsZW1lbnQ7CisgICAgVmVjdG9yPFJlZjxFbGVtZW50Pj4gZW5jbG9z aW5nSXRlbUJvdW5kYXJ5RWxlbWVudHM7CiAgICAgUGFyYWdyYXBoQ29udGVudEl0ZXJhdG9yIGl0 ZXJhdG9yIHsgc3RhcnQsIGVuZCB9OwogICAgIGZvciAoOyAhaXRlcmF0b3IuYXRFbmQoKTsgaXRl cmF0b3IuYWR2YW5jZSgpKSB7CiAgICAgICAgIGF1dG8gY29udGVudCA9IGl0ZXJhdG9yLmN1cnJl bnRDb250ZW50KCk7CiAgICAgICAgIGF1dG8qIGNvbnRlbnROb2RlID0gY29udGVudC5ub2RlLmdl dCgpOwogICAgICAgICBBU1NFUlQoY29udGVudE5vZGUpOwogCi0gICAgICAgIGlmIChlbmNsb3Np bmdJdGVtQm91bmRhcnlFbGVtZW50ICYmICFlbmNsb3NpbmdJdGVtQm91bmRhcnlFbGVtZW50LT5j b250YWlucyhjb250ZW50Tm9kZSkpIHsKLSAgICAgICAgICAgIGFkZEl0ZW1JZlBvc3NpYmxlKHN0 ZDo6ZXhjaGFuZ2UodW5pdHNJbkN1cnJlbnRQYXJhZ3JhcGgsIHsgfSkpOwotICAgICAgICAgICAg ZW5jbG9zaW5nSXRlbUJvdW5kYXJ5RWxlbWVudCA9IG51bGxwdHI7CisgICAgICAgIGJvb2wgY3Jv c3NlZEl0ZW1Cb3VuZGFyeSA9IGZhbHNlOworICAgICAgICB3aGlsZSAoIWVuY2xvc2luZ0l0ZW1C b3VuZGFyeUVsZW1lbnRzLmlzRW1wdHkoKSAmJiAhZW5jbG9zaW5nSXRlbUJvdW5kYXJ5RWxlbWVu dHMubGFzdCgpLT5jb250YWlucyhjb250ZW50Tm9kZSkpIHsKKyAgICAgICAgICAgIGlmICghY3Jv c3NlZEl0ZW1Cb3VuZGFyeSkgeworICAgICAgICAgICAgICAgIGFkZEl0ZW1JZlBvc3NpYmxlKHN0 ZDo6ZXhjaGFuZ2UodW5pdHNJbkN1cnJlbnRQYXJhZ3JhcGgsIHsgfSkpOworICAgICAgICAgICAg ICAgIGNyb3NzZWRJdGVtQm91bmRhcnkgPSB0cnVlOworICAgICAgICAgICAgfQorICAgICAgICAg ICAgZW5jbG9zaW5nSXRlbUJvdW5kYXJ5RWxlbWVudHMucmVtb3ZlTGFzdCgpOwogICAgICAgICB9 CiAKICAgICAgICAgaWYgKFJlZlB0cjxFbGVtZW50PiBjdXJyZW50RWxlbWVudEFuY2VzdG9yID0g aXM8RWxlbWVudD4oKmNvbnRlbnROb2RlKSA/IGRvd25jYXN0PEVsZW1lbnQ+KGNvbnRlbnROb2Rl KSA6IGNvbnRlbnROb2RlLT5wYXJlbnRPclNoYWRvd0hvc3RFbGVtZW50KCkpIHsKQEAgLTQ0NCw4 ICs0NDgsMTAgQEAgdm9pZCBUZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlcjo6b2JzZXJ2ZVBhcmFn cmFwaHMoY29uc3QgUG9zaXRpb24mIHN0YXJ0LCBjb25zdAogICAgICAgICAgICAgICAgICAgICBh ZGRJdGVtKE1hbmlwdWxhdGlvbkl0ZW1EYXRhIHsgeyB9LCB7IH0sIG1ha2VXZWFrUHRyKGN1cnJl bnRFbGVtZW50KSwgSFRNTE5hbWVzOjp2YWx1ZUF0dHIsIHsgTWFuaXB1bGF0aW9uVG9rZW4geyBt X3Rva2VuSWRlbnRpZmllci5nZW5lcmF0ZSgpLCBpbnB1dC52YWx1ZSgpLCB0b2tlbkluZm8oJmN1 cnJlbnRFbGVtZW50KSB9IH0gfSk7CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGlmICgh ZW5jbG9zaW5nSXRlbUJvdW5kYXJ5RWxlbWVudCAmJiBpc0VuY2xvc2luZ0l0ZW1Cb3VuZGFyeUVs ZW1lbnQoY3VycmVudEVsZW1lbnQpKQotICAgICAgICAgICAgICAgIGVuY2xvc2luZ0l0ZW1Cb3Vu ZGFyeUVsZW1lbnQgPSAmY3VycmVudEVsZW1lbnQ7CisgICAgICAgICAgICBpZiAoaXNFbmNsb3Np bmdJdGVtQm91bmRhcnlFbGVtZW50KGN1cnJlbnRFbGVtZW50KSkgeworICAgICAgICAgICAgICAg IGFkZEl0ZW1JZlBvc3NpYmxlKHN0ZDo6ZXhjaGFuZ2UodW5pdHNJbkN1cnJlbnRQYXJhZ3JhcGgs IHsgfSkpOworICAgICAgICAgICAgICAgIGVuY2xvc2luZ0l0ZW1Cb3VuZGFyeUVsZW1lbnRzLmFw cGVuZChjdXJyZW50RWxlbWVudCk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KIAogICAgICAg ICBpZiAoY29udGVudC5pc1JlcGxhY2VkQ29udGVudCkgewpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hh bmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDc3OWY4MmU0MjY2ZGNhOGMwODNmNDEyYTUw YWVhNGQ1NGY1N2Y5YmIuLjRmYjUwZWFiN2JiM2MzOWE0MjY1ZjViNmY0MjBmZmRjNWRlYWViODUg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAyMC0wNi0xNiAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxl LmNvbT4KKworICAgICAgICBUZXh0IG1hbmlwdWxhdGlvbiBzaG91bGQgaGFuZGxlIG5lc3RlZCBp dGVtIGJvdW5kYXJ5IGVsZW1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMTMyNTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYzMzcxNTE0Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIG5l dyBBUEkgdGVzdCB0byBleGVyY2lzZSB0aGlzIHNjZW5hcmlvLgorCisgICAgICAgICogVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9UZXh0TWFuaXB1bGF0aW9uLm1tOgorCiAyMDIwLTA2 LTE1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBGb2xs b3ctdXAgZml4OiBNYWtlIEFQSSB0ZXN0cyB0b2xlcmFudCBvZiBvdXIgcmVsYXRpdmVseSBuZXcg dXNlIG9mIFdlYlBhZ2VQcm94eTo6cHJlY29ubmVjdFRvCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1RleHRNYW5pcHVsYXRpb24ubW0gYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1RleHRNYW5pcHVsYXRpb24ubW0KaW5kZXgg NjlmNzE5ZGY2YWY1NWMwNWExMTg2OTIwNTVmM2YzZjcyMGIzNGEyZS4uNGZiNWM1NmMzNThkZGRk ZmE4YWI2NDAzN2ViN2I1NWQ0OTgwNDljNCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9UZXh0TWFuaXB1bGF0aW9uLm1tCisrKyBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVGV4dE1hbmlwdWxhdGlvbi5tbQpAQCAtNzUxLDYg Kzc1MSw0MiBAQCBURVNUKFRleHRNYW5pcHVsYXRpb24sIFN0YXJ0VGV4dE1hbmlwdWxhdGlvblRy ZWF0c0xpbmtzSW5OYXZpZ2F0aW9uRWxlbWVudHNBc1BhcgogICAgIEVYUEVDVF9XS19TVFJFUSgi R2FycGx5IiwgaXRlbXNbM10udG9rZW5zWzBdLmNvbnRlbnQpOwogfQogCitURVNUKFRleHRNYW5p cHVsYXRpb24sIFN0YXJ0VGV4dE1hbmlwdWxhdGlvblRyZWF0c05lc3RlZElubGluZUJsb2NrTGlz dEl0ZW1zQW5kTGlua3NBc1BhcmFncmFwaHMpCit7CisgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0 TlMoW1tUZXh0TWFuaXB1bGF0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBhdXRvIHdl YlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01h a2VSZWN0KDAsIDAsIDQwMCwgNDAwKV0pOworICAgIFt3ZWJWaWV3IF9zZXRUZXh0TWFuaXB1bGF0 aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworCisgICAgW3dlYlZpZXcgc3luY2hyb25vdXNs eUxvYWRIVE1MU3RyaW5nOkAiPCFET0NUWVBFIGh0bWw+IgorICAgICAgICAiPGhlYWQ+IgorICAg ICAgICAiICAgIDxzdHlsZT4iCisgICAgICAgICIgICAgICAgIGxpLCBhIHsgZGlzcGxheTogaW5s aW5lLWJsb2NrOyBtYXJnaW46IDJlbTsgfSIKKyAgICAgICAgIiAgICA8L3N0eWxlPiIKKyAgICAg ICAgIjwvaGVhZD4iCisgICAgICAgICI8Ym9keT4iCisgICAgICAgICIgICAgPG9sPiIKKyAgICAg ICAgIiAgICAgICAgPGxpPk9uZTxhIGhyZWY9JyMnPlR3bzwvYT48YSBocmVmPScjJz5UaHJlZTwv YT5Gb3VyPC9saT4iCisgICAgICAgICIgICAgPC9vbD4iCisgICAgICAgICI8L2JvZHk+Il07CisK KyAgICBkb25lID0gZmFsc2U7CisgICAgW3dlYlZpZXcgX3N0YXJ0VGV4dE1hbmlwdWxhdGlvbnNX aXRoQ29uZmlndXJhdGlvbjpuaWwgY29tcGxldGlvbjpeeworICAgICAgICBkb25lID0gdHJ1ZTsK KyAgICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworCisgICAgYXV0 byBpdGVtcyA9IFtkZWxlZ2F0ZSBpdGVtc107CisgICAgRVhQRUNUX0VRKGl0ZW1zLmNvdW50LCA0 VUwpOworICAgIEVYUEVDVF9FUShpdGVtc1swXS50b2tlbnMuY291bnQsIDFVTCk7CisgICAgRVhQ RUNUX0VRKGl0ZW1zWzFdLnRva2Vucy5jb3VudCwgMVVMKTsKKyAgICBFWFBFQ1RfRVEoaXRlbXNb Ml0udG9rZW5zLmNvdW50LCAxVUwpOworICAgIEVYUEVDVF9FUShpdGVtc1szXS50b2tlbnMuY291 bnQsIDFVTCk7CisgICAgRVhQRUNUX1dLX1NUUkVRKCJPbmUiLCBpdGVtc1swXS50b2tlbnNbMF0u Y29udGVudCk7CisgICAgRVhQRUNUX1dLX1NUUkVRKCJUd28iLCBpdGVtc1sxXS50b2tlbnNbMF0u Y29udGVudCk7CisgICAgRVhQRUNUX1dLX1NUUkVRKCJUaHJlZSIsIGl0ZW1zWzJdLnRva2Vuc1sw XS5jb250ZW50KTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoIkZvdXIiLCBpdGVtc1szXS50b2tlbnNb MF0uY29udGVudCk7Cit9CisKIFRFU1QoVGV4dE1hbmlwdWxhdGlvbiwgU3RhcnRUZXh0TWFuaXB1 bGF0aW9uRXh0cmFjdHNVc2VySW5mbykKIHsKICAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhb W1RleHRNYW5pcHVsYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOwo= 402022 2020-06-16 10:40:02 -0700 2020-06-16 11:11:28 -0700 Patch for landing bug-213251-20200616104002.patch text/plain 6475 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMDY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWYxZDg1YmY2MjljMWU5 MDQ4NzY3YWI3NDA1OTQ4Mjk4NGZjYWY0Ny4uNmZhMjcyZGRmNmI2MzkzN2Y4ZWFhOThlM2ZhYzE4 ODA2OGY2Y2E2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTA2LTE2ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFRleHQgbWFuaXB1 bGF0aW9uIHNob3VsZCBoYW5kbGUgbmVzdGVkIGl0ZW0gYm91bmRhcnkgZWxlbWVudHMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzI1MQorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNjMzNzE1MTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2lodWkg TGl1LgorCisgICAgICAgIEluIHRoZSBjYXNlIHdoZXJlIHRoZXJlIGFyZSBuZXN0ZWQgaXRlbSBi b3VuZGFyeSBlbGVtZW50cyAoZS5nLiBibG9jay1sZXZlbCBsaXN0IGl0ZW1zIG9yIGxpbmtzKSwg dGV4dAorICAgICAgICBtYW5pcHVsYXRpb24gd2lsbCBjdXJyZW50bHkgb25seSBvYnNlcnZlIHRo YXQgd2UndmUgY3Jvc3NlZCB0aGUgdG9wLWxldmVsIGl0ZW0gYm91bmRhcnksIGFuZCBwcm9jZWVk IHRvIGV4dHJhY3QKKyAgICAgICAgdGV4dCBmcm9tIHRoZSBuZXN0ZWQgYm91bmRhcnkgZWxlbWVu dHMgYXMgdG9rZW5zIGluIHRoZSBzYW1lIGl0ZW0uCisKKyAgICAgICAgQWRkcmVzcyB0aGlzIGJ5 IG1haW50YWluaW5nIGEgc3RhY2sgb2YgYm91bmRhcnkgZWxlbWVudHMgcmF0aGVyIHRoYW4ganVz dCBhIHNpbmdsZSBpdGVtLiBBZGRpdGlvbmFsbHksIGNyZWF0ZQorICAgICAgICBhbmQgYWRkIGFu IGl0ZW0gd2hlbiBjcm9zc2luZyBpbnRvIGEgbmV3IGl0ZW0gYm91bmRhcnksIHJhdGhlciB0aGFu IG9ubHkgd2hlbiB3ZSBleGl0IGEgYm91bmRhcnk7IHRoaXMgaGFuZGxlcworICAgICAgICB0aGUg Y2FzZSB3aGVyZSB3ZSBkZXNjZW5kIGZyb20gb25lIGJvdW5kYXJ5IGVsZW1lbnQgaW50byBhbm90 aGVyIGJvdW5kYXJ5IGVsZW1lbnQgdGhhdCBpcyBhIGNoaWxkLgorCisgICAgICAgIFRlc3Q6IFRl eHRNYW5pcHVsYXRpb24uU3RhcnRUZXh0TWFuaXB1bGF0aW9uVHJlYXRzTmVzdGVkSW5saW5lQmxv Y2tMaXN0SXRlbXNBbmRMaW5rc0FzUGFyYWdyYXBocworCisgICAgICAgICogZWRpdGluZy9UZXh0 TWFuaXB1bGF0aW9uQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0TWFuaXB1 bGF0aW9uQ29udHJvbGxlcjo6b2JzZXJ2ZVBhcmFncmFwaHMpOgorCiAyMDIwLTA2LTE1ICBLZWl0 aCBNaWxsZXIgIDxrZWl0aF9taWxsZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEpJVCB0aHVua3Mg c2hvdWxkIHdvcmsgb24gYXJtNjRfMzIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRp bmcvVGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGlu Zy9UZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlci5jcHAKaW5kZXggMmU0YjQ5MDkyNDk1M2VjYjg4 OGVlNDFmOWMzMjY4YTdjNTAxYjcxNS4uNWZhNGFhMTE0MzBiNDc4NGViNGQ2MTdiZWRhNjNmZTA3 Zjk2ZjkwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0TWFuaXB1bGF0 aW9uQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0TWFuaXB1 bGF0aW9uQ29udHJvbGxlci5jcHAKQEAgLTQwOSwxNiArNDA5LDE2IEBAIHZvaWQgVGV4dE1hbmlw dWxhdGlvbkNvbnRyb2xsZXI6Om9ic2VydmVQYXJhZ3JhcGhzKGNvbnN0IFBvc2l0aW9uJiBzdGFy dCwgY29uc3QKICAgICAgICAgcmV0dXJuOwogCiAgICAgVmVjdG9yPE1hbmlwdWxhdGlvblVuaXQ+ IHVuaXRzSW5DdXJyZW50UGFyYWdyYXBoOwotICAgIFJlZlB0cjxFbGVtZW50PiBlbmNsb3NpbmdJ dGVtQm91bmRhcnlFbGVtZW50OworICAgIFZlY3RvcjxSZWY8RWxlbWVudD4+IGVuY2xvc2luZ0l0 ZW1Cb3VuZGFyeUVsZW1lbnRzOwogICAgIFBhcmFncmFwaENvbnRlbnRJdGVyYXRvciBpdGVyYXRv ciB7IHN0YXJ0LCBlbmQgfTsKICAgICBmb3IgKDsgIWl0ZXJhdG9yLmF0RW5kKCk7IGl0ZXJhdG9y LmFkdmFuY2UoKSkgewogICAgICAgICBhdXRvIGNvbnRlbnQgPSBpdGVyYXRvci5jdXJyZW50Q29u dGVudCgpOwogICAgICAgICBhdXRvKiBjb250ZW50Tm9kZSA9IGNvbnRlbnQubm9kZS5nZXQoKTsK ICAgICAgICAgQVNTRVJUKGNvbnRlbnROb2RlKTsKIAotICAgICAgICBpZiAoZW5jbG9zaW5nSXRl bUJvdW5kYXJ5RWxlbWVudCAmJiAhZW5jbG9zaW5nSXRlbUJvdW5kYXJ5RWxlbWVudC0+Y29udGFp bnMoY29udGVudE5vZGUpKSB7CisgICAgICAgIHdoaWxlICghZW5jbG9zaW5nSXRlbUJvdW5kYXJ5 RWxlbWVudHMuaXNFbXB0eSgpICYmICFlbmNsb3NpbmdJdGVtQm91bmRhcnlFbGVtZW50cy5sYXN0 KCktPmNvbnRhaW5zKGNvbnRlbnROb2RlKSkgewogICAgICAgICAgICAgYWRkSXRlbUlmUG9zc2li bGUoc3RkOjpleGNoYW5nZSh1bml0c0luQ3VycmVudFBhcmFncmFwaCwgeyB9KSk7Ci0gICAgICAg ICAgICBlbmNsb3NpbmdJdGVtQm91bmRhcnlFbGVtZW50ID0gbnVsbHB0cjsKKyAgICAgICAgICAg IGVuY2xvc2luZ0l0ZW1Cb3VuZGFyeUVsZW1lbnRzLnJlbW92ZUxhc3QoKTsKICAgICAgICAgfQog CiAgICAgICAgIGlmIChSZWZQdHI8RWxlbWVudD4gY3VycmVudEVsZW1lbnRBbmNlc3RvciA9IGlz PEVsZW1lbnQ+KCpjb250ZW50Tm9kZSkgPyBkb3duY2FzdDxFbGVtZW50Pihjb250ZW50Tm9kZSkg OiBjb250ZW50Tm9kZS0+cGFyZW50T3JTaGFkb3dIb3N0RWxlbWVudCgpKSB7CkBAIC00NDQsOCAr NDQ0LDEwIEBAIHZvaWQgVGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXI6Om9ic2VydmVQYXJhZ3Jh cGhzKGNvbnN0IFBvc2l0aW9uJiBzdGFydCwgY29uc3QKICAgICAgICAgICAgICAgICAgICAgYWRk SXRlbShNYW5pcHVsYXRpb25JdGVtRGF0YSB7IHsgfSwgeyB9LCBtYWtlV2Vha1B0cihjdXJyZW50 RWxlbWVudCksIEhUTUxOYW1lczo6dmFsdWVBdHRyLCB7IE1hbmlwdWxhdGlvblRva2VuIHsgbV90 b2tlbklkZW50aWZpZXIuZ2VuZXJhdGUoKSwgaW5wdXQudmFsdWUoKSwgdG9rZW5JbmZvKCZjdXJy ZW50RWxlbWVudCkgfSB9IH0pOwogICAgICAgICAgICAgfQogCi0gICAgICAgICAgICBpZiAoIWVu Y2xvc2luZ0l0ZW1Cb3VuZGFyeUVsZW1lbnQgJiYgaXNFbmNsb3NpbmdJdGVtQm91bmRhcnlFbGVt ZW50KGN1cnJlbnRFbGVtZW50KSkKLSAgICAgICAgICAgICAgICBlbmNsb3NpbmdJdGVtQm91bmRh cnlFbGVtZW50ID0gJmN1cnJlbnRFbGVtZW50OworICAgICAgICAgICAgaWYgKGlzRW5jbG9zaW5n SXRlbUJvdW5kYXJ5RWxlbWVudChjdXJyZW50RWxlbWVudCkpIHsKKyAgICAgICAgICAgICAgICBh ZGRJdGVtSWZQb3NzaWJsZShzdGQ6OmV4Y2hhbmdlKHVuaXRzSW5DdXJyZW50UGFyYWdyYXBoLCB7 IH0pKTsKKyAgICAgICAgICAgICAgICBlbmNsb3NpbmdJdGVtQm91bmRhcnlFbGVtZW50cy5hcHBl bmQoY3VycmVudEVsZW1lbnQpOworICAgICAgICAgICAgfQogICAgICAgICB9CiAKICAgICAgICAg aWYgKGNvbnRlbnQuaXNSZXBsYWNlZENvbnRlbnQpIHsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5n ZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3NzlmODJlNDI2NmRjYThjMDgzZjQxMmE1MGFl YTRkNTRmNTdmOWJiLi5jYmFjOWU1OTZhNDc3ZWYxNWI3MWU3M2FmMjdlYTVjOWI2NDBiZDBmIDEw MDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTUgQEAKKzIwMjAtMDYtMTYgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5j b20+CisKKyAgICAgICAgVGV4dCBtYW5pcHVsYXRpb24gc2hvdWxkIGhhbmRsZSBuZXN0ZWQgaXRl bSBib3VuZGFyeSBlbGVtZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjEzMjUxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MzM3MTUxND4KKwor ICAgICAgICBSZXZpZXdlZCBieSBTaWh1aSBMaXUuCisKKyAgICAgICAgQWRkIGEgbmV3IEFQSSB0 ZXN0IHRvIGV4ZXJjaXNlIHRoaXMgc2NlbmFyaW8uCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL1RleHRNYW5pcHVsYXRpb24ubW06CisKIDIwMjAtMDYtMTUgIEpv bmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIEZvbGxvdy11cCBm aXg6IE1ha2UgQVBJIHRlc3RzIHRvbGVyYW50IG9mIG91ciByZWxhdGl2ZWx5IG5ldyB1c2Ugb2Yg V2ViUGFnZVByb3h5OjpwcmVjb25uZWN0VG8KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvVGV4dE1hbmlwdWxhdGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVGV4dE1hbmlwdWxhdGlvbi5tbQppbmRleCA2OWY3MTlk ZjZhZjU1YzA1YTExODY5MjA1NWYzZjNmNzIwYjM0YTJlLi40ZmI1YzU2YzM1OGRkZGRmYThhYjY0 MDM3ZWI3YjU1ZDQ5ODA0OWM0IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL1RleHRNYW5pcHVsYXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9UZXh0TWFuaXB1bGF0aW9uLm1tCkBAIC03NTEsNiArNzUxLDQy IEBAIFRFU1QoVGV4dE1hbmlwdWxhdGlvbiwgU3RhcnRUZXh0TWFuaXB1bGF0aW9uVHJlYXRzTGlu a3NJbk5hdmlnYXRpb25FbGVtZW50c0FzUGFyCiAgICAgRVhQRUNUX1dLX1NUUkVRKCJHYXJwbHki LCBpdGVtc1szXS50b2tlbnNbMF0uY29udGVudCk7CiB9CiAKK1RFU1QoVGV4dE1hbmlwdWxhdGlv biwgU3RhcnRUZXh0TWFuaXB1bGF0aW9uVHJlYXRzTmVzdGVkSW5saW5lQmxvY2tMaXN0SXRlbXNB bmRMaW5rc0FzUGFyYWdyYXBocykKK3sKKyAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhbW1Rl eHRNYW5pcHVsYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIGF1dG8gd2ViVmlldyA9 IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3Qo MCwgMCwgNDAwLCA0MDApXSk7CisgICAgW3dlYlZpZXcgX3NldFRleHRNYW5pcHVsYXRpb25EZWxl Z2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZEhU TUxTdHJpbmc6QCI8IURPQ1RZUEUgaHRtbD4iCisgICAgICAgICI8aGVhZD4iCisgICAgICAgICIg ICAgPHN0eWxlPiIKKyAgICAgICAgIiAgICAgICAgbGksIGEgeyBkaXNwbGF5OiBpbmxpbmUtYmxv Y2s7IG1hcmdpbjogMmVtOyB9IgorICAgICAgICAiICAgIDwvc3R5bGU+IgorICAgICAgICAiPC9o ZWFkPiIKKyAgICAgICAgIjxib2R5PiIKKyAgICAgICAgIiAgICA8b2w+IgorICAgICAgICAiICAg ICAgICA8bGk+T25lPGEgaHJlZj0nIyc+VHdvPC9hPjxhIGhyZWY9JyMnPlRocmVlPC9hPkZvdXI8 L2xpPiIKKyAgICAgICAgIiAgICA8L29sPiIKKyAgICAgICAgIjwvYm9keT4iXTsKKworICAgIGRv bmUgPSBmYWxzZTsKKyAgICBbd2ViVmlldyBfc3RhcnRUZXh0TWFuaXB1bGF0aW9uc1dpdGhDb25m aWd1cmF0aW9uOm5pbCBjb21wbGV0aW9uOl57CisgICAgICAgIGRvbmUgPSB0cnVlOworICAgIH1d OworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisKKyAgICBhdXRvIGl0ZW1z ID0gW2RlbGVnYXRlIGl0ZW1zXTsKKyAgICBFWFBFQ1RfRVEoaXRlbXMuY291bnQsIDRVTCk7Cisg ICAgRVhQRUNUX0VRKGl0ZW1zWzBdLnRva2Vucy5jb3VudCwgMVVMKTsKKyAgICBFWFBFQ1RfRVEo aXRlbXNbMV0udG9rZW5zLmNvdW50LCAxVUwpOworICAgIEVYUEVDVF9FUShpdGVtc1syXS50b2tl bnMuY291bnQsIDFVTCk7CisgICAgRVhQRUNUX0VRKGl0ZW1zWzNdLnRva2Vucy5jb3VudCwgMVVM KTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoIk9uZSIsIGl0ZW1zWzBdLnRva2Vuc1swXS5jb250ZW50 KTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoIlR3byIsIGl0ZW1zWzFdLnRva2Vuc1swXS5jb250ZW50 KTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoIlRocmVlIiwgaXRlbXNbMl0udG9rZW5zWzBdLmNvbnRl bnQpOworICAgIEVYUEVDVF9XS19TVFJFUSgiRm91ciIsIGl0ZW1zWzNdLnRva2Vuc1swXS5jb250 ZW50KTsKK30KKwogVEVTVChUZXh0TWFuaXB1bGF0aW9uLCBTdGFydFRleHRNYW5pcHVsYXRpb25F eHRyYWN0c1VzZXJJbmZvKQogewogICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtbVGV4dE1h bmlwdWxhdGlvbkRlbGVnYXRlIGFsbG9jXSBpbml0XSk7Cg==