205760 2020-01-03 16:30:02 -0800 [LFC][IFC] LineBuilder::ContinuousContent::append should return void 2020-01-04 06:54:52 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1602646 0 zalan 2020-01-03 16:30:02 -0800 instead of bool and introduce isContinous 1602647 1 webkit-bug-importer 2020-01-03 16:30:20 -0800 <rdar://problem/58309948> 1602696 2 386744 zalan 2020-01-03 18:56:29 -0800 Created attachment 386744 Patch 1602716 3 zalan 2020-01-03 20:02:05 -0800 I just noticed the continuous misspelling 1602727 4 386750 zalan 2020-01-03 20:45:07 -0800 Created attachment 386750 Patch 1602761 5 386750 commit-queue 2020-01-04 06:54:51 -0800 Comment on attachment 386750 Patch Clearing flags on attachment: 386750 Committed r254032: <https://trac.webkit.org/changeset/254032> 1602762 6 commit-queue 2020-01-04 06:54:52 -0800 All reviewed patches have been landed. Closing bug. 386744 2020-01-03 18:56:29 -0800 2020-01-03 20:01:31 -0800 Patch bug-205760-20200103185628.patch text/plain 5700 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MDAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGUxMzc3YmM0NzYxZjRh N2I5ZDdmMjJhNjBlMmEyNWVlODJjYjgyMi4uZmJlNzFiMWQwNWM5N2MyOWMwMTdiZmRlZGM1NTFl ODkxMTVlNzY1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTAxLTAzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMaW5lQnVp bGRlcjo6Q29udGlub3VzQ29udGVudDo6YXBwZW5kIHNob3VsZCByZXR1cm4gdm9pZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1NzYwCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS81ODMwOTk0OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbnRyb2R1Y2UgQ29udGlub3VzQ29udGVudDo6aXNDb250aW5v dXMgdG8gbWFrZSBtZXJnaW5nIGxvZ2ljIG1vcmUgY2xlYXIuCisKKyAgICAgICAgKiBsYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpDb250aW5vdXNDb250ZW50Ojppc0NvbnRpbm91cyk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpDb250aW5vdXNDb250ZW50Ojph cHBlbmQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6Y2xvc2UpOgor CiAyMDIwLTAxLTAzICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgSW1w bGVtZW50ICJjcmVhdGUgYSBwb3RlbnRpYWwtQ09SUyByZXF1ZXN0IgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxk ZXIuY3BwCmluZGV4IGVlN2QzM2Q3YjdjZmMwZTQyZTU1MTI0OTM5MTBhYmJlNTlhN2I4MTQuLmJj NDA5MTExNTY4ODQxYjJmNDQyM2RkNWI1NjI3NGQ0NzU3YTJlN2MgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVp bGRlci5jcHAKQEAgLTY4LDE4ICs2OCwxOSBAQCBzdHJ1Y3QgTGluZUJ1aWxkZXI6OkNvbnRpbm91 c0NvbnRlbnQgewogcHVibGljOgogICAgIENvbnRpbm91c0NvbnRlbnQoY29uc3QgSW5saW5lSXRl bVJ1biYsIGJvb2wgdGV4dElzQWxpZ25KdXN0aWZ5KTsKIAotICAgIGJvb2wgYXBwZW5kKGNvbnN0 IElubGluZUl0ZW1SdW4mKTsKKyAgICBib29sIGlzQ29udGlub3VzKGNvbnN0IElubGluZUl0ZW1S dW4mIGlubGluZUl0ZW1SdW4pIHsgcmV0dXJuIG1fdHJhaWxpbmdSdW5DYW5CZUV4cGFuZGVkICYm IGNhbkJlTWVyZ2VkKGlubGluZUl0ZW1SdW4pOyB9CisgICAgdm9pZCBhcHBlbmQoY29uc3QgSW5s aW5lSXRlbVJ1biYpOwogICAgIExpbmVCdWlsZGVyOjpSdW4gY2xvc2UoKTsKKyAgICBzdGF0aWMg Ym9vbCBjYW5CZUV4cGFuZGVkKGNvbnN0IElubGluZUl0ZW1SdW4mIHJ1bikgeyByZXR1cm4gcnVu LmlzVGV4dCgpICYmICFydW4uaXNDb2xsYXBzZWQoKSAmJiAhcnVuLmlzQ29sbGFwc2VkVG9aZXJv QWR2YW5jZVdpZHRoKCk7IH0KIAogcHJpdmF0ZToKLSAgICBzdGF0aWMgYm9vbCBjYW5CZUV4cGFu ZGVkKGNvbnN0IElubGluZUl0ZW1SdW4mIHJ1bikgeyByZXR1cm4gcnVuLmlzVGV4dCgpICYmICFy dW4uaXNDb2xsYXBzZWQoKSAmJiAhcnVuLmlzQ29sbGFwc2VkVG9aZXJvQWR2YW5jZVdpZHRoKCk7 IH0KICAgICBib29sIGNhbkJlTWVyZ2VkKGNvbnN0IElubGluZUl0ZW1SdW4mIHJ1bikgY29uc3Qg eyByZXR1cm4gcnVuLmlzVGV4dCgpICYmICFydW4uaXNDb2xsYXBzZWRUb1plcm9BZHZhbmNlV2lk dGgoKSAmJiAmbV9pbml0aWFsSW5saW5lUnVuLmxheW91dEJveCgpID09ICZydW4ubGF5b3V0Qm94 KCk7IH0KIAogICAgIGNvbnN0IElubGluZUl0ZW1SdW4mIG1faW5pdGlhbElubGluZVJ1bjsKICAg ICBjb25zdCBib29sIG1fY29sbGVjdEV4cGFuc2lvbk9wcG9ydHVuaXRpZXMgeyBmYWxzZSB9Owog ICAgIHVuc2lnbmVkIG1fZXhwYW5kZWRMZW5ndGggeyAwIH07CiAgICAgSW5saW5lTGF5b3V0VW5p dCBtX2V4cGFuZGVkV2lkdGggeyAwIH07Ci0gICAgYm9vbCBtX3RyYWlsaW5nUnVuQ2FuQmVFeHBh bmRlZCB7IGZhbHNlIH07CisgICAgYm9vbCBtX3RyYWlsaW5nUnVuQ2FuQmVFeHBhbmRlZCB7IHRy dWUgfTsKICAgICBib29sIG1faGFzVHJhaWxpbmdFeHBhbnNpb25PcHBvcnR1bml0eSB7IGZhbHNl IH07CiAgICAgdW5zaWduZWQgbV9leHBhbnNpb25PcHBvcnR1bml0eUNvdW50IHsgMCB9OwogfTsK QEAgLTg3LDE4ICs4OCwxNSBAQCBwcml2YXRlOgogTGluZUJ1aWxkZXI6OkNvbnRpbm91c0NvbnRl bnQ6OkNvbnRpbm91c0NvbnRlbnQoY29uc3QgSW5saW5lSXRlbVJ1biYgaW5pdGlhbElubGluZVJ1 biwgYm9vbCB0ZXh0SXNBbGlnbkp1c3RpZnkpCiAgICAgOiBtX2luaXRpYWxJbmxpbmVSdW4oaW5p dGlhbElubGluZVJ1bikKICAgICAsIG1fY29sbGVjdEV4cGFuc2lvbk9wcG9ydHVuaXRpZXModGV4 dElzQWxpZ25KdXN0aWZ5ICYmICFpc1doaXRlc3BhY2VQcmVzZXJ2ZWQobV9pbml0aWFsSW5saW5l UnVuLnN0eWxlKCkpKSAvLyBEbyBub3QgY29sbGVjdCBleHBhbnNpb24gZGF0YSBvbiBwcmVzZXJ2 ZWQgd2hpdGVzcGFjZSBjb250ZW50ICh3ZSBzaG91bGQgbm90IG11dGF0ZSB0aGUgc3BhY2luZyBi ZXR3ZWVuIHJ1bnMgaW4gc3VjaCBjYXNlcykuCi0gICAgLCBtX3RyYWlsaW5nUnVuQ2FuQmVFeHBh bmRlZChjYW5CZUV4cGFuZGVkKGluaXRpYWxJbmxpbmVSdW4pKQogeworICAgIC8vIFdlIHNob3Vs ZCBub3QgY3JlYXRlIGEgQ29udGlub3VzQ29udGVudCBvYmplY3Qgd2hlbiBldmVuIHRoZSBpbml0 YWwgcnVuIGNhbiBub3QgYmUgZXhwYW5kZWQuCisgICAgQVNTRVJUKGNhbkJlRXhwYW5kZWQoaW5p dGlhbElubGluZVJ1bikpOwogfQogCi1ib29sIExpbmVCdWlsZGVyOjpDb250aW5vdXNDb250ZW50 OjphcHBlbmQoY29uc3QgSW5saW5lSXRlbVJ1biYgaW5saW5lSXRlbVJ1bikKK3ZvaWQgTGluZUJ1 aWxkZXI6OkNvbnRpbm91c0NvbnRlbnQ6OmFwcGVuZChjb25zdCBJbmxpbmVJdGVtUnVuJiBpbmxp bmVJdGVtUnVuKQogewogICAgIC8vIE1lcmdlZCBjb250ZW50IG5lZWRzIHRvIGJlIGNvbnRpbnVv dXMuCi0gICAgaWYgKCFtX3RyYWlsaW5nUnVuQ2FuQmVFeHBhbmRlZCkKLSAgICAgICAgcmV0dXJu IGZhbHNlOwotICAgIGlmICghY2FuQmVNZXJnZWQoaW5saW5lSXRlbVJ1bikpCi0gICAgICAgIHJl dHVybiBmYWxzZTsKLQorICAgIEFTU0VSVChpc0NvbnRpbm91cyhpbmxpbmVJdGVtUnVuKSk7CiAg ICAgbV90cmFpbGluZ1J1bkNhbkJlRXhwYW5kZWQgPSBjYW5CZUV4cGFuZGVkKGlubGluZUl0ZW1S dW4pOwogCiAgICAgQVNTRVJUKGlubGluZUl0ZW1SdW4uaXNUZXh0KCkpOwpAQCAtMTEwLDcgKzEw OCw2IEBAIGJvb2wgTGluZUJ1aWxkZXI6OkNvbnRpbm91c0NvbnRlbnQ6OmFwcGVuZChjb25zdCBJ bmxpbmVJdGVtUnVuJiBpbmxpbmVJdGVtUnVuKQogICAgICAgICBpZiAobV9oYXNUcmFpbGluZ0V4 cGFuc2lvbk9wcG9ydHVuaXR5KQogICAgICAgICAgICAgKyttX2V4cGFuc2lvbk9wcG9ydHVuaXR5 Q291bnQ7CiAgICAgfQotICAgIHJldHVybiB0cnVlOwogfQogCiBMaW5lQnVpbGRlcjo6UnVuIExp bmVCdWlsZGVyOjpDb250aW5vdXNDb250ZW50OjpjbG9zZSgpCkBAIC0yMzEsMTggKzIyOCwyNyBA QCBMaW5lQnVpbGRlcjo6UnVuTGlzdCBMaW5lQnVpbGRlcjo6Y2xvc2UoSXNMYXN0TGluZVdpdGhJ bmxpbmVDb250ZW50IGlzTGFzdExpbmVXaQogICAgIC8vIDMuIEFsaWduIG1lcmdlZCBydW5zIGJv dGggdmVydGljYWxseSBhbmQgaG9yaXpvbnRhbGx5LgogICAgIHJlbW92ZVRyYWlsaW5nQ29sbGFw c2libGVDb250ZW50KCk7CiAgICAgYXV0byBoYW5naW5nQ29udGVudCA9IGNvbGxlY3RIYW5naW5n Q29udGVudChpc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQpOwotICAgIFJ1bkxpc3QgcnVuTGlz dDsKLSAgICB1bnNpZ25lZCBydW5JbmRleCA9IDA7Ci0gICAgd2hpbGUgKHJ1bkluZGV4IDwgbV9p bmxpbmVJdGVtUnVucy5zaXplKCkpIHsKLSAgICAgICAgLy8gTWVyZ2UgZWxpZ2libGUgcnVucy4K LSAgICAgICAgYXV0byBjb250aW5vdXNDb250ZW50ID0gQ29udGlub3VzQ29udGVudCB7IG1faW5s aW5lSXRlbVJ1bnNbcnVuSW5kZXhdLCBpc1RleHRBbGlnbkp1c3RpZnkoKSB9OwotICAgICAgICB3 aGlsZSAoKytydW5JbmRleCA8IG1faW5saW5lSXRlbVJ1bnMuc2l6ZSgpKSB7Ci0gICAgICAgICAg ICBpZiAoIWNvbnRpbm91c0NvbnRlbnQuYXBwZW5kKG1faW5saW5lSXRlbVJ1bnNbcnVuSW5kZXhd KSkKLSAgICAgICAgICAgICAgICBicmVhazsKKworICAgIGF1dG8gbWVyZ2VkSW5saW5lSXRlbVJ1 bnMgPSBbJl0geworICAgICAgICBSdW5MaXN0IHJ1bkxpc3Q7CisgICAgICAgIHVuc2lnbmVkIHJ1 bkluZGV4ID0gMDsKKyAgICAgICAgd2hpbGUgKHJ1bkluZGV4IDwgbV9pbmxpbmVJdGVtUnVucy5z aXplKCkpIHsKKyAgICAgICAgICAgIC8vIE1lcmdlIGVsaWdpYmxlIHJ1bnMuCisgICAgICAgICAg ICBhdXRvJiBpbmxpbmVJdGVtUnVuID0gbV9pbmxpbmVJdGVtUnVuc1tydW5JbmRleF07CisgICAg ICAgICAgICBpZiAoIUNvbnRpbm91c0NvbnRlbnQ6OmNhbkJlRXhwYW5kZWQoaW5saW5lSXRlbVJ1 bikpIHsKKyAgICAgICAgICAgICAgICBydW5MaXN0LmFwcGVuZCh7IGlubGluZUl0ZW1SdW4gfSk7 CisgICAgICAgICAgICAgICAgKytydW5JbmRleDsKKyAgICAgICAgICAgICAgICBjb250aW51ZTsK KyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGF1dG8gbWVyZ2VkUnVucyA9IENvbnRpbm91c0Nv bnRlbnQgeyBpbmxpbmVJdGVtUnVuLCBpc1RleHRBbGlnbkp1c3RpZnkoKSB9OworICAgICAgICAg ICAgZm9yIChydW5JbmRleCA9IHJ1bkluZGV4ICsgMTsgcnVuSW5kZXggPCBtX2lubGluZUl0ZW1S dW5zLnNpemUoKSAmJiBtZXJnZWRSdW5zLmlzQ29udGlub3VzKG1faW5saW5lSXRlbVJ1bnNbcnVu SW5kZXhdKTsgKytydW5JbmRleCkKKyAgICAgICAgICAgICAgICBtZXJnZWRSdW5zLmFwcGVuZCht X2lubGluZUl0ZW1SdW5zW3J1bkluZGV4XSk7CisgICAgICAgICAgICBydW5MaXN0LmFwcGVuZCht ZXJnZWRSdW5zLmNsb3NlKCkpOwogICAgICAgICB9Ci0gICAgICAgIHJ1bkxpc3QuYXBwZW5kKGNv bnRpbm91c0NvbnRlbnQuY2xvc2UoKSk7Ci0gICAgfQorICAgICAgICByZXR1cm4gcnVuTGlzdDsK KyAgICB9OwogCisgICAgYXV0byBydW5MaXN0ID0gbWVyZ2VkSW5saW5lSXRlbVJ1bnMoKTsKICAg ICBpZiAoIW1faXNJbnRyaW5zaWNTaXppbmcpIHsKICAgICAgICAgZm9yIChhdXRvJiBydW4gOiBy dW5MaXN0KSB7CiAgICAgICAgICAgICBhZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQocnVuKTsK 386750 2020-01-03 20:45:07 -0800 2020-01-04 06:54:51 -0800 Patch bug-205760-20200103204506.patch text/plain 17891 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MDAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTk0NWIzNTVjOGExYzU5 NGVmMDBiNDBjMWVkN2IyOTE3ZDgwYmY3My4uMGNkNGM4YTRhNWQwMzM5MGNkNmUwOGRhZmZmZTNk ZGJkM2Q4Y2YwNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU2IEBACisyMDIwLTAxLTAzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMaW5lQnVp bGRlcjo6Q29udGludW91c0NvbnRlbnQ6OmFwcGVuZCBzaG91bGQgcmV0dXJuIHZvaWQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTc2MAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNTgzMDk5NDg+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgSW50cm9kdWNlIENvbnRpbnVvdXNDb250ZW50Ojppc0VsaWdp YmxlIHRvIG1ha2UgbWVyZ2luZyBsb2dpYyBtb3JlIGNsZWFyLgorCisgICAgICAgICogbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpMaW5lQnJlYWtlcjo6aXNDb250ZW50V3JhcHBpbmdBbGxvd2VkIGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJyZWFrZXI6OnNob3VsZEtlZXBFbmRPZkxp bmVXaGl0ZXNwYWNlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJyZWFr ZXI6OnNob3VsZFdyYXBJbmxpbmVDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZUJyZWFrZXI6OnRyeVdyYXBwaW5nSW5saW5lQ29udGVudCBjb25zdCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkNvbnRpbnVvdXNDb250ZW50OjpDb250aW51b3VzQ29udGVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkNvbnRpbnVvdXNDb250ZW50OjpoYXNUZXh0Q29udGVu dE9ubHkgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpDb250aW51b3VzQ29udGVu dDo6aXNWaXN1YWxseUVtcHR5V2hpdGVzcGFjZUNvbnRlbnRPbmx5IGNvbnN0KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6Q29udGludW91c0NvbnRlbnQ6OmZpcnN0VGV4dFJ1bkluZGV4IGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6Q29udGludW91c0NvbnRlbnQ6Omxhc3RD b250ZW50UnVuSW5kZXggY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpDb250aW51 b3VzQ29udGVudDo6aGFzTm9uQ29udGVudFJ1bnNPbmx5IGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6Q29udGludW91c0NvbnRlbnQ6Omxhc3RXcmFwT3Bwb3J0dW5pdHlJbmRleCBj b25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkNvbnRpbnVvdXNDb250ZW50OjpUcmFp bGluZ0NvbGxhcHNpYmxlQ29udGVudDo6cmVzZXQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpDb250aW5vdXNDb250ZW50OjpydW5zIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6Q29udGlub3VzQ29udGVudDo6aXNFbXB0eSBjb25zdCk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkNvbnRpbm91c0NvbnRlbnQ6OnNpemUgY29uc3QpOiBE ZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpDb250aW5vdXNDb250ZW50Ojp3aWR0 aCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkNvbnRpbm91c0Nv bnRlbnQ6Om5vbkNvbGxhcHNpYmxlV2lkdGggY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpDb250aW5vdXNDb250ZW50OjpoYXNUcmFpbGluZ0NvbGxhcHNpYmxlQ29u dGVudCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkNvbnRpbm91 c0NvbnRlbnQ6OmlzVHJhaWxpbmdDb250ZW50RnVsbHlDb2xsYXBzaWJsZSBjb25zdCk6IERlbGV0 ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkNvbnRpbm91c0NvbnRlbnQ6OkNvbnRpbm91 c0NvbnRlbnQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpDb250aW5vdXND b250ZW50OjpoYXNUZXh0Q29udGVudE9ubHkgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpDb250aW5vdXNDb250ZW50Ojppc1Zpc3VhbGx5RW1wdHlXaGl0ZXNwYWNl Q29udGVudE9ubHkgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpD b250aW5vdXNDb250ZW50OjpmaXJzdFRleHRSdW5JbmRleCBjb25zdCk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkNvbnRpbm91c0NvbnRlbnQ6Omxhc3RDb250ZW50UnVuSW5k ZXggY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpDb250aW5vdXND b250ZW50OjpoYXNOb25Db250ZW50UnVuc09ubHkgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpDb250aW5vdXNDb250ZW50OjpsYXN0V3JhcE9wcG9ydHVuaXR5SW5k ZXggY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpDb250aW5vdXND b250ZW50OjpUcmFpbGluZ0NvbGxhcHNpYmxlQ29udGVudDo6cmVzZXQpOiBEZWxldGVkLgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmg6CisgICAg ICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6Q29udGludW91c0NvbnRlbnQ6Omlz Q29udGludW91cyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpDb250 aW51b3VzQ29udGVudDo6Y2FuQmVFeHBhbmRlZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkxpbmVCdWlsZGVyOjpDb250aW51b3VzQ29udGVudDo6Q29udGludW91c0NvbnRlbnQpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6Q29udGludW91c0NvbnRlbnQ6OmFw cGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpDb250aW51b3Vz Q29udGVudDo6Y2xvc2UpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6 Y2xvc2UpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6Q29udGlub3Vz Q29udGVudDo6Y2FuQmVFeHBhbmRlZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCdWlsZGVyOjpDb250aW5vdXNDb250ZW50OjpjYW5CZU1lcmdlZCBjb25zdCk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpDb250aW5vdXND b250ZW50OjpDb250aW5vdXNDb250ZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dDo6TGluZUJ1aWxkZXI6OkNvbnRpbm91c0NvbnRlbnQ6OmFwcGVuZCk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpDb250aW5vdXNDb250ZW50Ojpj bG9zZSk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZUJ1aWxkZXIuaDoKKwogMjAyMC0wMS0wMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFtTTExdIEdlbmVyYXRlIHJ1bnMgZm9yIHByZXNlcnZlZCBuZXcgbGlu ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmVCcmVha2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcAppbmRleCBiZDkxNTE2NTVjNGM2NGIzYzY1MGUwMjYw NzJhM2ViZmNkMDE2NDlmLi44MmI1N2Q0NGZiNDhjNTQ2ZTJkMzZkYzY1NjQyNjhhMThjNzdhZDll IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lQnJlYWtlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwCkBAIC00OSw4ICs0OSw4IEBAIHN0YXRpYyBpbmxp bmUgYm9vbCBzaG91bGRLZWVwQmVnaW5uaW5nT2ZMaW5lV2hpdGVzcGFjZShjb25zdCBSZW5kZXJT dHlsZSYgc3R5bGUpCiAgICAgcmV0dXJuIHdoaXRlc3BhY2UgPT0gV2hpdGVTcGFjZTo6UHJlIHx8 IHdoaXRlc3BhY2UgPT0gV2hpdGVTcGFjZTo6UHJlV3JhcCB8fCB3aGl0ZXNwYWNlID09IFdoaXRl U3BhY2U6OkJyZWFrU3BhY2VzOwogfQogCi1zdHJ1Y3QgQ29udGlub3VzQ29udGVudCB7Ci0gICAg Q29udGlub3VzQ29udGVudChjb25zdCBMaW5lQnJlYWtlcjo6UnVuTGlzdCYpOworc3RydWN0IENv bnRpbnVvdXNDb250ZW50IHsKKyAgICBDb250aW51b3VzQ29udGVudChjb25zdCBMaW5lQnJlYWtl cjo6UnVuTGlzdCYpOwogCiAgICAgY29uc3QgTGluZUJyZWFrZXI6OlJ1bkxpc3QmIHJ1bnMoKSBj b25zdCB7IHJldHVybiBtX3J1bnM7IH0KICAgICBib29sIGlzRW1wdHkoKSBjb25zdCB7IHJldHVy biBtX3J1bnMuaXNFbXB0eSgpOyB9CkBAIC04NiwxNCArODYsMTQgQEAgc3RydWN0IFdyYXBwZWRU ZXh0Q29udGVudCB7CiAgICAgT3B0aW9uYWw8TGluZUJyZWFrZXI6OlBhcnRpYWxSdW4+IHBhcnRp YWxUcmFpbGluZ1J1bjsKIH07CiAKLWJvb2wgTGluZUJyZWFrZXI6OmlzQ29udGVudFdyYXBwaW5n QWxsb3dlZChjb25zdCBDb250aW5vdXNDb250ZW50JiBjYW5kaWRhdGVSdW5zKSBjb25zdAorYm9v bCBMaW5lQnJlYWtlcjo6aXNDb250ZW50V3JhcHBpbmdBbGxvd2VkKGNvbnN0IENvbnRpbnVvdXND b250ZW50JiBjYW5kaWRhdGVSdW5zKSBjb25zdAogewogICAgIC8vIFVzZSB0aGUgbGFzdCBpbmxp bmUgaXRlbSB3aXRoIGNvbnRlbnQgKHdoZXJlIHdlIHdvdWxkIGJlIHdyYXBwaW5nKSB0byBkZWNp ZGUgaWYgY29udGVudCB3cmFwcGluZyBpcyBhbGxvd2VkLgogICAgIGF1dG8gcnVuSW5kZXggPSBj YW5kaWRhdGVSdW5zLmxhc3RDb250ZW50UnVuSW5kZXgoKS52YWx1ZU9yKGNhbmRpZGF0ZVJ1bnMu c2l6ZSgpIC0gMSk7CiAgICAgcmV0dXJuIGlzV3JhcHBpbmdBbGxvd2VkKGNhbmRpZGF0ZVJ1bnMu cnVucygpW3J1bkluZGV4XS5pbmxpbmVJdGVtLnN0eWxlKCkpOwogfQogCi1ib29sIExpbmVCcmVh a2VyOjpzaG91bGRLZWVwRW5kT2ZMaW5lV2hpdGVzcGFjZShjb25zdCBDb250aW5vdXNDb250ZW50 JiBjYW5kaWRhdGVSdW5zKSBjb25zdAorYm9vbCBMaW5lQnJlYWtlcjo6c2hvdWxkS2VlcEVuZE9m TGluZVdoaXRlc3BhY2UoY29uc3QgQ29udGludW91c0NvbnRlbnQmIGNhbmRpZGF0ZVJ1bnMpIGNv bnN0CiB7CiAgICAgLy8gR3JhYiB0aGUgc3R5bGUgYW5kIGNoZWNrIGZvciB3aGl0ZS1zcGFjZSBw cm9wZXJ0eSB0byBkZWNpZGVkIHdoZXRoZXIgd2Ugc2hvdWxkIGxldCB0aGlzIHdoaXRlc3BhY2Ug Y29udGVudCBvdmVyZmxvdyB0aGUgY3VycmVudCBsaW5lLgogICAgIC8vIE5vdGUgdGhhdCB0aGUg ImtlZXAiIGluIHRoZSBjb250ZXh0IG1lYW5zIHdlIGxldCB0aGUgd2hpdGVzcGFjZSBjb250ZW50 IHNpdCBvbiB0aGUgY3VycmVudCBsaW5lLgpAQCAtMTA1LDcgKzEwNSw3IEBAIGJvb2wgTGluZUJy ZWFrZXI6OnNob3VsZEtlZXBFbmRPZkxpbmVXaGl0ZXNwYWNlKGNvbnN0IENvbnRpbm91c0NvbnRl bnQmIGNhbmRpZGF0CiAKIExpbmVCcmVha2VyOjpSZXN1bHQgTGluZUJyZWFrZXI6OnNob3VsZFdy YXBJbmxpbmVDb250ZW50KGNvbnN0IFJ1bkxpc3QmIGNhbmRpZGF0ZVJ1bnMsIGNvbnN0IExpbmVT dGF0dXMmIGxpbmVTdGF0dXMpCiB7Ci0gICAgYXV0byBjYW5kaWRhdGVDb250ZW50ID0gQ29udGlu b3VzQ29udGVudCB7IGNhbmRpZGF0ZVJ1bnMgfTsKKyAgICBhdXRvIGNhbmRpZGF0ZUNvbnRlbnQg PSBDb250aW51b3VzQ29udGVudCB7IGNhbmRpZGF0ZVJ1bnMgfTsKICAgICBBU1NFUlQoIWNhbmRp ZGF0ZUNvbnRlbnQuaXNFbXB0eSgpKTsKICAgICBhdXRvIHJlc3VsdCA9IHRyeVdyYXBwaW5nSW5s aW5lQ29udGVudChjYW5kaWRhdGVDb250ZW50LCBsaW5lU3RhdHVzKTsKICAgICAvLyBJZiB0aGlz IGlzIG5vdCB0aGUgZW5kIG9mIHRoZSBsaW5lLCBob2xkIG9uIHRvIHRoZSBsYXN0IGVsaWdpYmxl IGxpbmUgd3JhcCBvcHBvcnR1bml0eSBzbyB0aGF0IHdlIGNvdWxkIHJldmVydCBiYWNrCkBAIC0x MjYsNyArMTI2LDcgQEAgTGluZUJyZWFrZXI6OlJlc3VsdCBMaW5lQnJlYWtlcjo6c2hvdWxkV3Jh cElubGluZUNvbnRlbnQoY29uc3QgUnVuTGlzdCYgY2FuZGlkYXQKICAgICByZXR1cm4gcmVzdWx0 OwogfQogCi1MaW5lQnJlYWtlcjo6UmVzdWx0IExpbmVCcmVha2VyOjp0cnlXcmFwcGluZ0lubGlu ZUNvbnRlbnQoY29uc3QgQ29udGlub3VzQ29udGVudCYgY2FuZGlkYXRlQ29udGVudCwgY29uc3Qg TGluZVN0YXR1cyYgbGluZVN0YXR1cykgY29uc3QKK0xpbmVCcmVha2VyOjpSZXN1bHQgTGluZUJy ZWFrZXI6OnRyeVdyYXBwaW5nSW5saW5lQ29udGVudChjb25zdCBDb250aW51b3VzQ29udGVudCYg Y2FuZGlkYXRlQ29udGVudCwgY29uc3QgTGluZVN0YXR1cyYgbGluZVN0YXR1cykgY29uc3QKIHsK ICAgICBpZiAoY2FuZGlkYXRlQ29udGVudC53aWR0aCgpIDw9IGxpbmVTdGF0dXMuYXZhaWxhYmxl V2lkdGgpCiAgICAgICAgIHJldHVybiB7IFJlc3VsdDo6QWN0aW9uOjpLZWVwIH07CkBAIC0zMzIs NyArMzMyLDcgQEAgT3B0aW9uYWw8TGluZUJyZWFrZXI6OlBhcnRpYWxSdW4+IExpbmVCcmVha2Vy Ojp0cnlCcmVha2luZ1RleHRSdW4oY29uc3QgUnVuJiBvdmUKICAgICByZXR1cm4geyB9OwogfQog Ci1Db250aW5vdXNDb250ZW50OjpDb250aW5vdXNDb250ZW50KGNvbnN0IExpbmVCcmVha2VyOjpS dW5MaXN0JiBydW5zKQorQ29udGludW91c0NvbnRlbnQ6OkNvbnRpbnVvdXNDb250ZW50KGNvbnN0 IExpbmVCcmVha2VyOjpSdW5MaXN0JiBydW5zKQogICAgIDogbV9ydW5zKHJ1bnMpCiB7CiAgICAg Ly8gRmlndXJlIG91dCB0aGUgdHJhaWxpbmcgY29sbGFwc2libGUgc3RhdGUuCkBAIC0zNzAsNyAr MzcwLDcgQEAgQ29udGlub3VzQ29udGVudDo6Q29udGlub3VzQ29udGVudChjb25zdCBMaW5lQnJl YWtlcjo6UnVuTGlzdCYgcnVucykKICAgICB9CiB9CiAKLWJvb2wgQ29udGlub3VzQ29udGVudDo6 aGFzVGV4dENvbnRlbnRPbmx5KCkgY29uc3QKK2Jvb2wgQ29udGludW91c0NvbnRlbnQ6Omhhc1Rl eHRDb250ZW50T25seSgpIGNvbnN0CiB7CiAgICAgLy8gPHNwYW4+dGV4dDwvc3Bhbj4gaXMgY29u c2lkZXJlZCBhIHRleHQgcnVuIGV2ZW4gd2l0aCB0aGUgW2NvbnRhaW5lciBzdGFydF1bY29udGFp bmVyIGVuZF0gaW5saW5lIGl0ZW1zLgogICAgIC8vIER1ZSB0byBjb21taXQgYm91bmRhcnkgcnVs ZXMsIHdlIGp1c3QgbmVlZCB0byBjaGVjayB0aGUgZmlyc3Qgbm9uLXR5cGVsZXNzIGlubGluZSBp dGVtIChjYW4ndCBoYXZlIGJvdGggW2ltZ10gYW5kIFt0ZXh0XSkKQEAgLTM4Myw3ICszODMsNyBA QCBib29sIENvbnRpbm91c0NvbnRlbnQ6Omhhc1RleHRDb250ZW50T25seSgpIGNvbnN0CiAgICAg cmV0dXJuIGZhbHNlOwogfQogCi1ib29sIENvbnRpbm91c0NvbnRlbnQ6OmlzVmlzdWFsbHlFbXB0 eVdoaXRlc3BhY2VDb250ZW50T25seSgpIGNvbnN0Citib29sIENvbnRpbnVvdXNDb250ZW50Ojpp c1Zpc3VhbGx5RW1wdHlXaGl0ZXNwYWNlQ29udGVudE9ubHkoKSBjb25zdAogewogICAgIC8vIFs8 c3Bhbj48L3NwYW4+IF0gWzxzcGFuPiA8L3NwYW4+XSBbIDxzcGFuIHN0eWxlPSJwYWRkaW5nOiAw cHg7Ij48L3NwYW4+XSBhcmUgYWxsIGNvbnNpZGVyZWQgdmlzdWFsbHkgZW1wdHkgd2hpdGVzcGFj ZSBjb250ZW50LgogICAgIC8vIFs8c3BhbiBzdHlsZT0iYm9yZGVyOiAxcHggc29saWQgcmVkIj48 L3NwYW4+IF0gd2hpbGUgdGhpcyBpcyB3aGl0ZXNwYWNlIGNvbnRlbnQgb25seSwgaXQgaXMgbm90 IGNvbnNpZGVyZWQgdmlzdWFsbHkgZW1wdHkuCkBAIC0zOTgsNyArMzk4LDcgQEAgYm9vbCBDb250 aW5vdXNDb250ZW50Ojppc1Zpc3VhbGx5RW1wdHlXaGl0ZXNwYWNlQ29udGVudE9ubHkoKSBjb25z dAogICAgIHJldHVybiBmYWxzZTsKIH0KIAotT3B0aW9uYWw8c2l6ZV90PiBDb250aW5vdXNDb250 ZW50OjpmaXJzdFRleHRSdW5JbmRleCgpIGNvbnN0CitPcHRpb25hbDxzaXplX3Q+IENvbnRpbnVv dXNDb250ZW50OjpmaXJzdFRleHRSdW5JbmRleCgpIGNvbnN0CiB7CiAgICAgZm9yIChzaXplX3Qg aW5kZXggPSAwOyBpbmRleCA8IG1fcnVucy5zaXplKCk7ICsraW5kZXgpIHsKICAgICAgICAgaWYg KG1fcnVuc1tpbmRleF0uaW5saW5lSXRlbS5pc1RleHQoKSkKQEAgLTQwNyw3ICs0MDcsNyBAQCBP cHRpb25hbDxzaXplX3Q+IENvbnRpbm91c0NvbnRlbnQ6OmZpcnN0VGV4dFJ1bkluZGV4KCkgY29u c3QKICAgICByZXR1cm4geyB9OwogfQogCi1PcHRpb25hbDxzaXplX3Q+IENvbnRpbm91c0NvbnRl bnQ6Omxhc3RDb250ZW50UnVuSW5kZXgoKSBjb25zdAorT3B0aW9uYWw8c2l6ZV90PiBDb250aW51 b3VzQ29udGVudDo6bGFzdENvbnRlbnRSdW5JbmRleCgpIGNvbnN0CiB7CiAgICAgZm9yIChzaXpl X3QgaW5kZXggPSBtX3J1bnMuc2l6ZSgpOyBpbmRleC0tOykgewogICAgICAgICBpZiAobV9ydW5z W2luZGV4XS5pbmxpbmVJdGVtLmlzVGV4dCgpIHx8IG1fcnVuc1tpbmRleF0uaW5saW5lSXRlbS5p c0JveCgpKQpAQCAtNDE2LDcgKzQxNiw3IEBAIE9wdGlvbmFsPHNpemVfdD4gQ29udGlub3VzQ29u dGVudDo6bGFzdENvbnRlbnRSdW5JbmRleCgpIGNvbnN0CiAgICAgcmV0dXJuIHsgfTsKIH0KIAot Ym9vbCBDb250aW5vdXNDb250ZW50OjpoYXNOb25Db250ZW50UnVuc09ubHkoKSBjb25zdAorYm9v bCBDb250aW51b3VzQ29udGVudDo6aGFzTm9uQ29udGVudFJ1bnNPbmx5KCkgY29uc3QKIHsKICAg ICAvLyA8c3Bhbj48L3NwYW4+IDwtIG5vbiBjb250ZW50IHJ1bnMuCiAgICAgZm9yIChhdXRvJiBy dW4gOiBtX3J1bnMpIHsKQEAgLTQyOCw3ICs0MjgsNyBAQCBib29sIENvbnRpbm91c0NvbnRlbnQ6 Omhhc05vbkNvbnRlbnRSdW5zT25seSgpIGNvbnN0CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLU9w dGlvbmFsPHNpemVfdD4gQ29udGlub3VzQ29udGVudDo6bGFzdFdyYXBPcHBvcnR1bml0eUluZGV4 KCkgY29uc3QKK09wdGlvbmFsPHNpemVfdD4gQ29udGludW91c0NvbnRlbnQ6Omxhc3RXcmFwT3Bw b3J0dW5pdHlJbmRleCgpIGNvbnN0CiB7CiAgICAgLy8gPHNwYW4gc3R5bGU9IndoaXRlLXNwYWNl OiBwcmUiPm5vX3dyYXA8L3NwYW4+PHNwYW4+eWVzIHdyYXA8L3NwYW4+PHNwYW4gc3R5bGU9Indo aXRlLXNwYWNlOiBwcmUiPm5vX3dyYXA8L3NwYW4+LgogICAgIC8vIFtjb250YWluZXIgc3RhcnRd W25vX3dyYXBdW2NvbnRhaW5lciBlbmRdW2NvbnRhaW5lciBzdGFydF1beWVzXSA8LSBjb250aW51 b3VzIGNvbnRlbnQKQEAgLTQzOSw3ICs0MzksNyBAQCBPcHRpb25hbDxzaXplX3Q+IENvbnRpbm91 c0NvbnRlbnQ6Omxhc3RXcmFwT3Bwb3J0dW5pdHlJbmRleCgpIGNvbnN0CiAgICAgcmV0dXJuIGlz V3JhcHBpbmdBbGxvd2VkKG1fcnVuc1tsYXN0SXRlbUluZGV4XS5pbmxpbmVJdGVtLnN0eWxlKCkp ID8gbWFrZU9wdGlvbmFsKGxhc3RJdGVtSW5kZXgpIDogV1RGOjpudWxsb3B0OwogfQogCi12b2lk IENvbnRpbm91c0NvbnRlbnQ6OlRyYWlsaW5nQ29sbGFwc2libGVDb250ZW50OjpyZXNldCgpCit2 b2lkIENvbnRpbnVvdXNDb250ZW50OjpUcmFpbGluZ0NvbGxhcHNpYmxlQ29udGVudDo6cmVzZXQo KQogewogICAgIGlzRnVsbHlDb2xsYXBzaWJsZSA9IGZhbHNlOwogICAgIHdpZHRoID0gMF9sdTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUxpbmVCcmVha2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lQnJlYWtlci5oCmluZGV4IGRjNWQwZjFlNTk5MTkyYjZjZTU4MGExYjc4OWIwNDg4 YWFkODQ0ZDAuLjJlY2E1MzgwNjc1NmYxZGJhYWZlMTQ4N2E5Nzk3Y2M2OWE1MTQ1YTIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC cmVha2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJyZWFrZXIuaApAQCAtMzQsNyArMzQsNyBAQCBuYW1lc3BhY2UgTGF5b3V0IHsKIAog Y2xhc3MgSW5saW5lSXRlbTsKIGNsYXNzIElubGluZVRleHRJdGVtOwotc3RydWN0IENvbnRpbm91 c0NvbnRlbnQ7CitzdHJ1Y3QgQ29udGludW91c0NvbnRlbnQ7CiBzdHJ1Y3QgV3JhcHBlZFRleHRD b250ZW50OwogCiBjbGFzcyBMaW5lQnJlYWtlciB7CkBAIC05NSw3ICs5NSw3IEBAIHByaXZhdGU6 CiAgICAgLy8gW2NvbnRhaW5lciBzdGFydF1bc3BhbjFdW2NvbnRhaW5lciBlbmRdW2JldHdlZW5d W2NvbnRhaW5lciBzdGFydF1bc3BhbjJdW2NvbnRhaW5lciBlbmRdCiAgICAgLy8gc2VlIGh0dHBz Oi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtdGV4dC0zLyNsaW5lLWJyZWFrLWRldGFpbHMKICAgICBP cHRpb25hbDxXcmFwcGVkVGV4dENvbnRlbnQ+IHdyYXBUZXh0Q29udGVudChjb25zdCBSdW5MaXN0 JiwgY29uc3QgTGluZVN0YXR1cyYpIGNvbnN0OwotICAgIFJlc3VsdCB0cnlXcmFwcGluZ0lubGlu ZUNvbnRlbnQoY29uc3QgQ29udGlub3VzQ29udGVudCYsIGNvbnN0IExpbmVTdGF0dXMmKSBjb25z dDsKKyAgICBSZXN1bHQgdHJ5V3JhcHBpbmdJbmxpbmVDb250ZW50KGNvbnN0IENvbnRpbnVvdXND b250ZW50JiwgY29uc3QgTGluZVN0YXR1cyYpIGNvbnN0OwogICAgIE9wdGlvbmFsPFBhcnRpYWxS dW4+IHRyeUJyZWFraW5nVGV4dFJ1bihjb25zdCBSdW4mIG92ZXJmbG93UnVuLCBJbmxpbmVMYXlv dXRVbml0IGF2YWlsYWJsZVdpZHRoKSBjb25zdDsKIAogICAgIGVudW0gY2xhc3MgV29yZEJyZWFr UnVsZSB7CkBAIC0xMDQsOCArMTA0LDggQEAgcHJpdmF0ZToKICAgICAgICAgT25seUh5cGhlbmF0 aW9uQWxsb3dlZAogICAgIH07CiAgICAgV29yZEJyZWFrUnVsZSB3b3JkQnJlYWtCZWhhdmlvcihj b25zdCBSZW5kZXJTdHlsZSYpIGNvbnN0OwotICAgIGJvb2wgc2hvdWxkS2VlcEVuZE9mTGluZVdo aXRlc3BhY2UoY29uc3QgQ29udGlub3VzQ29udGVudCYpIGNvbnN0OwotICAgIGJvb2wgaXNDb250 ZW50V3JhcHBpbmdBbGxvd2VkKGNvbnN0IENvbnRpbm91c0NvbnRlbnQmKSBjb25zdDsKKyAgICBi b29sIHNob3VsZEtlZXBFbmRPZkxpbmVXaGl0ZXNwYWNlKGNvbnN0IENvbnRpbnVvdXNDb250ZW50 JikgY29uc3Q7CisgICAgYm9vbCBpc0NvbnRlbnRXcmFwcGluZ0FsbG93ZWQoY29uc3QgQ29udGlu dW91c0NvbnRlbnQmKSBjb25zdDsKIAogICAgIGJvb2wgbl9oeXBoZW5hdGlvbklzRGlzYWJsZWQg eyBmYWxzZSB9OwogICAgIGNvbnN0IElubGluZUl0ZW0qIG1fbGFzdFdyYXBPcHBvcnR1bml0eSB7 IG51bGxwdHIgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcAppbmRleCBlZTdkMzNkN2I3Y2ZjMGU0 MmU1NTEyNDkzOTEwYWJiZTU5YTdiODE0Li45YTVjNjc1MDAwOTJmMzJmYTAyZTQzMmZmZGY3MTM2 NjIxYWU4OGQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC02NCw0MiArNjQsNDcgQEAg dm9pZCBIYW5naW5nQ29udGVudDo6cmVzZXQoKQogICAgIG1fd2lkdGggPSAgMDsKIH0KIAotc3Ry dWN0IExpbmVCdWlsZGVyOjpDb250aW5vdXNDb250ZW50IHsKK3N0cnVjdCBMaW5lQnVpbGRlcjo6 Q29udGludW91c0NvbnRlbnQgewogcHVibGljOgotICAgIENvbnRpbm91c0NvbnRlbnQoY29uc3Qg SW5saW5lSXRlbVJ1biYsIGJvb2wgdGV4dElzQWxpZ25KdXN0aWZ5KTsKKyAgICBDb250aW51b3Vz Q29udGVudChjb25zdCBJbmxpbmVJdGVtUnVuJiwgYm9vbCB0ZXh0SXNBbGlnbkp1c3RpZnkpOwog Ci0gICAgYm9vbCBhcHBlbmQoY29uc3QgSW5saW5lSXRlbVJ1biYpOworICAgIGJvb2wgaXNFbGln aWJsZShjb25zdCBJbmxpbmVJdGVtUnVuJikgY29uc3Q7CisgICAgdm9pZCBhcHBlbmQoY29uc3Qg SW5saW5lSXRlbVJ1biYpOwogICAgIExpbmVCdWlsZGVyOjpSdW4gY2xvc2UoKTsKIAotcHJpdmF0 ZToKLSAgICBzdGF0aWMgYm9vbCBjYW5CZUV4cGFuZGVkKGNvbnN0IElubGluZUl0ZW1SdW4mIHJ1 bikgeyByZXR1cm4gcnVuLmlzVGV4dCgpICYmICFydW4uaXNDb2xsYXBzZWQoKSAmJiAhcnVuLmlz Q29sbGFwc2VkVG9aZXJvQWR2YW5jZVdpZHRoKCk7IH0KLSAgICBib29sIGNhbkJlTWVyZ2VkKGNv bnN0IElubGluZUl0ZW1SdW4mIHJ1bikgY29uc3QgeyByZXR1cm4gcnVuLmlzVGV4dCgpICYmICFy dW4uaXNDb2xsYXBzZWRUb1plcm9BZHZhbmNlV2lkdGgoKSAmJiAmbV9pbml0aWFsSW5saW5lUnVu LmxheW91dEJveCgpID09ICZydW4ubGF5b3V0Qm94KCk7IH0KKyAgICBzdGF0aWMgYm9vbCBjYW5J bmxpbmVJdGVtUnVuQmVFeHBhbmRlZChjb25zdCBJbmxpbmVJdGVtUnVuJiBydW4pIHsgcmV0dXJu IHJ1bi5pc1RleHQoKSAmJiAhcnVuLmlzQ29sbGFwc2VkKCkgJiYgIXJ1bi5pc0NvbGxhcHNlZFRv WmVyb0FkdmFuY2VXaWR0aCgpOyB9CiAKK3ByaXZhdGU6CiAgICAgY29uc3QgSW5saW5lSXRlbVJ1 biYgbV9pbml0aWFsSW5saW5lUnVuOwogICAgIGNvbnN0IGJvb2wgbV9jb2xsZWN0RXhwYW5zaW9u T3Bwb3J0dW5pdGllcyB7IGZhbHNlIH07CiAgICAgdW5zaWduZWQgbV9leHBhbmRlZExlbmd0aCB7 IDAgfTsKICAgICBJbmxpbmVMYXlvdXRVbml0IG1fZXhwYW5kZWRXaWR0aCB7IDAgfTsKLSAgICBi b29sIG1fdHJhaWxpbmdSdW5DYW5CZUV4cGFuZGVkIHsgZmFsc2UgfTsKKyAgICBib29sIG1fdHJh aWxpbmdSdW5DYW5CZUV4cGFuZGVkIHsgdHJ1ZSB9OwogICAgIGJvb2wgbV9oYXNUcmFpbGluZ0V4 cGFuc2lvbk9wcG9ydHVuaXR5IHsgZmFsc2UgfTsKICAgICB1bnNpZ25lZCBtX2V4cGFuc2lvbk9w cG9ydHVuaXR5Q291bnQgeyAwIH07CiB9OwogCi1MaW5lQnVpbGRlcjo6Q29udGlub3VzQ29udGVu dDo6Q29udGlub3VzQ29udGVudChjb25zdCBJbmxpbmVJdGVtUnVuJiBpbml0aWFsSW5saW5lUnVu LCBib29sIHRleHRJc0FsaWduSnVzdGlmeSkKK0xpbmVCdWlsZGVyOjpDb250aW51b3VzQ29udGVu dDo6Q29udGludW91c0NvbnRlbnQoY29uc3QgSW5saW5lSXRlbVJ1biYgaW5pdGlhbElubGluZVJ1 biwgYm9vbCB0ZXh0SXNBbGlnbkp1c3RpZnkpCiAgICAgOiBtX2luaXRpYWxJbmxpbmVSdW4oaW5p dGlhbElubGluZVJ1bikKICAgICAsIG1fY29sbGVjdEV4cGFuc2lvbk9wcG9ydHVuaXRpZXModGV4 dElzQWxpZ25KdXN0aWZ5ICYmICFpc1doaXRlc3BhY2VQcmVzZXJ2ZWQobV9pbml0aWFsSW5saW5l UnVuLnN0eWxlKCkpKSAvLyBEbyBub3QgY29sbGVjdCBleHBhbnNpb24gZGF0YSBvbiBwcmVzZXJ2 ZWQgd2hpdGVzcGFjZSBjb250ZW50ICh3ZSBzaG91bGQgbm90IG11dGF0ZSB0aGUgc3BhY2luZyBi ZXR3ZWVuIHJ1bnMgaW4gc3VjaCBjYXNlcykuCi0gICAgLCBtX3RyYWlsaW5nUnVuQ2FuQmVFeHBh bmRlZChjYW5CZUV4cGFuZGVkKGluaXRpYWxJbmxpbmVSdW4pKQogeworICAgIC8vIFdlIHNob3Vs ZCBub3QgY3JlYXRlIGEgQ29udGludW91c0NvbnRlbnQgb2JqZWN0IHdoZW4gZXZlbiB0aGUgaW5p dGFsIHJ1biBjYW4gbm90IGJlIGV4cGFuZGVkLgorICAgIEFTU0VSVChjYW5JbmxpbmVJdGVtUnVu QmVFeHBhbmRlZChpbml0aWFsSW5saW5lUnVuKSk7CiB9CiAKLWJvb2wgTGluZUJ1aWxkZXI6OkNv bnRpbm91c0NvbnRlbnQ6OmFwcGVuZChjb25zdCBJbmxpbmVJdGVtUnVuJiBpbmxpbmVJdGVtUnVu KQorYm9vbCBMaW5lQnVpbGRlcjo6Q29udGludW91c0NvbnRlbnQ6OmlzRWxpZ2libGUoY29uc3Qg SW5saW5lSXRlbVJ1biYgaW5saW5lSXRlbVJ1bikgY29uc3QKIHsKLSAgICAvLyBNZXJnZWQgY29u dGVudCBuZWVkcyB0byBiZSBjb250aW51b3VzLgogICAgIGlmICghbV90cmFpbGluZ1J1bkNhbkJl RXhwYW5kZWQpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAoIWNhbkJlTWVyZ2VkKGlu bGluZUl0ZW1SdW4pKQotICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgLy8gT25seSBub24tY29s bGFwc2VkIHRleHQgcnVucyB3aXRoIHRoZSBzYW1lIGxheW91dCBib3ggY2FuIGJlIGFkZGVkIGFz IGNvbnRpbnVvdXMgY29udGVudC4KKyAgICByZXR1cm4gaW5saW5lSXRlbVJ1bi5pc1RleHQoKSAm JiAhaW5saW5lSXRlbVJ1bi5pc0NvbGxhcHNlZFRvWmVyb0FkdmFuY2VXaWR0aCgpICYmICZtX2lu aXRpYWxJbmxpbmVSdW4ubGF5b3V0Qm94KCkgPT0gJmlubGluZUl0ZW1SdW4ubGF5b3V0Qm94KCk7 Cit9CiAKLSAgICBtX3RyYWlsaW5nUnVuQ2FuQmVFeHBhbmRlZCA9IGNhbkJlRXhwYW5kZWQoaW5s aW5lSXRlbVJ1bik7Cit2b2lkIExpbmVCdWlsZGVyOjpDb250aW51b3VzQ29udGVudDo6YXBwZW5k KGNvbnN0IElubGluZUl0ZW1SdW4mIGlubGluZUl0ZW1SdW4pCit7CisgICAgLy8gTWVyZ2VkIGNv bnRlbnQgbmVlZHMgdG8gYmUgY29udGludW91cy4KKyAgICBBU1NFUlQoaXNFbGlnaWJsZShpbmxp bmVJdGVtUnVuKSk7CisgICAgbV90cmFpbGluZ1J1bkNhbkJlRXhwYW5kZWQgPSBjYW5JbmxpbmVJ dGVtUnVuQmVFeHBhbmRlZChpbmxpbmVJdGVtUnVuKTsKIAogICAgIEFTU0VSVChpbmxpbmVJdGVt UnVuLmlzVGV4dCgpKTsKICAgICBtX2V4cGFuZGVkTGVuZ3RoICs9IGlubGluZUl0ZW1SdW4udGV4 dENvbnRleHQoKS0+bGVuZ3RoKCk7CkBAIC0xMTAsMTAgKzExNSw5IEBAIGJvb2wgTGluZUJ1aWxk ZXI6OkNvbnRpbm91c0NvbnRlbnQ6OmFwcGVuZChjb25zdCBJbmxpbmVJdGVtUnVuJiBpbmxpbmVJ dGVtUnVuKQogICAgICAgICBpZiAobV9oYXNUcmFpbGluZ0V4cGFuc2lvbk9wcG9ydHVuaXR5KQog ICAgICAgICAgICAgKyttX2V4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQ7CiAgICAgfQotICAgIHJl dHVybiB0cnVlOwogfQogCi1MaW5lQnVpbGRlcjo6UnVuIExpbmVCdWlsZGVyOjpDb250aW5vdXND b250ZW50OjpjbG9zZSgpCitMaW5lQnVpbGRlcjo6UnVuIExpbmVCdWlsZGVyOjpDb250aW51b3Vz Q29udGVudDo6Y2xvc2UoKQogewogICAgIGlmICghbV9leHBhbmRlZExlbmd0aCkKICAgICAgICAg cmV0dXJuIHsgbV9pbml0aWFsSW5saW5lUnVuIH07CkBAIC0yMzEsMTggKzIzNSwyNyBAQCBMaW5l QnVpbGRlcjo6UnVuTGlzdCBMaW5lQnVpbGRlcjo6Y2xvc2UoSXNMYXN0TGluZVdpdGhJbmxpbmVD b250ZW50IGlzTGFzdExpbmVXaQogICAgIC8vIDMuIEFsaWduIG1lcmdlZCBydW5zIGJvdGggdmVy dGljYWxseSBhbmQgaG9yaXpvbnRhbGx5LgogICAgIHJlbW92ZVRyYWlsaW5nQ29sbGFwc2libGVD b250ZW50KCk7CiAgICAgYXV0byBoYW5naW5nQ29udGVudCA9IGNvbGxlY3RIYW5naW5nQ29udGVu dChpc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQpOwotICAgIFJ1bkxpc3QgcnVuTGlzdDsKLSAg ICB1bnNpZ25lZCBydW5JbmRleCA9IDA7Ci0gICAgd2hpbGUgKHJ1bkluZGV4IDwgbV9pbmxpbmVJ dGVtUnVucy5zaXplKCkpIHsKLSAgICAgICAgLy8gTWVyZ2UgZWxpZ2libGUgcnVucy4KLSAgICAg ICAgYXV0byBjb250aW5vdXNDb250ZW50ID0gQ29udGlub3VzQ29udGVudCB7IG1faW5saW5lSXRl bVJ1bnNbcnVuSW5kZXhdLCBpc1RleHRBbGlnbkp1c3RpZnkoKSB9OwotICAgICAgICB3aGlsZSAo KytydW5JbmRleCA8IG1faW5saW5lSXRlbVJ1bnMuc2l6ZSgpKSB7Ci0gICAgICAgICAgICBpZiAo IWNvbnRpbm91c0NvbnRlbnQuYXBwZW5kKG1faW5saW5lSXRlbVJ1bnNbcnVuSW5kZXhdKSkKLSAg ICAgICAgICAgICAgICBicmVhazsKKworICAgIGF1dG8gbWVyZ2VkSW5saW5lSXRlbVJ1bnMgPSBb Jl0geworICAgICAgICBSdW5MaXN0IHJ1bkxpc3Q7CisgICAgICAgIHVuc2lnbmVkIHJ1bkluZGV4 ID0gMDsKKyAgICAgICAgd2hpbGUgKHJ1bkluZGV4IDwgbV9pbmxpbmVJdGVtUnVucy5zaXplKCkp IHsKKyAgICAgICAgICAgIC8vIE1lcmdlIGVsaWdpYmxlIHJ1bnMuCisgICAgICAgICAgICBhdXRv JiBpbmxpbmVJdGVtUnVuID0gbV9pbmxpbmVJdGVtUnVuc1tydW5JbmRleF07CisgICAgICAgICAg ICBpZiAoIUNvbnRpbnVvdXNDb250ZW50OjpjYW5JbmxpbmVJdGVtUnVuQmVFeHBhbmRlZChpbmxp bmVJdGVtUnVuKSkgeworICAgICAgICAgICAgICAgIHJ1bkxpc3QuYXBwZW5kKHsgaW5saW5lSXRl bVJ1biB9KTsKKyAgICAgICAgICAgICAgICArK3J1bkluZGV4OworICAgICAgICAgICAgICAgIGNv bnRpbnVlOworICAgICAgICAgICAgfQorICAgICAgICAgICAgYXV0byBtZXJnZWRSdW5zID0gQ29u dGludW91c0NvbnRlbnQgeyBpbmxpbmVJdGVtUnVuLCBpc1RleHRBbGlnbkp1c3RpZnkoKSB9Owor ICAgICAgICAgICAgZm9yIChydW5JbmRleCA9IHJ1bkluZGV4ICsgMTsgcnVuSW5kZXggPCBtX2lu bGluZUl0ZW1SdW5zLnNpemUoKSAmJiBtZXJnZWRSdW5zLmlzRWxpZ2libGUobV9pbmxpbmVJdGVt UnVuc1tydW5JbmRleF0pOyArK3J1bkluZGV4KQorICAgICAgICAgICAgICAgIG1lcmdlZFJ1bnMu YXBwZW5kKG1faW5saW5lSXRlbVJ1bnNbcnVuSW5kZXhdKTsKKyAgICAgICAgICAgIHJ1bkxpc3Qu YXBwZW5kKG1lcmdlZFJ1bnMuY2xvc2UoKSk7CiAgICAgICAgIH0KLSAgICAgICAgcnVuTGlzdC5h cHBlbmQoY29udGlub3VzQ29udGVudC5jbG9zZSgpKTsKLSAgICB9CisgICAgICAgIHJldHVybiBy dW5MaXN0OworICAgIH07CiAKKyAgICBhdXRvIHJ1bkxpc3QgPSBtZXJnZWRJbmxpbmVJdGVtUnVu cygpOwogICAgIGlmICghbV9pc0ludHJpbnNpY1NpemluZykgewogICAgICAgICBmb3IgKGF1dG8m IHJ1biA6IHJ1bkxpc3QpIHsKICAgICAgICAgICAgIGFkanVzdEJhc2VsaW5lQW5kTGluZUhlaWdo dChydW4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKaW5kZXggZDE4MDU2Yzk2NTFhZmNkNTI4NWIxZDEx N2I2YWUyOGU1M2UyNWZjNC4uZDAyNWQzNWM5OTQwNjIyMmVkODAxYTIwOGRmMzU5OGZlZDFhNDUw NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lQnVpbGRlci5oCkBAIC00MCw3ICs0MCw3IEBAIGNsYXNzIElubGluZUZv cm1hdHRpbmdDb250ZXh0OwogCiBjbGFzcyBMaW5lQnVpbGRlciB7CiAgICAgY2xhc3MgSW5saW5l SXRlbVJ1bjsKLSAgICBzdHJ1Y3QgQ29udGlub3VzQ29udGVudDsKKyAgICBzdHJ1Y3QgQ29udGlu dW91c0NvbnRlbnQ7CiAKIHB1YmxpYzoKICAgICBzdHJ1Y3QgQ29uc3RyYWludHMgewo=