204655 2019-11-27 16:10:15 -0800 [LFC][IFC] Trim trailing uncommitted content when needed 2019-11-29 06:29:37 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1593927 0 zalan 2019-11-27 16:10:15 -0800 it helps to fit the content on the line. 1593928 1 webkit-bug-importer 2019-11-27 16:10:34 -0800 <rdar://problem/57511053> 1593929 2 384428 zalan 2019-11-27 16:25:39 -0800 Created attachment 384428 Patch 1594127 3 384428 zalan 2019-11-28 21:27:23 -0800 Comment on attachment 384428 Patch Have a better idea 1594129 4 384478 zalan 2019-11-28 21:39:53 -0800 Created attachment 384478 Patch 1594186 5 zalan 2019-11-29 06:29:37 -0800 Committed r252941: <https://trac.webkit.org/changeset/252941> 384428 2019-11-27 16:25:39 -0800 2019-11-28 21:27:23 -0800 Patch bug-204655-20191127162511.patch text/plain 9871 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyOTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjZiMTlkNzc3ZDI5YzRk MzQ2YmRiMDE4N2Y1MmMxYjY3ZmEwYjQxYy4uOTM0YzNmZTIwYWI5ZThiNzQxY2RhMDI1MGJiOWFm OTFkOWU0MzFlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE5LTExLTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBUcmltIHRy YWlsaW5nIHVuY29tbWl0dGVkIGNvbnRlbnQgd2hlbiBuZWVkZWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDY1NQorICAgICAgICA8cmRhcjovL3By b2JsZW0vNTc1MTEwNTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2hlbiB3ZSB0cnkgdG8gZml0IHRoZSB0cmFpbGluZyBpbmxpbmUgcnVucyBvbiB0 aGUgbGluZSwgd2UgaGF2ZSB0byBtYWtlIHN1cmUgdHJpbW1hYmxlIHRyYWlsaW5nIHdoaXRlc3Bh Y2UgY29udGVudCBpcyB0YWtlbiBpbnRvIGFjY291bnQuIAorCisgICAgICAgIDxkaXYgc3R5bGU9 ImZsb2F0OiBsZWZ0Ij50ZXh0PHNwYW4gc3R5bGU9InBhZGRpbmctcmlnaHQ6IDIwcHgiPiA8L3Nw YW4+PC9kaXY+CisgICAgICAgIDwtIEFzIHdlIGNvbXB1dGUgdGhlIGNvbnRlbnQgd2lkdGggb2Yg ZmxvYXRpbmcgYm94IHVzaW5nIHNocmluayB0byBmaXQsIHdlIHRyaW0gdGhlIHRyYWlsaW5nIHdo aXRlc3BhY2UgYXQgdGhlIGVuZCBzbworICAgICAgICB0aGUgZmluYWwgd2lkdGggaW5jbHVkZXMg dGhlIGZvbGxvd2luZyBydW5zIFt0ZXh0OiA0MXB4XVtjb250YWluZXIgc3RhcnQ6IDBweF1bY29u dGFpbmVyIGVuZDogMjBweF0gLT4gNjFweCAoaXQgd291bGQgYmUgNjVweCB3aXRoIHRoZSB3aGl0 ZXNwYWNlIGNvbnRlbnQpCisgICAgICAgIEFzIHdlIHBsYWNlIHRoZSBpbmxpbmUgY29udGVudCBh bmQgd2UgcmVhY2ggdGhlIGZpbmFsIHRyYWlsaW5nIGNvbnRlbnQgWyBdW2NvbnRhaW5lciBlbmRd LCB0aGUgbGluZSBoYXMgb25seSAyMHB4IGF2YWlsYWJsZSB3aWR0aCBsZWZ0LCB3aGlsZSB0aGUg Y29udGVudCBpcyAyNHB4IGxvbmcuCisgICAgICAgIEF0IHRoaXMgcG9pbnQgd2UgbmVlZCB0byBh ZGp1c3QgdGhlIHRyYWlsaW5nIHdoaXRlc3BhY2UgcnVuJ3Mgd2lkdGggdG8gcmVmbGVjdCBpdHMg ZmluYWwgc2l6ZSAoMHB4KS4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6c2hvdWxkUHJl c2VydmVUcmFpbGluZ0NvbnRlbnQpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5n L0xpbmVMYXlvdXRDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUxh eW91dENvbnRleHQ6OnByb2Nlc3NVbmNvbW1pdHRlZENvbnRlbnQpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lTGF5b3V0Q29udGV4dDo6c2hvdWxkUHJvY2Vzc1VuY29tbWl0dGVkQ29u dGVudCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVMYXlvdXRDb250ZXh0 Ojp0cmltVW5jb21taXR0ZWRUcmFpbGluZ0NvbnRlbnRJZk5lZWRlZCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkxpbmVMYXlvdXRDb250ZXh0OjpVbmNvbW1pdHRlZENvbnRlbnQ6OnRyaW1U cmFpbGluZ1doaXRlc3BhY2VDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9MaW5lTGF5b3V0Q29udGV4dC5oOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0 aW5nL3RleHQvVGV4dFV0aWwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUZXh0VXRp bDo6c2hvdWxkUHJlc2VydmVUcmFpbGluZ1doaXRlc3BhY2UpOgorICAgICAgICAqIGxheW91dC9p bmxpbmVmb3JtYXR0aW5nL3RleHQvVGV4dFV0aWwuaDoKKwogMjAxOS0xMS0yNyAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gR2VuZXJhdGUgZmV3 ZXIgSW5saW5lSXRlbXMgd2hlbiBuZXcgbGluZXMgYXJlIG5vdCBwcmVzZXJ2ZWQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWls ZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxp bmVCdWlsZGVyLmNwcAppbmRleCBhN2M3ZTE2MTNiMzI1ZDhmMDg0MzY2NWY0NDYzODMwNzZjNDkw OWU0Li41N2FjOTI0YTYyNzljYjdkNzJlZjcyMmNhMDkzMjQwZWFlMjhmOTNiIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJ1aWxkZXIuY3BwCkBAIC0yNDAsOCArMjQwLDcgQEAgc3RhdGljIGJvb2wgc2hvdWxkUHJl c2VydmVUcmFpbGluZ0NvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVt KQogewogICAgIGlmICghaW5saW5lVGV4dEl0ZW0uaXNXaGl0ZXNwYWNlKCkpCiAgICAgICAgIHJl dHVybiB0cnVlOwotICAgIGF1dG8gd2hpdGVzcGFjZSA9IGlubGluZVRleHRJdGVtLnN0eWxlKCku d2hpdGVTcGFjZSgpOwotICAgIHJldHVybiB3aGl0ZXNwYWNlID09IFdoaXRlU3BhY2U6OlByZSB8 fCB3aGl0ZXNwYWNlID09IFdoaXRlU3BhY2U6OlByZVdyYXA7CisgICAgcmV0dXJuIFRleHRVdGls OjpzaG91bGRQcmVzZXJ2ZVRyYWlsaW5nV2hpdGVzcGFjZShpbmxpbmVUZXh0SXRlbS5zdHlsZSgp KTsKIH0KIAogc3RhdGljIGJvb2wgc2hvdWxkUHJlc2VydmVMZWFkaW5nQ29udGVudChjb25zdCBJ bmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5jcHAKaW5k ZXggZGM3NWI4YmRhMDkwNTJkOWVhYjY1YjQwZmU4YmRlM2Q2OTlmYjAxZS4uZTVhN2U2MDI4MjM0 ZjZiZjQwNTU1YWY1YjczZTgyNDM5MmE5NzVjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmNwcApA QCAtMjEwLDYgKzIxMCw3IEBAIExpbmVMYXlvdXRDb250ZXh0OjpJc0VuZE9mTGluZSBMaW5lTGF5 b3V0Q29udGV4dDo6cGxhY2VJbmxpbmVJdGVtKExpbmVCdWlsZGVyJiBsCiBMaW5lTGF5b3V0Q29u dGV4dDo6SXNFbmRPZkxpbmUgTGluZUxheW91dENvbnRleHQ6OnByb2Nlc3NVbmNvbW1pdHRlZENv bnRlbnQoTGluZUJ1aWxkZXImIGxpbmUpCiB7CiAgICAgLy8gQ2hlY2sgaWYgdGhlIHBlbmRpbmcg Y29udGVudCBmaXRzLgorICAgIHRyaW1VbmNvbW1pdHRlZFRyYWlsaW5nQ29udGVudElmTmVlZGVk KCk7CiAgICAgYXV0byBsaW5lSXNDb25zaWRlcmVkRW1wdHkgPSBsaW5lLmlzVmlzdWFsbHlFbXB0 eSgpICYmICFsaW5lLmhhc0ludHJ1c2l2ZUZsb2F0KCk7CiAgICAgYXV0byBicmVha2luZ0NvbnRl eHQgPSBMaW5lQnJlYWtlcigpLmJyZWFraW5nQ29udGV4dEZvcklubGluZUNvbnRlbnQobV91bmNv bW1pdHRlZENvbnRlbnQucnVucygpLCBtX3VuY29tbWl0dGVkQ29udGVudC53aWR0aCgpLCBsaW5l LmF2YWlsYWJsZVdpZHRoKCksIGxpbmVJc0NvbnNpZGVyZWRFbXB0eSk7CiAgICAgLy8gVGhlIHVu Y29tbWl0dGVkIGNvbnRlbnQgY2FuIGZ1bGx5LCBwYXJ0aWFsbHkgZml0IHRoZSBjdXJyZW50IGxp bmUgKGNvbW1pdC9wYXJ0aWFsIGNvbW1pdCkgb3Igbm90IGF0IGFsbCAocmVzZXQpLgpAQCAtMzA0 LDggKzMwNSwxMiBAQCBib29sIExpbmVMYXlvdXRDb250ZXh0OjpzaG91bGRQcm9jZXNzVW5jb21t aXR0ZWRDb250ZW50KGNvbnN0IElubGluZUl0ZW0mIGlubGluZQogICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwogICAgICAgICAvLyAnICc8c3Bhbj4gLT4gbGV0J3MgY29tbWl0IHRoZSB3aGl0ZXNw YWNlCiAgICAgICAgIC8vIHRleHQ8c3Bhbj4gLT4gYnV0IG5vdCB5ZXQgdGhlIG5vbi13aGl0ZXNw YWNlOyB3ZSBuZWVkIHRvIGtub3cgd2hhdCBjb21lcyBuZXh0IChlLmcuIHRleHQ8c3Bhbj50ZXh0 IG9yIHRleHQ8c3Bhbj48aW1nPikuCi0gICAgICAgIGlmIChsYXN0VW5jb21pdHRlZENvbnRlbnQt PmlzVGV4dCgpKQorICAgICAgICBpZiAobGFzdFVuY29taXR0ZWRDb250ZW50LT5pc1RleHQoKSkg eworICAgICAgICAgICAgLy8gJyAnPC9zcGFuPiB3aGl0ZXBhY2UgYW5kIHRoZSBjb250YWluZXIg ZW5kIGZvcm0gYW4gdW5icmVha2FibGUgY29udGVudC4KKyAgICAgICAgICAgIGlmIChpbmxpbmVJ dGVtLmlzQ29udGFpbmVyRW5kKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg ICAgICAgICAgcmV0dXJuIGRvd25jYXN0PElubGluZVRleHRJdGVtPigqbGFzdFVuY29taXR0ZWRD b250ZW50KS5pc1doaXRlc3BhY2UoKTsKKyAgICAgICAgfQogICAgICAgICAvLyA8aW1nPjxzcGFu PiAtPiBpdCdzIG9rIHRvIGNvbW1pdCB0aGUgaW5saW5lIGJveCBjb250ZW50LgogICAgICAgICAv LyA8aW1nPjwvc3Bhbj4gLT4gdGhlIGlubGluZSBib3ggYW5kIHRoZSBjbG9zaW5nIGlubGluZSBj b250YWluZXIgZm9ybSBhbiB1bmJyZWFrYWJsZSBjb250aW51b3VzIGNvbnRlbnQuCiAgICAgICAg IGlmIChsYXN0VW5jb21pdHRlZENvbnRlbnQtPmlzQm94KCkpCkBAIC0zMTcsNiArMzIyLDIzIEBA IGJvb2wgTGluZUxheW91dENvbnRleHQ6OnNob3VsZFByb2Nlc3NVbmNvbW1pdHRlZENvbnRlbnQo Y29uc3QgSW5saW5lSXRlbSYgaW5saW5lCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK3ZvaWQgTGlu ZUxheW91dENvbnRleHQ6OnRyaW1VbmNvbW1pdHRlZFRyYWlsaW5nQ29udGVudElmTmVlZGVkKCkK K3sKKyAgICBBU1NFUlQoIW1fdW5jb21taXR0ZWRDb250ZW50LmlzRW1wdHkoKSk7CisgICAgYXV0 byYgdW5jb21taXR0ZWRSdW5zID0gbV91bmNvbW1pdHRlZENvbnRlbnQucnVucygpOworICAgIGF1 dG8gaXNQcm9jZXNzaW5nVHJhaWxpbmdDb250ZW50ID0gJnVuY29tbWl0dGVkUnVucy5sYXN0KCku aW5saW5lSXRlbSA9PSBtX2lubGluZUl0ZW1zLmxhc3QoKS5nZXQoKTsKKyAgICBpZiAoIWlzUHJv Y2Vzc2luZ1RyYWlsaW5nQ29udGVudCkKKyAgICAgICAgcmV0dXJuOworICAgIC8vIFdlIG5lZWQg dG8gY2hlY2sgaWYgdGhlcmUncyBhIHRyYWlsaW5nIHRyaW1tYWJsZSBjb250ZW50IHRoYXQgd291 bGQgYmUgdHJpbW1lZCBhbnl3YXkuCisgICAgLy8gPGRpdiBzdHlsZT0iZmxvYXQ6IGxlZnQiPnRl eHQ8c3BhbiBzdHlsZT0icGFkZGluZy1yaWdodDogMjBweCI+IDwvc3Bhbj48L2Rpdj4KKyAgICAv LyA8LSB3ZSBjb21wdXRlZCB0aGUgY29udGVudCB3aWR0aCBvZiBmbG9hdGluZyBib3ggdXNpbmcg c2hyaW5rIHRvIGZpdC4KKyAgICAvLyBUaGUgcHJlZmVycmVkIHdpZHRoIG9mIHRoZSA8ZGl2PiBp cyB0aGUgY29udGVudCB3aWR0aCB3aXRob3V0IHRoZSB0cmFpbGluZyB3aGl0ZXNwYWNlLiBIb3dl dmVyIHdoZW4gd2UgYWN0dWFsbHkgcGxhY2UgdGhlIGlubGluZSBpdGVtcworICAgIC8vIHRoZSBm aW5hbCB1bmNvbW1pdHRlZCBydW5zIG9mIFt0ZXh0OiA0cHhdW2NvbnRhaW5lciBlbmQ6IDIwcHhd IC0+IDI0cHggd29uJ3QgZml0IGFuZCB3ZSBuZWVkIHRvIGZpeC11cCB0aGUgdHJhaWxpbmcgY29u dGVudCBieSB0cmltbWluZyBpdCBmaXJzdC4KKyAgICBpZiAoVGV4dFV0aWw6OnNob3VsZFByZXNl cnZlVHJhaWxpbmdXaGl0ZXNwYWNlKHVuY29tbWl0dGVkUnVuc1swXS5pbmxpbmVJdGVtLnN0eWxl KCkpKQorICAgICAgICByZXR1cm47CisgICAgbV91bmNvbW1pdHRlZENvbnRlbnQudHJpbVRyYWls aW5nV2hpdGVzcGFjZUNvbnRlbnQoKTsKK30KKwogdm9pZCBMaW5lTGF5b3V0Q29udGV4dDo6VW5j b21taXR0ZWRDb250ZW50Ojp0cmltKHVuc2lnbmVkIG5ld1NpemUpCiB7CiAgICAgZm9yIChhdXRv IGkgPSBtX3VuY29tbWl0dGVkUnVucy5zaXplKCk7IGktLTspCkBAIC0zMjQsNiArMzQ2LDI2IEBA IHZvaWQgTGluZUxheW91dENvbnRleHQ6OlVuY29tbWl0dGVkQ29udGVudDo6dHJpbSh1bnNpZ25l ZCBuZXdTaXplKQogICAgIG1fdW5jb21taXR0ZWRSdW5zLnNocmluayhuZXdTaXplKTsKIH0KIAor dm9pZCBMaW5lTGF5b3V0Q29udGV4dDo6VW5jb21taXR0ZWRDb250ZW50Ojp0cmltVHJhaWxpbmdX aGl0ZXNwYWNlQ29udGVudCgpCit7CisgICAgZm9yIChhdXRvIGkgPSBtX3VuY29tbWl0dGVkUnVu cy5zaXplKCk7IGktLTspIHsKKyAgICAgICAgYXV0byYgdW5jb21taXR0ZWRSdW4gPSBtX3VuY29t bWl0dGVkUnVuc1tpXTsKKyAgICAgICAgYXV0byYgaW5saW5lSXRlbSA9IHVuY29tbWl0dGVkUnVu LmlubGluZUl0ZW07CisgICAgICAgIGlmIChpbmxpbmVJdGVtLmlzQm94KCkgfHwgaW5saW5lSXRl bS5pc0ZvcmNlZExpbmVCcmVhaygpKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBpZiAo aW5saW5lSXRlbS5pc0NvbnRhaW5lclN0YXJ0KCkgfHwgaW5saW5lSXRlbS5pc0NvbnRhaW5lckVu ZCgpKQorICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIGlmIChpbmxpbmVJdGVtLmlzVGV4 dCgpKSB7CisgICAgICAgICAgICBhdXRvJiBpbmxpbmVUZXh0SXRlbSA9IGRvd25jYXN0PElubGlu ZVRleHRJdGVtPihpbmxpbmVJdGVtKTsKKyAgICAgICAgICAgIGlmICghaW5saW5lVGV4dEl0ZW0u aXNXaGl0ZXNwYWNlKCkpCisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgbV93 aWR0aCAtPSB1bmNvbW1pdHRlZFJ1bi5sb2dpY2FsV2lkdGg7CisgICAgICAgICAgICB1bmNvbW1p dHRlZFJ1bi5sb2dpY2FsV2lkdGggPSB7IH07CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAg ICAgfQorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICB9Cit9CiAKIH0KIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlv dXRDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5l TGF5b3V0Q29udGV4dC5oCmluZGV4IGI5M2RmYjliMTUwYjVhYjNmMWIxNDdhMTMzYzMzZWMyNzVh MjM2ZDYuLjI4NDYyYjVjNWU2NDZjMGM2MDQxNmMxZDYxZmUyYTk2N2Y5N2YxZTggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250 ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxh eW91dENvbnRleHQuaApAQCAtNjQsMTEgKzY0LDEzIEBAIHByaXZhdGU6CiAgICAgTGluZUNvbnRl bnQgY2xvc2UoTGluZUJ1aWxkZXImLCB1bnNpZ25lZCBsZWFkaW5nSW5saW5lSXRlbUluZGV4KTsK ICAgICBib29sIHNob3VsZFByb2Nlc3NVbmNvbW1pdHRlZENvbnRlbnQoY29uc3QgSW5saW5lSXRl bSYpIGNvbnN0OwogICAgIElzRW5kT2ZMaW5lIHByb2Nlc3NVbmNvbW1pdHRlZENvbnRlbnQoTGlu ZUJ1aWxkZXImKTsKLSAgICAKKyAgICB2b2lkIHRyaW1VbmNvbW1pdHRlZFRyYWlsaW5nQ29udGVu dElmTmVlZGVkKCk7CisKICAgICBzdHJ1Y3QgVW5jb21taXR0ZWRDb250ZW50IHsKICAgICAgICAg dm9pZCBhZGQoY29uc3QgSW5saW5lSXRlbSYsIExheW91dFVuaXQgbG9naWNhbFdpZHRoKTsKICAg ICAgICAgdm9pZCByZXNldCgpOwogICAgICAgICB2b2lkIHRyaW0odW5zaWduZWQgbmV3U2l6ZSk7 CisgICAgICAgIHZvaWQgdHJpbVRyYWlsaW5nV2hpdGVzcGFjZUNvbnRlbnQoKTsKIAogICAgICAg ICBSdW5MaXN0JiBydW5zKCkgeyByZXR1cm4gbV91bmNvbW1pdHRlZFJ1bnM7IH0KICAgICAgICAg Y29uc3QgUnVuTGlzdCYgcnVucygpIGNvbnN0IHsgcmV0dXJuIG1fdW5jb21taXR0ZWRSdW5zOyB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0 L1RleHRVdGlsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3Rl eHQvVGV4dFV0aWwuY3BwCmluZGV4IDU1MmZkZmY3ZmY4YzdkZTc4YTc2ZDM4YzAxNWFjNDA0Y2Nm NDNhMzIuLmU0YzMyZWRhZTY1YzNjZjU1NWExMjkzMmU5NjYwYzMxNDU1M2VmOGYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQvVGV4dFV0aWwu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQvVGV4 dFV0aWwuY3BwCkBAIC0zNCw2ICszNCwxMiBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogbmFtZXNw YWNlIExheW91dCB7CiAKK2Jvb2wgVGV4dFV0aWw6OnNob3VsZFByZXNlcnZlVHJhaWxpbmdXaGl0 ZXNwYWNlKGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSkKK3sKKyAgICBhdXRvIHdoaXRlc3BhY2Ug PSBzdHlsZS53aGl0ZVNwYWNlKCk7CisgICAgcmV0dXJuIHdoaXRlc3BhY2UgPT0gV2hpdGVTcGFj ZTo6UHJlIHx8IHdoaXRlc3BhY2UgPT0gV2hpdGVTcGFjZTo6UHJlV3JhcDsKK30KKwogT3B0aW9u YWw8dW5zaWduZWQ+IFRleHRVdGlsOjpoeXBoZW5Qb3NpdGlvbkJlZm9yZShjb25zdCBJbmxpbmVJ dGVtJiwgdW5zaWduZWQsIHVuc2lnbmVkKQogewogICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0L1Rl eHRVdGlsLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0L1Rl eHRVdGlsLmgKaW5kZXggN2U4YWFlODY0ZWMzNTBkZmY2Y2Q2OWQ3ZjEzMmNlYzE4NmY1NzA3Zi4u ZTlkMzY5MTVjZjE5MTRjMWVjNmJhZWZiMWQ3MTYxYjNkNmMwMmEzZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dC9UZXh0VXRpbC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL3RleHQvVGV4dFV0aWwuaApA QCAtMzAsNiArMzAsOSBAQAogI2luY2x1ZGUgIklubGluZUl0ZW0uaCIKIAogbmFtZXNwYWNlIFdl YkNvcmUgeworCitjbGFzcyBSZW5kZXJTdHlsZTsKKwogbmFtZXNwYWNlIExheW91dCB7CiAKIGNs YXNzIFRleHRVdGlsIHsKQEAgLTQyLDYgKzQ1LDcgQEAgcHVibGljOgogICAgICAgICBMYXlvdXRV bml0IGxvZ2ljYWxXaWR0aDsKICAgICB9OwogICAgIHN0YXRpYyBTcGxpdERhdGEgc3BsaXQoY29u c3QgQm94JiwgdW5zaWduZWQgc3RhcnRQb3NpdGlvbiwgdW5zaWduZWQgbGVuZ3RoLCBMYXlvdXRV bml0IHRleHRXaWR0aCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCwgTGF5b3V0VW5pdCBjb250 ZW50TG9naWNhbExlZnQpOworICAgIHN0YXRpYyBib29sIHNob3VsZFByZXNlcnZlVHJhaWxpbmdX aGl0ZXNwYWNlKGNvbnN0IFJlbmRlclN0eWxlJik7CiAKIHByaXZhdGU6CiAgICAgc3RhdGljIExh eW91dFVuaXQgZml4ZWRQaXRjaFdpZHRoKGNvbnN0IFN0cmluZ1ZpZXcmLCBjb25zdCBSZW5kZXJT dHlsZSYsIHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIHRvLCBMYXlvdXRVbml0IGNvbnRlbnRMb2dp Y2FsTGVmdCk7Cg== 384478 2019-11-28 21:39:53 -0800 2019-11-28 23:42:05 -0800 Patch bug-204655-20191128213923.patch text/plain 13305 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyOTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmVkY2IzMWQyOTNiZWU3 YzM2ZDU1NmE0ZmM3NjJhMjJlYmVhMzJjNC4uN2VkZGE4ZjRiN2ZlMmMyNjMwOTIzYzNkZDhkNzYy MTE4ZTkyOTY5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE5LTExLTI4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBUcmltIHRy YWlsaW5nIHVuY29tbWl0dGVkIGNvbnRlbnQgd2hlbiBuZWVkZWQKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDY1NQorICAgICAgICA8cmRhcjovL3By b2JsZW0vNTc1MTEwNTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2hlbiB3ZSB0cnkgdG8gZml0IHRoZSB0cmFpbGluZyBpbmxpbmUgcnVucyBvbiB0 aGUgbGluZSwgd2UgaGF2ZSB0byBtYWtlIHN1cmUgdHJpbW1hYmxlIHRyYWlsaW5nIHdoaXRlc3Bh Y2UgY29udGVudCBpcyB0YWtlbiBpbnRvIGFjY291bnQuIAorCisgICAgICAgIDxkaXYgc3R5bGU9 ImZsb2F0OiBsZWZ0Ij50ZXh0PHNwYW4gc3R5bGU9InBhZGRpbmctcmlnaHQ6IDIwcHgiPiA8L3Nw YW4+PC9kaXY+CisgICAgICAgIDwtIEFzIHdlIGNvbXB1dGUgdGhlIGNvbnRlbnQgd2lkdGggb2Yg ZmxvYXRpbmcgYm94IHVzaW5nIHNocmluayB0byBmaXQsIHdlIHRyaW0gdGhlIHRyYWlsaW5nIHdo aXRlc3BhY2UgYXQgdGhlIGVuZCBhbmQKKyAgICAgICAgdGhlIGZpbmFsIHdpZHRoIHdpbGwgaW5j bHVkZSB0aGUgZm9sbG93aW5nIHJ1bnMgW3RleHQ6IDQxcHhdW2NvbnRhaW5lciBzdGFydDogMHB4 XVtjb250YWluZXIgZW5kOiAyMHB4XSAtPiA2MXB4IChpdCB3b3VsZCBiZSA2NXB4IHdpdGggdGhl IHdoaXRlc3BhY2UgY29udGVudCkKKyAgICAgICAgQXMgd2UgcGxhY2UgdGhlIGlubGluZSBjb250 ZW50IGFuZCB3ZSByZWFjaCB0aGUgZmluYWwgdHJhaWxpbmcgY29udGVudCBbIF1bY29udGFpbmVy IGVuZF0sIHRoZSBsaW5lIGhhcyBvbmx5IDIwcHggc3BhY2UgbGVmdCwgd2hpbGUgdGhlIGNvbnRl bnQgaXMgMjRweCBsb25nLgorICAgICAgICBBdCB0aGlzIHBvaW50IHdlIG5lZWQgdG8gcmV0cnkg dGhlIGF2YWlsYWJsZSBzcGFjZSBjaGVjayBieSB0YWtpbmcgYm90aCB0aGUgbGluZSBhbmQgdGhl IHBlbmRpbmcgY29udGVudCdzIHRyaW1tYWJsZSB3aWR0aCBpbnRvIGFjY291bnQuCisKKyAgICAg ICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCcmVha2VyOjpicmVha2luZ0NvbnRleHRGb3JJbmxp bmVDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJyZWFrZXI6OkNvbnRl bnQ6OmlzQXRDb250ZW50Qm91bmRhcnkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l QnJlYWtlcjo6Q29udGVudDo6YXBwZW5kKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZUJyZWFrZXI6OkNvbnRlbnQ6Omhhc05vbldoaXRlc3BhY2VPcklubGluZUJveCBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCcmVha2VyOjpDb250ZW50OjpoYXNUZXh0Q29u dGVudE9ubHkgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnJlYWtlcjo6 Q29udGVudDo6dHJhaWxpbmdUcmltbWFibGVXaWR0aCBjb25zdCk6CisgICAgICAgICogbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuaDoKKyAgICAgICAgKiBsYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OnNob3VsZFByZXNlcnZlVHJhaWxpbmdDb250ZW50KToKKyAgICAgICAgKiBsYXlv dXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkxpbmVMYXlvdXRDb250ZXh0Ojpwcm9jZXNzVW5jb21taXR0ZWRDb250ZW50 KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0L1RleHRVdGlsLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGV4dFV0aWw6OnNob3VsZFByZXNlcnZlVHJhaWxp bmdXaGl0ZXNwYWNlKToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0L1Rl eHRVdGlsLmg6CisKIDIwMTktMTEtMjggIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4K IAogICAgICAgICBbTEZDXVtJRkNdIE1vdmUgYW5kIHJlbmFtZSBMaW5lTGF5b3V0Q29udGV4dDo6 VW5jb21taXR0ZWRDb250ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5jcHAKaW5kZXggNmEyNjE0ZjQx ODhlYzc5ZjkyNTJlZGUyMmQ3YTM1YjJkZjUwZmZjNi4uODI0ZDY3MWI2YzhjOTgyMTc3MWJhYzQ0 NTE1ZmQ1ZDkwOGJjYzAwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcApAQCAtNDgsMjQgKzQ4 LDI5IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc1RyYWlsaW5nV2hpdGVzcGFjZVdpdGhQcmVXcmFw KGNvbnN0IElubGluZUl0ZW0mIHRyYWlsaW5nSW5sCiAgICAgcmV0dXJuIHRyYWlsaW5nSW5saW5l SXRlbS5zdHlsZSgpLndoaXRlU3BhY2UoKSA9PSBXaGl0ZVNwYWNlOjpQcmVXcmFwICYmIGRvd25j YXN0PElubGluZVRleHRJdGVtPih0cmFpbGluZ0lubGluZUl0ZW0pLmlzV2hpdGVzcGFjZSgpOwog fQogCi1MaW5lQnJlYWtlcjo6QnJlYWtpbmdDb250ZXh0IExpbmVCcmVha2VyOjpicmVha2luZ0Nv bnRleHRGb3JJbmxpbmVDb250ZW50KGNvbnN0IENvbnRlbnQmIGNvbnRlbnQsIExheW91dFVuaXQg YXZhaWxhYmxlV2lkdGgsIGJvb2wgbGluZUlzRW1wdHkpCitMaW5lQnJlYWtlcjo6QnJlYWtpbmdD b250ZXh0IExpbmVCcmVha2VyOjpicmVha2luZ0NvbnRleHRGb3JJbmxpbmVDb250ZW50KGNvbnN0 IENvbnRlbnQmIGNvbnRlbnQsIExheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIExheW91dFVuaXQg dHJhaWxpbmdUcmltbWFibGVXaWR0aCwgIGJvb2wgbGluZUlzRW1wdHkpCiB7CisgICAgQVNTRVJU KCFjb250ZW50LmlzRW1wdHkoKSk7CiAgICAgaWYgKGNvbnRlbnQud2lkdGgoKSA8PSBhdmFpbGFi bGVXaWR0aCkKICAgICAgICAgcmV0dXJuIHsgQnJlYWtpbmdDb250ZXh0OjpDb250ZW50QnJlYWs6 OktlZXAsIHsgfSB9OworICAgIC8vIENoZWNrIGlmIGl0IGZpdHMgd2l0aG91dCB0aGUgdHJhaWxp bmcgdHJpbW1hYmxlIGNvbnRlbnQuCisgICAgaWYgKCFUZXh0VXRpbDo6c2hvdWxkUHJlc2VydmVU cmFpbGluZ1doaXRlc3BhY2UoY29udGVudC5ydW5zKClbMF0uaW5saW5lSXRlbS5zdHlsZSgpKSkg eworICAgICAgICBhdXRvIGFkanVzdGVkQXZhaWxhYmxlV2lkdGggPSBhdmFpbGFibGVXaWR0aDsK KyAgICAgICAgYXV0byBhZGp1c3RlZENvbnRlbnRXaWR0aCA9IGNvbnRlbnQud2lkdGgoKSAtIGNv bnRlbnQudHJhaWxpbmdUcmltbWFibGVXaWR0aCgpOworICAgICAgICAvLyBXaGVuIHRoZSB1bmNv bW1pdHRlZCBjb250ZW50IGhhcyB0cmFpbGluZyB0cmltbWFibGUgd2lkdGgsIGl0IGFsc28gbWVh bnMgdGhhdCBpdCBkb2VzIG5vdCBoYXZlIGFueSBvdGhlciBub24tdHJpbW1hYmxlIF9jb250ZW50 XyAoW3RleHRdWyBdIDwtIFt0ZXh0XSBpcyBvbiBjb21taXQgYm91bmRhcnkpCisgICAgICAgIC8v IHNvIHBsYWNpbmcgaXQgb24gdGhlIGxpbmUgd2l0aCB0cmltbWFibGUgdHJhaWxpbmcgY29udGVu dCBtZWFucyB0aGF0IHdlJ3YgZ290IGFkamFjZW50IHRyaW1tYWJsZSBjb250ZW50LgorICAgICAg ICAvLyBbdGV4dF1bIF0gPC0gZXhpc3RpbmcgY29udGVudCBvbiB0aGUgbGluZSB3aXRoIHRyYWls aW5nIHRyaW1tYWJsZQorICAgICAgICAvLyBbY29udGFpbmVyIHN0YXJ0XVsgXVtjb250YWluZXIg ZW5kXSA8LSBuZXcgY29udGVudAorICAgICAgICAvLyA8LSBhZGphY2VudCB0cmltbWFibGUgX2Nv bnRlbnRfIFt0ZXh0XVtdW2NvbnRhaW5lciBzdGFydF1bXVtjb250YWluZXIgZW5kXQorICAgICAg ICBpZiAodHJhaWxpbmdUcmltbWFibGVXaWR0aCAmJiAhY29udGVudC5oYXNOb25XaGl0ZXNwYWNl T3JJbmxpbmVCb3goKSkKKyAgICAgICAgICAgIGFkanVzdGVkQXZhaWxhYmxlV2lkdGggKz0gdHJh aWxpbmdUcmltbWFibGVXaWR0aDsKIAotICAgIGF1dG8mIHJ1bnMgPSBjb250ZW50LnJ1bnMoKTsK LSAgICBhdXRvIGlzVGV4dENvbnRlbnQgPSBbJl0gewotICAgICAgICAvLyA8c3Bhbj50ZXh0PC9z cGFuPiBpcyBjb25zaWRlcmVkIGEgdGV4dCBydW4gZXZlbiB3aXRoIHRoZSBbY29udGFpbmVyIHN0 YXJ0XVtjb250YWluZXIgZW5kXSBpbmxpbmUgaXRlbXMuCi0gICAgICAgIGZvciAoYXV0byYgcnVu IDogcnVucykgewotICAgICAgICAgICAgYXV0byYgaW5saW5lSXRlbSA9IHJ1bi5pbmxpbmVJdGVt OwotICAgICAgICAgICAgLy8gU2tpcCAidHlwZWxlc3MiIGlubGluZSBpdGVtcy4KLSAgICAgICAg ICAgIGlmIChpbmxpbmVJdGVtLmlzQ29udGFpbmVyU3RhcnQoKSB8fCBpbmxpbmVJdGVtLmlzQ29u dGFpbmVyRW5kKCkpCi0gICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICByZXR1 cm4gaW5saW5lSXRlbS5pc1RleHQoKTsKLSAgICAgICAgfQotICAgICAgICByZXR1cm4gZmFsc2U7 Ci0gICAgfTsKLSAgICBpZiAoaXNUZXh0Q29udGVudCgpKSB7CisgICAgICAgIGlmIChhZGp1c3Rl ZENvbnRlbnRXaWR0aCA8PSBhZGp1c3RlZEF2YWlsYWJsZVdpZHRoKQorICAgICAgICAgICAgcmV0 dXJuIHsgQnJlYWtpbmdDb250ZXh0OjpDb250ZW50QnJlYWs6OktlZXAsIHsgfSB9OworICAgIH0K KworICAgIGlmIChjb250ZW50Lmhhc1RleHRDb250ZW50T25seSgpKSB7CisgICAgICAgIGF1dG8m IHJ1bnMgPSBjb250ZW50LnJ1bnMoKTsKICAgICAgICAgaWYgKGF1dG8gdHJhaWxpbmdQYXJ0aWFs Q29udGVudCA9IHdvcmRCcmVha2luZ0JlaGF2aW9yKHJ1bnMsIGF2YWlsYWJsZVdpZHRoKSkKICAg ICAgICAgICAgIHJldHVybiB7IEJyZWFraW5nQ29udGV4dDo6Q29udGVudEJyZWFrOjpTcGxpdCwg dHJhaWxpbmdQYXJ0aWFsQ29udGVudCB9OwogICAgICAgICAvLyBJZiB3ZSBkaWQgbm90IG1hbmFn ZSB0byBicmVhayB0aGlzIGNvbnRlbnQsIHdlIHN0aWxsIG5lZWQgdG8gZGVjaWRlIHdoZXRoZXIg a2VlcCBpdCBvciB3cmFwIGl0IHRvIHRoZSBuZXh0IGxpbmUuCkBAIC0xNTEsNyArMTU2LDYgQEAg Ym9vbCBMaW5lQnJlYWtlcjo6Q29udGVudDo6aXNBdENvbnRlbnRCb3VuZGFyeShjb25zdCBJbmxp bmVJdGVtJiBpbmxpbmVJdGVtLCBjb24KICAgICAgICAgLy8gQ2FuJ3QgZGVjaWRlIGl0IHlldC4K ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KLQogICAgIGF1dG8qIGxhc3RVbmNvbWl0dGVk Q29udGVudCA9ICZjb250ZW50LnJ1bnMoKS5sYXN0KCkuaW5saW5lSXRlbTsKICAgICBpZiAoaW5s aW5lSXRlbS5pc1RleHQoKSkgewogICAgICAgICAvLyBhbnkgY29udGVudCcgJyAtPiB3aGl0ZXNw YWNlIGlzIGFsd2F5cyBhIGNvbW1pdCBib3VuZGFyeS4KQEAgLTIyMiw2ICsyMjYsNyBAQCBib29s IExpbmVCcmVha2VyOjpDb250ZW50Ojppc0F0Q29udGVudEJvdW5kYXJ5KGNvbnN0IElubGluZUl0 ZW0mIGlubGluZUl0ZW0sIGNvbgogCiB2b2lkIExpbmVCcmVha2VyOjpDb250ZW50OjphcHBlbmQo Y29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpCiB7 CisgICAgQVNTRVJUKGlubGluZUl0ZW0uaXNGb3JjZWRMaW5lQnJlYWsoKSB8fCAhaXNBdENvbnRl bnRCb3VuZGFyeShpbmxpbmVJdGVtLCAqdGhpcykpOwogICAgIG1fY29udGlub3VzUnVucy5hcHBl bmQoeyBpbmxpbmVJdGVtLCBsb2dpY2FsV2lkdGggfSk7CiAgICAgbV93aWR0aCArPSBsb2dpY2Fs V2lkdGg7CiB9CkBAIC0yMzksNiArMjQ0LDQ5IEBAIHZvaWQgTGluZUJyZWFrZXI6OkNvbnRlbnQ6 OnRyaW0odW5zaWduZWQgbmV3U2l6ZSkKICAgICBtX2NvbnRpbm91c1J1bnMuc2hyaW5rKG5ld1Np emUpOwogfQogCitib29sIExpbmVCcmVha2VyOjpDb250ZW50OjpoYXNOb25XaGl0ZXNwYWNlT3JJ bmxpbmVCb3goKSBjb25zdAoreworICAgIC8vIDxzcGFuPjxpbWc+PC9zcGFuPiBpcyBjb25zaWRl cmVkIGEgaW5saW5lIGJveCBydW4gZXZlbiB3aXRoIHRoZSBbY29udGFpbmVyIHN0YXJ0XVtjb250 YWluZXIgZW5kXSBpbmxpbmUgaXRlbXMuCisgICAgZm9yIChhdXRvJiBydW4gOiBtX2NvbnRpbm91 c1J1bnMpIHsKKyAgICAgICAgYXV0byYgaW5saW5lSXRlbSA9IHJ1bi5pbmxpbmVJdGVtOworICAg ICAgICBpZiAoaW5saW5lSXRlbS5pc0NvbnRhaW5lclN0YXJ0KCkgfHwgaW5saW5lSXRlbS5pc0Nv bnRhaW5lckVuZCgpIHx8IGlubGluZUl0ZW0uaXNGb3JjZWRMaW5lQnJlYWsoKSkKKyAgICAgICAg ICAgIGNvbnRpbnVlOworICAgICAgICByZXR1cm4gIWlzPElubGluZVRleHRJdGVtPihpbmxpbmVJ dGVtKSB8fCAhZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGlubGluZUl0ZW0pLmlzV2hpdGVzcGFj ZSgpOworICAgIH0KKyAgICByZXR1cm4gZmFsc2U7Cit9CisKK2Jvb2wgTGluZUJyZWFrZXI6OkNv bnRlbnQ6Omhhc1RleHRDb250ZW50T25seSgpIGNvbnN0Cit7CisgICAgLy8gPHNwYW4+dGV4dDwv c3Bhbj4gaXMgY29uc2lkZXJlZCBhIHRleHQgcnVuIGV2ZW4gd2l0aCB0aGUgW2NvbnRhaW5lciBz dGFydF1bY29udGFpbmVyIGVuZF0gaW5saW5lIGl0ZW1zLgorICAgIC8vIER1ZSB0byBjb21taXQg Ym91bmRhcnkgcnVsZXMsIHdlIGp1c3QgbmVlZCB0byBjaGVjayB0aGUgZmlyc3Qgbm9uLXR5cGVs ZXNzIGlubGluZSBpdGVtIChjYW4ndCBoYXZlIGJvdGggW2ltZ10gYW5kIFt0ZXh0XSkgCisgICAg Zm9yIChhdXRvJiBydW4gOiBtX2NvbnRpbm91c1J1bnMpIHsKKyAgICAgICAgYXV0byYgaW5saW5l SXRlbSA9IHJ1bi5pbmxpbmVJdGVtOworICAgICAgICBpZiAoaW5saW5lSXRlbS5pc0NvbnRhaW5l clN0YXJ0KCkgfHwgaW5saW5lSXRlbS5pc0NvbnRhaW5lckVuZCgpKQorICAgICAgICAgICAgY29u dGludWU7CisgICAgICAgIHJldHVybiBpbmxpbmVJdGVtLmlzVGV4dCgpOworICAgIH0KKyAgICBy ZXR1cm4gZmFsc2U7Cit9CisKK0xheW91dFVuaXQgTGluZUJyZWFrZXI6OkNvbnRlbnQ6OnRyYWls aW5nVHJpbW1hYmxlV2lkdGgoKSBjb25zdAoreworICAgIExheW91dFVuaXQgdHJhaWxpbmdXaGl0 ZXNwYWNlV2lkdGg7CisgICAgZm9yIChhdXRvIGkgPSBtX2NvbnRpbm91c1J1bnMuc2l6ZSgpOyBp LS07KSB7CisgICAgICAgIGF1dG8mIGlubGluZUl0ZW0gPSBtX2NvbnRpbm91c1J1bnNbaV0uaW5s aW5lSXRlbTsKKyAgICAgICAgaWYgKGlubGluZUl0ZW0uaXNDb250YWluZXJTdGFydCgpIHx8IGlu bGluZUl0ZW0uaXNDb250YWluZXJFbmQoKSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAg ICBpZiAoaW5saW5lSXRlbS5pc1RleHQoKSAmJiBkb3duY2FzdDxJbmxpbmVUZXh0SXRlbT4oaW5s aW5lSXRlbSkuaXNXaGl0ZXNwYWNlKCkpIHsKKyAgICAgICAgICAgIHRyYWlsaW5nV2hpdGVzcGFj ZVdpZHRoICs9IG1fY29udGlub3VzUnVuc1tpXS5sb2dpY2FsV2lkdGg7CisgICAgICAgICAgICBj b250aW51ZTsKKyAgICAgICAgfQorICAgICAgICAvLyBDYW4ndCBoYXZlIFt0ZXh0IGNvbnRlbnRd W3doaXRlc3BhY2VdIGFzIFt3aGl0ZXNwYWNlXSBpcyBhbHdheXMgYSBjb21taXQgYm91bmRhcnkg d2hlbiBpdCBpcyBhZGphY2VudCB0byBzb21lIG90aGVyIGlubGluZSBjb250ZW50LiBTZWUgVW5j b21taXR0ZWRDb250ZW50OjphZGQuCisgICAgICAgIEFTU0VSVCghdHJhaWxpbmdXaGl0ZXNwYWNl V2lkdGgpOworICAgICAgICByZXR1cm4gdHJhaWxpbmdXaGl0ZXNwYWNlV2lkdGg7CisgICAgfQor ICAgIHJldHVybiB0cmFpbGluZ1doaXRlc3BhY2VXaWR0aDsKK30KKwogfQogfQogI2VuZGlmCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQnJlYWtlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJyZWFrZXIuaAppbmRleCA4YzIzNjY3YWI0N2UwMjIyMGI0ZTIwNWYzZmM3NzE3ZTFm YjlmNWI4Li4xZjcyYWIxNDM0NGNjOWU1YzViMjQ3M2IzM2ZmODcyOWQ4NmNjOTNiIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJl YWtlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUxpbmVCcmVha2VyLmgKQEAgLTczLDE1ICs3MywxOCBAQCBwdWJsaWM6CiAgICAgICAgIFJ1bkxp c3QmIHJ1bnMoKSB7IHJldHVybiBtX2NvbnRpbm91c1J1bnM7IH0KICAgICAgICAgY29uc3QgUnVu TGlzdCYgcnVucygpIGNvbnN0IHsgcmV0dXJuIG1fY29udGlub3VzUnVuczsgfQogICAgICAgICBi b29sIGlzRW1wdHkoKSBjb25zdCB7IHJldHVybiBtX2NvbnRpbm91c1J1bnMuaXNFbXB0eSgpOyB9 CisgICAgICAgIGJvb2wgaGFzTm9uV2hpdGVzcGFjZU9ySW5saW5lQm94KCkgY29uc3Q7CisgICAg ICAgIGJvb2wgaGFzVGV4dENvbnRlbnRPbmx5KCkgY29uc3Q7CiAgICAgICAgIHVuc2lnbmVkIHNp emUoKSBjb25zdCB7IHJldHVybiBtX2NvbnRpbm91c1J1bnMuc2l6ZSgpOyB9CiAgICAgICAgIExh eW91dFVuaXQgd2lkdGgoKSBjb25zdCB7IHJldHVybiBtX3dpZHRoOyB9CisgICAgICAgIExheW91 dFVuaXQgdHJhaWxpbmdUcmltbWFibGVXaWR0aCgpIGNvbnN0OwogCiAgICAgcHJpdmF0ZToKICAg ICAgICAgUnVuTGlzdCBtX2NvbnRpbm91c1J1bnM7CiAgICAgICAgIExheW91dFVuaXQgbV93aWR0 aDsKICAgICB9OwogCi0gICAgQnJlYWtpbmdDb250ZXh0IGJyZWFraW5nQ29udGV4dEZvcklubGlu ZUNvbnRlbnQoY29uc3QgQ29udGVudCYsIExheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIGJvb2wg bGluZUlzRW1wdHkpOworICAgIEJyZWFraW5nQ29udGV4dCBicmVha2luZ0NvbnRleHRGb3JJbmxp bmVDb250ZW50KGNvbnN0IENvbnRlbnQmLCBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoLCBMYXlv dXRVbml0IHRyYWlsaW5nVHJpbW1hYmxlV2lkdGgsIGJvb2wgbGluZUlzRW1wdHkpOwogICAgIGJv b2wgc2hvdWxkV3JhcEZsb2F0Qm94KExheW91dFVuaXQgZmxvYXRMb2dpY2FsV2lkdGgsIExheW91 dFVuaXQgYXZhaWxhYmxlV2lkdGgsIGJvb2wgbGluZUlzRW1wdHkpOwogCiBwcml2YXRlOgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDZkNDQzNGI3Nzg0MDNhMGFkYmQ2MWFkOTQ2YmJlZGE3 YzViY2RhMDcuLjIwZDc1NTUyOWMzMzFmZGI2NDVmMWY5NmEzNjYwMTg1MmYxZTA2NGMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC dWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTI0MSw4ICsyNDEsNyBAQCBzdGF0aWMgYm9vbCBzaG91 bGRQcmVzZXJ2ZVRyYWlsaW5nQ29udGVudChjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4 dEl0ZW0pCiB7CiAgICAgaWYgKCFpbmxpbmVUZXh0SXRlbS5pc1doaXRlc3BhY2UoKSkKICAgICAg ICAgcmV0dXJuIHRydWU7Ci0gICAgYXV0byB3aGl0ZXNwYWNlID0gaW5saW5lVGV4dEl0ZW0uc3R5 bGUoKS53aGl0ZVNwYWNlKCk7Ci0gICAgcmV0dXJuIHdoaXRlc3BhY2UgPT0gV2hpdGVTcGFjZTo6 UHJlIHx8IHdoaXRlc3BhY2UgPT0gV2hpdGVTcGFjZTo6UHJlV3JhcDsKKyAgICByZXR1cm4gVGV4 dFV0aWw6OnNob3VsZFByZXNlcnZlVHJhaWxpbmdXaGl0ZXNwYWNlKGlubGluZVRleHRJdGVtLnN0 eWxlKCkpOwogfQogCiBzdGF0aWMgYm9vbCBzaG91bGRQcmVzZXJ2ZUxlYWRpbmdDb250ZW50KGNv bnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRlbSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0LmNw cAppbmRleCBiODI3Y2NjYjU2YTBmMmNjZWIxZmIyMTRmNDc2OGM4ZjhmMDczMzk1Li40MzljMDk3 MWE2M2ViNzMyNmIwMTk2MjQ1NWU0MjllNjYxNTM1ZDY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQu Y3BwCkBAIC0yMDAsNyArMjAwLDcgQEAgTGluZUxheW91dENvbnRleHQ6OklzRW5kT2ZMaW5lIExp bmVMYXlvdXRDb250ZXh0Ojpwcm9jZXNzVW5jb21taXR0ZWRDb250ZW50KExpbmUKIHsKICAgICAv LyBDaGVjayBpZiB0aGUgcGVuZGluZyBjb250ZW50IGZpdHMuCiAgICAgYXV0byBsaW5lSXNDb25z aWRlcmVkRW1wdHkgPSBsaW5lLmlzVmlzdWFsbHlFbXB0eSgpICYmICFsaW5lLmhhc0ludHJ1c2l2 ZUZsb2F0KCk7Ci0gICAgYXV0byBicmVha2luZ0NvbnRleHQgPSBMaW5lQnJlYWtlcigpLmJyZWFr aW5nQ29udGV4dEZvcklubGluZUNvbnRlbnQobV91bmNvbW1pdHRlZENvbnRlbnQsIGxpbmUuYXZh aWxhYmxlV2lkdGgoKSwgbGluZUlzQ29uc2lkZXJlZEVtcHR5KTsKKyAgICBhdXRvIGJyZWFraW5n Q29udGV4dCA9IExpbmVCcmVha2VyKCkuYnJlYWtpbmdDb250ZXh0Rm9ySW5saW5lQ29udGVudCht X3VuY29tbWl0dGVkQ29udGVudCwgbGluZS5hdmFpbGFibGVXaWR0aCgpLCBsaW5lLnRyYWlsaW5n VHJpbW1hYmxlV2lkdGgoKSwgbGluZUlzQ29uc2lkZXJlZEVtcHR5KTsKICAgICAvLyBUaGUgdW5j b21taXR0ZWQgY29udGVudCBjYW4gZnVsbHksIHBhcnRpYWxseSBmaXQgdGhlIGN1cnJlbnQgbGlu ZSAoY29tbWl0L3BhcnRpYWwgY29tbWl0KSBvciBub3QgYXQgYWxsIChyZXNldCkuCiAgICAgaWYg KGJyZWFraW5nQ29udGV4dC5jb250ZW50QnJlYWsgPT0gTGluZUJyZWFrZXI6OkJyZWFraW5nQ29u dGV4dDo6Q29udGVudEJyZWFrOjpLZWVwKQogICAgICAgICBjb21taXRQZW5kaW5nQ29udGVudChs aW5lKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L3RleHQvVGV4dFV0aWwuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvdGV4dC9UZXh0VXRpbC5jcHAKaW5kZXggNTUyZmRmZjdmZjhjN2RlNzhhNzZkMzhjMDE1YWM0 MDRjY2Y0M2EzMi4uMjg5NzI0ZTA3ZmIwNTZjYzU4ZDdiN2M3OTIxYTgzMTA2NDdiMjNjMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4dC9UZXh0 VXRpbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4 dC9UZXh0VXRpbC5jcHAKQEAgLTEyMSw2ICsxMjEsMTIgQEAgVGV4dFV0aWw6OlNwbGl0RGF0YSBU ZXh0VXRpbDo6c3BsaXQoY29uc3QgQm94JiBpbmxpbmVCb3gsIHVuc2lnbmVkIHN0YXJ0UG9zaXRp b24KICAgICByZXR1cm4geyBzdGFydFBvc2l0aW9uLCByaWdodCAtIHN0YXJ0UG9zaXRpb24sIGxl ZnRTaWRlV2lkdGggfTsKIH0KIAorYm9vbCBUZXh0VXRpbDo6c2hvdWxkUHJlc2VydmVUcmFpbGlu Z1doaXRlc3BhY2UoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKQoreworICAgIGF1dG8gd2hpdGVz cGFjZSA9IHN0eWxlLndoaXRlU3BhY2UoKTsKKyAgICByZXR1cm4gd2hpdGVzcGFjZSA9PSBXaGl0 ZVNwYWNlOjpQcmUgfHwgd2hpdGVzcGFjZSA9PSBXaGl0ZVNwYWNlOjpQcmVXcmFwOworfQorCiB9 CiB9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL3RleHQvVGV4dFV0aWwuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL3RleHQvVGV4dFV0aWwuaAppbmRleCA3ZThhYWU4NjRlYzM1MGRmZjZjZDY5ZDdmMTMy Y2VjMTg2ZjU3MDdmLi5lOWQzNjkxNWNmMTkxNGMxZWM2YmFlZmIxZDcxNjFiM2Q2YzAyYTNmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy90ZXh0L1Rl eHRVdGlsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvdGV4 dC9UZXh0VXRpbC5oCkBAIC0zMCw2ICszMCw5IEBACiAjaW5jbHVkZSAiSW5saW5lSXRlbS5oIgog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CisKK2NsYXNzIFJlbmRlclN0eWxlOworCiBuYW1lc3BhY2Ug TGF5b3V0IHsKIAogY2xhc3MgVGV4dFV0aWwgewpAQCAtNDIsNiArNDUsNyBAQCBwdWJsaWM6CiAg ICAgICAgIExheW91dFVuaXQgbG9naWNhbFdpZHRoOwogICAgIH07CiAgICAgc3RhdGljIFNwbGl0 RGF0YSBzcGxpdChjb25zdCBCb3gmLCB1bnNpZ25lZCBzdGFydFBvc2l0aW9uLCB1bnNpZ25lZCBs ZW5ndGgsIExheW91dFVuaXQgdGV4dFdpZHRoLCBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoLCBM YXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsTGVmdCk7CisgICAgc3RhdGljIGJvb2wgc2hvdWxkUHJl c2VydmVUcmFpbGluZ1doaXRlc3BhY2UoY29uc3QgUmVuZGVyU3R5bGUmKTsKIAogcHJpdmF0ZToK ICAgICBzdGF0aWMgTGF5b3V0VW5pdCBmaXhlZFBpdGNoV2lkdGgoY29uc3QgU3RyaW5nVmlldyYs IGNvbnN0IFJlbmRlclN0eWxlJiwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgdG8sIExheW91dFVu aXQgY29udGVudExvZ2ljYWxMZWZ0KTsK