213057 2020-06-10 16:08:28 -0700 Text manipulation does not observe inserted elements that are invisible 2020-06-10 17:28:12 -0700 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu ews-watchlist mifenton webkit-bug-importer wenson_hsieh oldest_to_newest 1661412 0 sihui_liu 2020-06-10 16:08:28 -0700 These inserted elements can become visible later. 1661413 1 sihui_liu 2020-06-10 16:08:56 -0700 <rdar://problem/63768253> 1661422 2 401600 sihui_liu 2020-06-10 16:22:48 -0700 Created attachment 401600 Patch 1661423 3 401600 wenson_hsieh 2020-06-10 16:25:00 -0700 Comment on attachment 401600 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401600&action=review > Source/WebCore/ChangeLog:10 > + element. It currently sets the observing range to be the visible start postion and visible end position of the postion => position > Source/WebCore/ChangeLog:15 > + Test: TextManipulation.CompleteTextManipulationCanSplitContent Nit - TextManipulation.StartTextManipulationFindsInsertedClippedText 1661439 4 401606 sihui_liu 2020-06-10 16:59:10 -0700 Created attachment 401606 Patch for landing 1661455 5 ews-feeder 2020-06-10 17:28:11 -0700 Committed r262879: <https://trac.webkit.org/changeset/262879> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401606. 401600 2020-06-10 16:22:48 -0700 2020-06-10 16:59:08 -0700 Patch bug-213057-20200610162247.patch text/plain 7001 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjMwNTM4OTVmYTUyMDBk NzRlOGFmYTVlNzI1NmRlNWYxZDAyYWRjNi4uY2VjZDM0MDRmM2RlZjM4YWQ5ZTAwOGMxNTI4NGQ3 YmM5ZDFjYWNkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA2LTEwICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFRleHQgbWFuaXB1bGF0aW9u IGRvZXMgbm90IG9ic2VydmUgaW5zZXJ0ZWQgZWxlbWVudHMgdGhhdCBhcmUgaW52aXNpYmxlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMwNTcKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYzNzY4MjUzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRleHRNYW5pcHVsYXRpb25Db250cm9sbGVyIGdldHMg bm90aWZpY2F0aW9uIHdoZW4gcmVuZGVyZXIgb2YgYW4gZWxlbWVudCBpcyBjcmVhdGVkIGFuZCBz dGFydHMgb2JzZXJ2aW5nIHRoZSAKKyAgICAgICAgZWxlbWVudC4gSXQgY3VycmVudGx5IHNldHMg dGhlIG9ic2VydmluZyByYW5nZSB0byBiZSB0aGUgdmlzaWJsZSBzdGFydCBwb3N0aW9uIGFuZCB2 aXNpYmxlIGVuZCBwb3NpdGlvbiBvZiB0aGUgCisgICAgICAgIGVsZW1lbnQuIFdoZW4gdGhlIGlu dmlzaWJsZSBjb250ZW50IGJlY29tZXMgdmlzaWJsZSBsYXRlciwgVGV4dE1hbmlwdWxhdGlvbkNv bnRyb2xsZXIgZG9lcyBub3QgZ2V0IG5vdGlmaWNhdGlvbiAKKyAgICAgICAgYW5kIHdpbGwgbWlz cyB0aGUgY29udGVudC4gVGhlcmVmb3JlLCBUZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlciB1c2Ug dGhlIGFjdHVhbCBzdGFydCBhbmQgZW5kIHBvc2l0aW9ucyBvZiB0aGUgCisgICAgICAgIGVsZW1l bnQgZm9yIHJhbmdlLgorCisgICAgICAgIFRlc3Q6IFRleHRNYW5pcHVsYXRpb24uQ29tcGxldGVU ZXh0TWFuaXB1bGF0aW9uQ2FuU3BsaXRDb250ZW50CisKKyAgICAgICAgKiBlZGl0aW5nL1RleHRN YW5pcHVsYXRpb25Db250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om1ha2VIYXNoYWJs ZVBvc2l0aW9uUmFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dE1hbmlwdWxhdGlvbkNvbnRy b2xsZXI6OnNjaGVkdWxlT2JzZXJ2YXRpb25VcGRhdGUpOgorCiAyMDIwLTA2LTEwICBZb3Vlbm4g RmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNjI3OTgp OiBmYXN0L21lZGlhc3RyZWFtL21lZGlhLXN0cmVhbS10cmFjay1pbnRlcnJ1cHRlZC5odG1sIGlz IGZhaWxpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dE1hbmlwdWxh dGlvbkNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0TWFuaXB1bGF0 aW9uQ29udHJvbGxlci5jcHAKaW5kZXggMDg0NzlkMWIzYTI4NGMwNmRjMzNiMjNjN2VjZTM1YmU1 M2I0ZDIxMi4uNTI2OTZhZjM0ZDY0NjFkZDE1OWZkMzA0YzZhMWIxM2U2YTg1ZjUzZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxl ci5jcHAKQEAgLTUwNyw5ICs1MDcsOSBAQCBzdGF0aWMgY29uc3QgUG9zaXRpb25UdXBsZSBtYWtl UG9zaXRpb25UdXBsZShjb25zdCBQb3NpdGlvbiYgcG9zaXRpb24pCiAgICAgcmV0dXJuIHsgcG9z aXRpb24uYW5jaG9yTm9kZSgpLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4ocG9zaXRpb24uYW5jaG9y VHlwZSgpKSwgcG9zaXRpb24uYW5jaG9yVHlwZSgpID09IFBvc2l0aW9uOjpQb3NpdGlvbklzT2Zm c2V0SW5BbmNob3IgPyBwb3NpdGlvbi5vZmZzZXRJbkNvbnRhaW5lck5vZGUoKSA6IDAgfTsKIH0K IAotc3RhdGljIGNvbnN0IHN0ZDo6cGFpcjxQb3NpdGlvblR1cGxlLCBQb3NpdGlvblR1cGxlPiBt YWtlSGFzaGFibGVQb3NpdGlvblJhbmdlKGNvbnN0IFZpc2libGVQb3NpdGlvbiYgc3RhcnQsIGNv bnN0IFZpc2libGVQb3NpdGlvbiYgZW5kKQorc3RhdGljIGNvbnN0IHN0ZDo6cGFpcjxQb3NpdGlv blR1cGxlLCBQb3NpdGlvblR1cGxlPiBtYWtlSGFzaGFibGVQb3NpdGlvblJhbmdlKGNvbnN0IFBv c2l0aW9uJiBzdGFydCwgY29uc3QgUG9zaXRpb24mIGVuZCkKIHsKLSAgICByZXR1cm4geyBtYWtl UG9zaXRpb25UdXBsZShzdGFydC5kZWVwRXF1aXZhbGVudCgpKSwgbWFrZVBvc2l0aW9uVHVwbGUo ZW5kLmRlZXBFcXVpdmFsZW50KCkpIH07CisgICAgcmV0dXJuIHsgbWFrZVBvc2l0aW9uVHVwbGUo c3RhcnQpLCBtYWtlUG9zaXRpb25UdXBsZShlbmQpIH07CiB9CiAKIHZvaWQgVGV4dE1hbmlwdWxh dGlvbkNvbnRyb2xsZXI6OnNjaGVkdWxlT2JzZXJ2YXRpb25VcGRhdGUoKQpAQCAtNTM3LDggKzUz Nyw4IEBAIHZvaWQgVGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXI6OnNjaGVkdWxlT2JzZXJ2YXRp b25VcGRhdGUoKQogCiAgICAgICAgIEhhc2hTZXQ8c3RkOjpwYWlyPFBvc2l0aW9uVHVwbGUsIFBv c2l0aW9uVHVwbGU+PiBwYXJhZ3JhcGhTZXRzOwogICAgICAgICBmb3IgKGF1dG8mIGVsZW1lbnQg OiBmaWx0ZXJlZEVsZW1lbnRzKSB7Ci0gICAgICAgICAgICBhdXRvIHN0YXJ0ID0gc3RhcnRPZlBh cmFncmFwaChmaXJzdFBvc2l0aW9uSW5PckJlZm9yZU5vZGUoZWxlbWVudC5wdHIoKSkpOwotICAg ICAgICAgICAgYXV0byBlbmQgPSBlbmRPZlBhcmFncmFwaChsYXN0UG9zaXRpb25Jbk9yQWZ0ZXJO b2RlKGVsZW1lbnQucHRyKCkpKTsKKyAgICAgICAgICAgIGF1dG8gc3RhcnQgPSBmaXJzdFBvc2l0 aW9uSW5PckJlZm9yZU5vZGUoZWxlbWVudC5wdHIoKSk7CisgICAgICAgICAgICBhdXRvIGVuZCA9 IGxhc3RQb3NpdGlvbkluT3JBZnRlck5vZGUoZWxlbWVudC5wdHIoKSk7CiAKICAgICAgICAgICAg IGlmIChzdGFydC5pc051bGwoKSB8fCBlbmQuaXNOdWxsKCkpCiAgICAgICAgICAgICAgICAgY29u dGludWU7CkBAIC01NDksOSArNTQ5LDkgQEAgdm9pZCBUZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxl cjo6c2NoZWR1bGVPYnNlcnZhdGlvblVwZGF0ZSgpCiAKICAgICAgICAgICAgIGF1dG8qIGNvbnRy b2xsZXIgPSB3ZWFrVGhpcy5nZXQoKTsKICAgICAgICAgICAgIGlmICghY29udHJvbGxlcikKLSAg ICAgICAgICAgICAgICByZXR1cm47IC8vIEZpbmRpbmcgdGhlIHN0YXJ0L2VuZCBvZiBwYXJhZ3Jh cGggbWF5IGhhdmUgdXBkYXRlZCBsYXlvdXQgJiBleGVjdXRlZCBhcmJpdHJhcnkgc2NyaXB0cy4K KyAgICAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgICAgIGNvbnRyb2xsZXItPm9ic2Vy dmVQYXJhZ3JhcGhzKHN0YXJ0LmRlZXBFcXVpdmFsZW50KCksIGVuZC5kZWVwRXF1aXZhbGVudCgp KTsKKyAgICAgICAgICAgIGNvbnRyb2xsZXItPm9ic2VydmVQYXJhZ3JhcGhzKHN0YXJ0LCBlbmQp OwogICAgICAgICB9CiAgICAgICAgIGNvbnRyb2xsZXItPmZsdXNoUGVuZGluZ0l0ZW1zRm9yQ2Fs bGJhY2soKTsKICAgICB9KTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCBiNTQxMjJhNWQ1NTQ5ZTNiNGY5NzdmNzg0YmEyZDIzMzhhYTFmMGZmLi5m NzZiZTIxNWIyYjIwYzdlZDMxOTQyYTk5NDFjMTU1NTVlOGY5NjM2IDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAt MDYtMTAgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgVGV4dCBt YW5pcHVsYXRpb24gZG9lcyBub3Qgb2JzZXJ2ZSBpbnNlcnRlZCBlbGVtZW50cyB0aGF0IGFyZSBp bnZpc2libGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxMzA1NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjM3NjgyNTM+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL1RleHRNYW5pcHVsYXRpb24ubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJ OjpURVNUKToKKwogMjAyMC0wNi0xMCAgQ29tbWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtp dC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2ZXJ0aW5nIHIyNjI4MDcuCmRpZmYgLS1n aXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1RleHRNYW5pcHVsYXRp b24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1RleHRNYW5pcHVs YXRpb24ubW0KaW5kZXggNDg3Zjk1YmFkNGJjMGQ5ZDZjY2JkNGFlZTA1ZjE3NjE5MDRhMmNjZS4u OGVhNmM3MTM0MGMzMTU4ZDNhYmI5ZGZkOTQwYmExOWZjM2I4MjcyNyAxMDA2NDQKLS0tIGEvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9UZXh0TWFuaXB1bGF0aW9uLm1tCisr KyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVGV4dE1hbmlwdWxhdGlv bi5tbQpAQCAtNjAyLDYgKzYwMiw2MCBAQCBURVNUKFRleHRNYW5pcHVsYXRpb24sIFN0YXJ0VGV4 dE1hbmlwdWxhdGlvbkluY2x1ZGVzRnVsbHlDbGlwcGVkVGV4dCkKICAgICBFWFBFQ1RfV0tfU1RS RVEoIk1vcmUgdGV4dCIsIGl0ZW1zWzFdLnRva2Vuc1swXS5jb250ZW50KTsKIH0KIAorVEVTVChU ZXh0TWFuaXB1bGF0aW9uLCBTdGFydFRleHRNYW5pcHVsYXRpb25GaW5kc0luc2VydGVkQ2xpcHBl ZFRleHQpCit7CisgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tUZXh0TWFuaXB1bGF0aW9u RGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVz dFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDQwMCwgNDAw KV0pOworICAgIFt3ZWJWaWV3IF9zZXRUZXh0TWFuaXB1bGF0aW9uRGVsZWdhdGU6ZGVsZWdhdGUu Z2V0KCldOworCisgICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxvYWRIVE1MU3RyaW5nOkAiPCFE T0NUWVBFIGh0bWw+IgorICAgICAgICAiPGhlYWQ+IgorICAgICAgICAiICAgIDxzdHlsZT4iCisg ICAgICAgICIgICAgICAgIHNwYW4geyBvdmVyZmxvdzogaGlkZGVuOyB3aWR0aDogMjAwcHg7IGhl aWdodDogMDsgfSIKKyAgICAgICAgIiAgICAgICAgcCB7IHZpc2liaWxpdHk6IGhpZGRlbjsgfSIK KyAgICAgICAgIiAgICA8L3N0eWxlPiIKKyAgICAgICAgIjwvaGVhZD4iCisgICAgICAgICI8Ym9k eT4iCisgICAgICAgICIgICAgPGRpdj5oZWxsbywgd29ybGQ8L2Rpdj4iCisgICAgICAgICI8L2Jv ZHk+Il07CisKKyAgICBkb25lID0gZmFsc2U7CisgICAgW3dlYlZpZXcgX3N0YXJ0VGV4dE1hbmlw dWxhdGlvbnNXaXRoQ29uZmlndXJhdGlvbjpuaWwgY29tcGxldGlvbjpeeworICAgICAgICBkb25l ID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOwor CisgICAgYXV0byAqaXRlbXMgPSBbZGVsZWdhdGUgaXRlbXNdOworICAgIEVYUEVDVF9FUShpdGVt cy5jb3VudCwgMVVMKTsKKworICAgIGRvbmUgPSBmYWxzZTsKKyAgICBkZWxlZ2F0ZS5nZXQoKS5p dGVtQ2FsbGJhY2sgPSBeKF9XS1RleHRNYW5pcHVsYXRpb25JdGVtICppdGVtKSB7CisgICAgICAg IGlmIChpdGVtcy5jb3VudCA9PSAyKQorICAgICAgICAgICAgZG9uZSA9IHRydWU7CisgICAgfTsK KyAgICBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAidmFyIGJlZm9yZUVs ZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdzcGFuJyk7IgorICAgICAgICAiYmVmb3Jl RWxlbWVudC5pbm5lckhUTUw9J2JlZm9yZSc7IgorICAgICAgICAiZG9jdW1lbnQucXVlcnlTZWxl Y3RvcignZGl2JykuYmVmb3JlKGJlZm9yZUVsZW1lbnQpOyJdOworICAgIFRlc3RXZWJLaXRBUEk6 OlV0aWw6OnJ1bigmZG9uZSk7CisKKyAgICBkb25lID0gZmFsc2U7CisgICAgZGVsZWdhdGUuZ2V0 KCkuaXRlbUNhbGxiYWNrID0gXihfV0tUZXh0TWFuaXB1bGF0aW9uSXRlbSAqaXRlbSkgeworICAg ICAgICBpZiAoaXRlbXMuY291bnQgPT0gMykKKyAgICAgICAgICAgIGRvbmUgPSB0cnVlOworICAg IH07CisgICAgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAInZhciBhZnRl ckVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCdwJyk7IgorICAgICAgICAiYWZ0ZXJF bGVtZW50LmlubmVySFRNTD0nYWZ0ZXInOyIKKyAgICAgICAgImRvY3VtZW50LnF1ZXJ5U2VsZWN0 b3IoJ2RpdicpLmFmdGVyKGFmdGVyRWxlbWVudCkiXTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGls OjpydW4oJmRvbmUpOworCisgICAgRVhQRUNUX0VRKGl0ZW1zWzBdLnRva2Vucy5jb3VudCwgMVVM KTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoImhlbGxvLCB3b3JsZCIsIGl0ZW1zWzBdLnRva2Vuc1sw XS5jb250ZW50KTsKKyAgICBFWFBFQ1RfRVEoaXRlbXNbMV0udG9rZW5zLmNvdW50LCAxVUwpOwor ICAgIEVYUEVDVF9XS19TVFJFUSgiYmVmb3JlIiwgaXRlbXNbMV0udG9rZW5zWzBdLmNvbnRlbnQp OworICAgIEVYUEVDVF9FUShpdGVtc1syXS50b2tlbnMuY291bnQsIDFVTCk7CisgICAgRVhQRUNU X1dLX1NUUkVRKCJhZnRlciIsIGl0ZW1zWzJdLnRva2Vuc1swXS5jb250ZW50KTsKK30KKwogVEVT VChUZXh0TWFuaXB1bGF0aW9uLCBTdGFydFRleHRNYW5pcHVsYXRpb25UcmVhdHNJbmxpbmVCbG9j a0xpbmtzQW5kQnV0dG9uc0FzUGFyYWdyYXBocykKIHsKICAgICBhdXRvIGRlbGVnYXRlID0gYWRv cHROUyhbW1RleHRNYW5pcHVsYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOwo= 401606 2020-06-10 16:59:10 -0700 2020-06-10 17:28:12 -0700 Patch for landing bug-213057-20200610165909.patch text/plain 7011 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjMwNTM4OTVmYTUyMDBk NzRlOGFmYTVlNzI1NmRlNWYxZDAyYWRjNi4uZjZkMWJmZGYzNmVmNjVhYTdiYmU0ZmMxY2JmMTc3 ZDk5NDgzODA1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA2LTEwICBTaWh1 aSBMaXUgIDxzaWh1aV9saXVAYXBwbGUuY29tPgorCisgICAgICAgIFRleHQgbWFuaXB1bGF0aW9u IGRvZXMgbm90IG9ic2VydmUgaW5zZXJ0ZWQgZWxlbWVudHMgdGhhdCBhcmUgaW52aXNpYmxlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTMwNTcKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYzNzY4MjUzPgorCisgICAgICAgIFJldmlld2VkIGJ5IFdl bnNvbiBIc2llaC4KKworICAgICAgICBUZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlciBnZXRzIG5v dGlmaWNhdGlvbiB3aGVuIHJlbmRlcmVyIG9mIGFuIGVsZW1lbnQgaXMgY3JlYXRlZCBhbmQgc3Rh cnRzIG9ic2VydmluZyB0aGUgCisgICAgICAgIGVsZW1lbnQuIEl0IGN1cnJlbnRseSBzZXRzIHRo ZSBvYnNlcnZpbmcgcmFuZ2UgdG8gYmUgdGhlIHZpc2libGUgc3RhcnQgcG9zaXRpb24gYW5kIHZp c2libGUgZW5kIHBvc2l0aW9uIG9mIHRoZSAKKyAgICAgICAgZWxlbWVudC4gV2hlbiB0aGUgaW52 aXNpYmxlIGNvbnRlbnQgYmVjb21lcyB2aXNpYmxlIGxhdGVyLCBUZXh0TWFuaXB1bGF0aW9uQ29u dHJvbGxlciBkb2VzIG5vdCBnZXQgbm90aWZpY2F0aW9uIAorICAgICAgICBhbmQgd2lsbCBtaXNz IHRoZSBjb250ZW50LiBUaGVyZWZvcmUsIFRleHRNYW5pcHVsYXRpb25Db250cm9sbGVyIHNob3Vs ZCB1c2UgdGhlIGFjdHVhbCBzdGFydCBhbmQgZW5kIHBvc2l0aW9ucyAKKyAgICAgICAgb2YgdGhl IGVsZW1lbnQgZm9yIHJhbmdlLgorCisgICAgICAgIFRlc3Q6IFRleHRNYW5pcHVsYXRpb24uU3Rh cnRUZXh0TWFuaXB1bGF0aW9uRmluZHNJbnNlcnRlZENsaXBwZWRUZXh0CisKKyAgICAgICAgKiBl ZGl0aW5nL1RleHRNYW5pcHVsYXRpb25Db250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Om1ha2VIYXNoYWJsZVBvc2l0aW9uUmFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6VGV4dE1hbmlw dWxhdGlvbkNvbnRyb2xsZXI6OnNjaGVkdWxlT2JzZXJ2YXRpb25VcGRhdGUpOgorCiAyMDIwLTA2 LTEwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNT SU9OKHIyNjI3OTgpOiBmYXN0L21lZGlhc3RyZWFtL21lZGlhLXN0cmVhbS10cmFjay1pbnRlcnJ1 cHRlZC5odG1sIGlzIGZhaWxpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv VGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9U ZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlci5jcHAKaW5kZXggMDg0NzlkMWIzYTI4NGMwNmRjMzNi MjNjN2VjZTM1YmU1M2I0ZDIxMi4uNTI2OTZhZjM0ZDY0NjFkZDE1OWZkMzA0YzZhMWIxM2U2YTg1 ZjUzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0TWFuaXB1bGF0aW9u Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0TWFuaXB1bGF0 aW9uQ29udHJvbGxlci5jcHAKQEAgLTUwNyw5ICs1MDcsOSBAQCBzdGF0aWMgY29uc3QgUG9zaXRp b25UdXBsZSBtYWtlUG9zaXRpb25UdXBsZShjb25zdCBQb3NpdGlvbiYgcG9zaXRpb24pCiAgICAg cmV0dXJuIHsgcG9zaXRpb24uYW5jaG9yTm9kZSgpLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4ocG9z aXRpb24uYW5jaG9yVHlwZSgpKSwgcG9zaXRpb24uYW5jaG9yVHlwZSgpID09IFBvc2l0aW9uOjpQ b3NpdGlvbklzT2Zmc2V0SW5BbmNob3IgPyBwb3NpdGlvbi5vZmZzZXRJbkNvbnRhaW5lck5vZGUo KSA6IDAgfTsKIH0KIAotc3RhdGljIGNvbnN0IHN0ZDo6cGFpcjxQb3NpdGlvblR1cGxlLCBQb3Np dGlvblR1cGxlPiBtYWtlSGFzaGFibGVQb3NpdGlvblJhbmdlKGNvbnN0IFZpc2libGVQb3NpdGlv biYgc3RhcnQsIGNvbnN0IFZpc2libGVQb3NpdGlvbiYgZW5kKQorc3RhdGljIGNvbnN0IHN0ZDo6 cGFpcjxQb3NpdGlvblR1cGxlLCBQb3NpdGlvblR1cGxlPiBtYWtlSGFzaGFibGVQb3NpdGlvblJh bmdlKGNvbnN0IFBvc2l0aW9uJiBzdGFydCwgY29uc3QgUG9zaXRpb24mIGVuZCkKIHsKLSAgICBy ZXR1cm4geyBtYWtlUG9zaXRpb25UdXBsZShzdGFydC5kZWVwRXF1aXZhbGVudCgpKSwgbWFrZVBv c2l0aW9uVHVwbGUoZW5kLmRlZXBFcXVpdmFsZW50KCkpIH07CisgICAgcmV0dXJuIHsgbWFrZVBv c2l0aW9uVHVwbGUoc3RhcnQpLCBtYWtlUG9zaXRpb25UdXBsZShlbmQpIH07CiB9CiAKIHZvaWQg VGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXI6OnNjaGVkdWxlT2JzZXJ2YXRpb25VcGRhdGUoKQpA QCAtNTM3LDggKzUzNyw4IEBAIHZvaWQgVGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXI6OnNjaGVk dWxlT2JzZXJ2YXRpb25VcGRhdGUoKQogCiAgICAgICAgIEhhc2hTZXQ8c3RkOjpwYWlyPFBvc2l0 aW9uVHVwbGUsIFBvc2l0aW9uVHVwbGU+PiBwYXJhZ3JhcGhTZXRzOwogICAgICAgICBmb3IgKGF1 dG8mIGVsZW1lbnQgOiBmaWx0ZXJlZEVsZW1lbnRzKSB7Ci0gICAgICAgICAgICBhdXRvIHN0YXJ0 ID0gc3RhcnRPZlBhcmFncmFwaChmaXJzdFBvc2l0aW9uSW5PckJlZm9yZU5vZGUoZWxlbWVudC5w dHIoKSkpOwotICAgICAgICAgICAgYXV0byBlbmQgPSBlbmRPZlBhcmFncmFwaChsYXN0UG9zaXRp b25Jbk9yQWZ0ZXJOb2RlKGVsZW1lbnQucHRyKCkpKTsKKyAgICAgICAgICAgIGF1dG8gc3RhcnQg PSBmaXJzdFBvc2l0aW9uSW5PckJlZm9yZU5vZGUoZWxlbWVudC5wdHIoKSk7CisgICAgICAgICAg ICBhdXRvIGVuZCA9IGxhc3RQb3NpdGlvbkluT3JBZnRlck5vZGUoZWxlbWVudC5wdHIoKSk7CiAK ICAgICAgICAgICAgIGlmIChzdGFydC5pc051bGwoKSB8fCBlbmQuaXNOdWxsKCkpCiAgICAgICAg ICAgICAgICAgY29udGludWU7CkBAIC01NDksOSArNTQ5LDkgQEAgdm9pZCBUZXh0TWFuaXB1bGF0 aW9uQ29udHJvbGxlcjo6c2NoZWR1bGVPYnNlcnZhdGlvblVwZGF0ZSgpCiAKICAgICAgICAgICAg IGF1dG8qIGNvbnRyb2xsZXIgPSB3ZWFrVGhpcy5nZXQoKTsKICAgICAgICAgICAgIGlmICghY29u dHJvbGxlcikKLSAgICAgICAgICAgICAgICByZXR1cm47IC8vIEZpbmRpbmcgdGhlIHN0YXJ0L2Vu ZCBvZiBwYXJhZ3JhcGggbWF5IGhhdmUgdXBkYXRlZCBsYXlvdXQgJiBleGVjdXRlZCBhcmJpdHJh cnkgc2NyaXB0cy4KKyAgICAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgICAgIGNvbnRy b2xsZXItPm9ic2VydmVQYXJhZ3JhcGhzKHN0YXJ0LmRlZXBFcXVpdmFsZW50KCksIGVuZC5kZWVw RXF1aXZhbGVudCgpKTsKKyAgICAgICAgICAgIGNvbnRyb2xsZXItPm9ic2VydmVQYXJhZ3JhcGhz KHN0YXJ0LCBlbmQpOwogICAgICAgICB9CiAgICAgICAgIGNvbnRyb2xsZXItPmZsdXNoUGVuZGlu Z0l0ZW1zRm9yQ2FsbGJhY2soKTsKICAgICB9KTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxv ZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiNTQxMjJhNWQ1NTQ5ZTNiNGY5NzdmNzg0YmEyZDIz MzhhYTFmMGZmLi5lM2E5MzBmNzc3NGRhZDBmYWM5NmZhNDdhYTM1ODI5NWUwNTlhYTc0IDEwMDY0 NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTQgQEAKKzIwMjAtMDYtMTAgIFNpaHVpIExpdSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAg ICAgICAgVGV4dCBtYW5pcHVsYXRpb24gZG9lcyBub3Qgb2JzZXJ2ZSBpbnNlcnRlZCBlbGVtZW50 cyB0aGF0IGFyZSBpbnZpc2libGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIxMzA1NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjM3NjgyNTM+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVoLgorCisgICAgICAgICogVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9UZXh0TWFuaXB1bGF0aW9uLm1tOgorICAgICAgICAoVGVz dFdlYktpdEFQSTo6VEVTVCk6CisKIDIwMjAtMDYtMTAgIENvbW1pdCBRdWV1ZSAgPGNvbW1pdC1x dWV1ZUB3ZWJraXQub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJldmVydGluZyByMjYyODA3 LgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9UZXh0 TWFuaXB1bGF0aW9uLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9U ZXh0TWFuaXB1bGF0aW9uLm1tCmluZGV4IDQ4N2Y5NWJhZDRiYzBkOWQ2Y2NiZDRhZWUwNWYxNzYx OTA0YTJjY2UuLjhlYTZjNzEzNDBjMzE1OGQzYWJiOWRmZDk0MGJhMTlmYzNiODI3MjcgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVGV4dE1hbmlwdWxh dGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1RleHRN YW5pcHVsYXRpb24ubW0KQEAgLTYwMiw2ICs2MDIsNjAgQEAgVEVTVChUZXh0TWFuaXB1bGF0aW9u LCBTdGFydFRleHRNYW5pcHVsYXRpb25JbmNsdWRlc0Z1bGx5Q2xpcHBlZFRleHQpCiAgICAgRVhQ RUNUX1dLX1NUUkVRKCJNb3JlIHRleHQiLCBpdGVtc1sxXS50b2tlbnNbMF0uY29udGVudCk7CiB9 CiAKK1RFU1QoVGV4dE1hbmlwdWxhdGlvbiwgU3RhcnRUZXh0TWFuaXB1bGF0aW9uRmluZHNJbnNl cnRlZENsaXBwZWRUZXh0KQoreworICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtbVGV4dE1h bmlwdWxhdGlvbkRlbGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRv cHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAw LCA0MDAsIDQwMCldKTsKKyAgICBbd2ViVmlldyBfc2V0VGV4dE1hbmlwdWxhdGlvbkRlbGVnYXRl OmRlbGVnYXRlLmdldCgpXTsKKworICAgIFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlMb2FkSFRNTFN0 cmluZzpAIjwhRE9DVFlQRSBodG1sPiIKKyAgICAgICAgIjxoZWFkPiIKKyAgICAgICAgIiAgICA8 c3R5bGU+IgorICAgICAgICAiICAgICAgICBzcGFuIHsgb3ZlcmZsb3c6IGhpZGRlbjsgd2lkdGg6 IDIwMHB4OyBoZWlnaHQ6IDA7IH0iCisgICAgICAgICIgICAgICAgIHAgeyB2aXNpYmlsaXR5OiBo aWRkZW47IH0iCisgICAgICAgICIgICAgPC9zdHlsZT4iCisgICAgICAgICI8L2hlYWQ+IgorICAg ICAgICAiPGJvZHk+IgorICAgICAgICAiICAgIDxkaXY+aGVsbG8sIHdvcmxkPC9kaXY+IgorICAg ICAgICAiPC9ib2R5PiJdOworCisgICAgZG9uZSA9IGZhbHNlOworICAgIFt3ZWJWaWV3IF9zdGFy dFRleHRNYW5pcHVsYXRpb25zV2l0aENvbmZpZ3VyYXRpb246bmlsIGNvbXBsZXRpb246XnsKKyAg ICAgICAgZG9uZSA9IHRydWU7CisgICAgfV07CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVu KCZkb25lKTsKKworICAgIGF1dG8gKml0ZW1zID0gW2RlbGVnYXRlIGl0ZW1zXTsKKyAgICBFWFBF Q1RfRVEoaXRlbXMuY291bnQsIDFVTCk7CisKKyAgICBkb25lID0gZmFsc2U7CisgICAgZGVsZWdh dGUuZ2V0KCkuaXRlbUNhbGxiYWNrID0gXihfV0tUZXh0TWFuaXB1bGF0aW9uSXRlbSAqaXRlbSkg eworICAgICAgICBpZiAoaXRlbXMuY291bnQgPT0gMikKKyAgICAgICAgICAgIGRvbmUgPSB0cnVl OworICAgIH07CisgICAgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAInZh ciBiZWZvcmVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnc3BhbicpOyIKKyAgICAg ICAgImJlZm9yZUVsZW1lbnQuaW5uZXJIVE1MPSdiZWZvcmUnOyIKKyAgICAgICAgImRvY3VtZW50 LnF1ZXJ5U2VsZWN0b3IoJ2RpdicpLmJlZm9yZShiZWZvcmVFbGVtZW50KTsiXTsKKyAgICBUZXN0 V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworCisgICAgZG9uZSA9IGZhbHNlOworICAgIGRl bGVnYXRlLmdldCgpLml0ZW1DYWxsYmFjayA9IF4oX1dLVGV4dE1hbmlwdWxhdGlvbkl0ZW0gKml0 ZW0pIHsKKyAgICAgICAgaWYgKGl0ZW1zLmNvdW50ID09IDMpCisgICAgICAgICAgICBkb25lID0g dHJ1ZTsKKyAgICB9OworICAgIFt3ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6 QCJ2YXIgYWZ0ZXJFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgncCcpOyIKKyAgICAg ICAgImFmdGVyRWxlbWVudC5pbm5lckhUTUw9J2FmdGVyJzsiCisgICAgICAgICJkb2N1bWVudC5x dWVyeVNlbGVjdG9yKCdkaXYnKS5hZnRlcihhZnRlckVsZW1lbnQpIl07CisgICAgVGVzdFdlYktp dEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKworICAgIEVYUEVDVF9FUShpdGVtc1swXS50b2tlbnMu Y291bnQsIDFVTCk7CisgICAgRVhQRUNUX1dLX1NUUkVRKCJoZWxsbywgd29ybGQiLCBpdGVtc1sw XS50b2tlbnNbMF0uY29udGVudCk7CisgICAgRVhQRUNUX0VRKGl0ZW1zWzFdLnRva2Vucy5jb3Vu dCwgMVVMKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoImJlZm9yZSIsIGl0ZW1zWzFdLnRva2Vuc1sw XS5jb250ZW50KTsKKyAgICBFWFBFQ1RfRVEoaXRlbXNbMl0udG9rZW5zLmNvdW50LCAxVUwpOwor ICAgIEVYUEVDVF9XS19TVFJFUSgiYWZ0ZXIiLCBpdGVtc1syXS50b2tlbnNbMF0uY29udGVudCk7 Cit9CisKIFRFU1QoVGV4dE1hbmlwdWxhdGlvbiwgU3RhcnRUZXh0TWFuaXB1bGF0aW9uVHJlYXRz SW5saW5lQmxvY2tMaW5rc0FuZEJ1dHRvbnNBc1BhcmFncmFwaHMpCiB7CiAgICAgYXV0byBkZWxl Z2F0ZSA9IGFkb3B0TlMoW1tUZXh0TWFuaXB1bGF0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsK