218475 2020-11-02 19:39:16 -0800 [LFC][IFC] Use "isConsideredEmpty" instead of "isVisuallyEmpty" 2020-11-03 06:17:21 -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 1703797 0 zalan 2020-11-02 19:39:16 -0800 while <span style="padding: 100px;"></span> is visually empty (blank) it is not considered empty in when computing the line box geometry. 1703803 1 413000 zalan 2020-11-02 19:54:32 -0800 Created attachment 413000 Patch 1703967 2 ews-feeder 2020-11-03 06:16:45 -0800 Committed r269299: <https://trac.webkit.org/changeset/269299> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413000. 1703968 3 webkit-bug-importer 2020-11-03 06:17:21 -0800 <rdar://problem/70992048> 413000 2020-11-02 19:54:32 -0800 2020-11-03 06:16:45 -0800 Patch bug-218475-20201102195431.patch text/plain 18076 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MjgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjc4ZGNiMjQxYmZiNzVh MWZjNGI5MWEwMDM1NWQ0MGI3YzJmNGE2OS4uMjhjZWJiNjcxMDUzZTQ4NGFlNjQ5OTk4NGJhNDJj ZWZmYWY3NjZiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDIwLTExLTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBVc2UgImlz Q29uc2lkZXJlZEVtcHR5IiBpbnN0ZWFkIG9mICJpc1Zpc3VhbGx5RW1wdHkiCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTg0NzUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBjZXJ0YWluIGNhc2VzIHRo ZSBsaW5lIG1heSBsb29rIHZpc3VhbGx5IGVtcHR5LCBidXQgc3RpbGwgY29uc2lkZXJlZCBub24t ZW1wdHkgd2hlbiBjb21wdXRpbmcgdGhlIGxpbmUgYm94IGdlb21ldHJ5LgorICAgICAgICBVc2Ug YSBtb3JlIHByZWNpc2UgdGVybSB0byBpbmRpY2F0ZWQgd2hldGhlciB0aGUgbGluZSBpcyBlbXB0 eS4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdD b250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVp bGRlcjo6YnVpbGQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6 Y29uc3RydWN0SW5saW5lTGV2ZWxCb3hlcyk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjpzaG91bGRJbmxpbmVM ZXZlbEJveFN0cmV0Y2hMaW5lQm94IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6 aW5pdGlhbGl6ZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OnJlbW92ZVRyYWls aW5nVHJpbW1hYmxlQ29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFw cGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFwcGVuZFRleHRDb250ZW50 KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6aXNSdW5Db25zaWRlcmVkRW1wdHkg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjppc1J1blZpc3VhbGx5Tm9u RW1wdHkgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6aXNDb25zaWRl cmVkRW1wdHkgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjppc1Zpc3Vh bGx5RW1wdHkgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmVCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94 OjpMaW5lQm94KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6bV9pc0NvbnNpZGVyZWRFbXB0 eSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Om1faXNMaW5lVmlzdWFsbHlFbXB0eSk6IERl bGV0ZWQuCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5o OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94Ojppc0NvbnNpZGVyZWRFbXB0eSBj b25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCb3g6OmlzTGluZVZpc3VhbGx5 RW1wdHkgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1 aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lQnVpbGRlcjo6Y2xvc2UpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRl cjo6aGFuZGxlRmxvYXRzQW5kSW5saW5lQ29udGVudCk6CisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaDoKKwogMjAyMC0xMS0wMiAgQ2hyaXMgRHVt ZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZ3Jlc3Npb24ocjI2OTIyNykgaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9zZXJ2aWNlLXdvcmtlcnMvc2VydmljZS13b3Jr ZXIvcmVmZXJyZXItdG9wbGV2ZWwtc2NyaXB0LWZldGNoLmh0dHBzLmh0bWwgaXMgYSBmbGFreSBj cmFzaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApp bmRleCA2OGNhZDlhZTI5NDNkNDdlNTU1MzBkNTdmYzc4ZWJlZDY3ZmNkMjE2Li5jOGY5MTlhZjk0 ZjZhZjkyZjFmMjZhZjgxNzU1ZTdmN2IwNTZkODJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVG b3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtMTU2LDggKzE1Niw4IEBAIExpbmVCb3gg TGluZUJveEJ1aWxkZXI6OmJ1aWxkKGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCYgbGlu ZUNvbnRlbnQpCiAgICAgYXV0byYgcnVucyA9IGxpbmVDb250ZW50LnJ1bnM7CiAgICAgYXV0byBs aW5lTG9naWNhbFdpZHRoID0gbGluZUNvbnRlbnQubGluZUxvZ2ljYWxXaWR0aDsKICAgICBhdXRv IGNvbnRlbnRMb2dpY2FsV2lkdGggPSBsaW5lQ29udGVudC5saW5lQ29udGVudExvZ2ljYWxXaWR0 aDsKLSAgICBhdXRvIGlzTGluZVZpc3VhbGx5RW1wdHkgPSBsaW5lQ29udGVudC5pc0xpbmVWaXN1 YWxseUVtcHR5ID8gTGluZUJveDo6SXNMaW5lVmlzdWFsbHlFbXB0eTo6WWVzIDogTGluZUJveDo6 SXNMaW5lVmlzdWFsbHlFbXB0eTo6Tm87Ci0gICAgYXV0byBsaW5lQm94ID0gTGluZUJveCB7IGNv bnRlbnRMb2dpY2FsV2lkdGgsIGlzTGluZVZpc3VhbGx5RW1wdHkgfTsKKyAgICBhdXRvIGlzTGlu ZUNvbnNpZGVyZWRFbXB0eSA9IGxpbmVDb250ZW50LmlzTGluZUNvbnNpZGVyZWRFbXB0eSA/IExp bmVCb3g6OklzTGluZUNvbnNpZGVyZWRFbXB0eTo6WWVzIDogTGluZUJveDo6SXNMaW5lQ29uc2lk ZXJlZEVtcHR5OjpObzsKKyAgICBhdXRvIGxpbmVCb3ggPSBMaW5lQm94IHsgY29udGVudExvZ2lj YWxXaWR0aCwgaXNMaW5lQ29uc2lkZXJlZEVtcHR5IH07CiAKICAgICBpZiAoYXV0byBob3Jpem9u dGFsQWxpZ25tZW50T2Zmc2V0ID0gTGF5b3V0Ojpob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0KHJ1 bnMsIHJvb3RCb3goKS5zdHlsZSgpLnRleHRBbGlnbigpLCBsaW5lTG9naWNhbFdpZHRoLCBjb250 ZW50TG9naWNhbFdpZHRoLCBsaW5lQ29udGVudC5pc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQp KQogICAgICAgICBsaW5lQm94LnNldEhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQoKmhvcml6b250 YWxBbGlnbm1lbnRPZmZzZXQpOwpAQCAtMjA4LDcgKzIwOCw3IEBAIHZvaWQgTGluZUJveEJ1aWxk ZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGlu ZTo6UnVuCiAgICAgICAgIGF1dG8gcm9vdElubGluZUJveCA9IExpbmVCb3g6OklubGluZUxldmVs Qm94OjpjcmVhdGVSb290SW5saW5lQm94KHJvb3RCb3goKSwgaG9yaXpvbnRhbEFsaWdtZW50T2Zm c2V0LCBsaW5lQm94LmxvZ2ljYWxXaWR0aCgpKTsKIAogICAgICAgICBhdXRvIGxpbmVIYXNJbWFn aW5hcnlTdHJ1dCA9IGxheW91dFN0YXRlKCkuaW5Ob1F1aXJrc01vZGUoKTsKLSAgICAgICAgYXV0 byBpc0luaXRpYWxseUNvbnNpZGVyZWROb25FbXB0eSA9ICFsaW5lQm94LmlzTGluZVZpc3VhbGx5 RW1wdHkoKSAmJiBsaW5lSGFzSW1hZ2luYXJ5U3RydXQ7CisgICAgICAgIGF1dG8gaXNJbml0aWFs bHlDb25zaWRlcmVkTm9uRW1wdHkgPSAhbGluZUJveC5pc0NvbnNpZGVyZWRFbXB0eSgpICYmIGxp bmVIYXNJbWFnaW5hcnlTdHJ1dDsKICAgICAgICAgaWYgKGlzSW5pdGlhbGx5Q29uc2lkZXJlZE5v bkVtcHR5KQogICAgICAgICAgICAgcm9vdElubGluZUJveC0+c2V0SXNOb25FbXB0eSgpOwogICAg ICAgICBzZXRWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5saW5lQm94KCpyb290SW5saW5lQm94KTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAppbmRleCAxNzk0MDRh YTdjZDBhZWY3NTY5Y2UwMzBiZmI4NTI3YmNhYjBkZTliLi45ZDU5YjFmOWYwMGFkNTdlOTZmMDY2 ZjUzZGYxOWRlNjk2Y2FmY2Y3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRl eHRRdWlya3MuY3BwCkBAIC01MCw3ICs1MCw3IEBAIGJvb2wgSW5saW5lRm9ybWF0dGluZ0NvbnRl eHQ6OlF1aXJrczo6c2hvdWxkSW5saW5lTGV2ZWxCb3hTdHJldGNoTGluZUJveChjb25zdCBMCiAg ICAgICAgIHJldHVybiB0cnVlOwogICAgIC8vIDxicj4gaW4gbm9uLXN0YW5kYXJkIG1vZGUgc3Ry ZXRjaGVzIHRoZSBsaW5lIGJveCBvbmx5IHdoZW4gdGhlIGxpbmUgaXMgZW1wdHkuCiAgICAgLy8g ZS5nLiA8ZGl2PjxzcGFuPjxicj48L3NwYW4+PC9kaXY+IHdpbGwgc3RyZXRjaCBidXQgPGRpdj50 aGlzIHdpbGwgbm90IHN0cmV0Y2ggdG8gMjAwcHg8c3BhbiBzdHlsZT0iZm9udC1zaXplOiAyMDBw eDsiPjxicj48L3NwYW4+PC9kaXY+Ci0gICAgcmV0dXJuIGxpbmVCb3guaXNMaW5lVmlzdWFsbHlF bXB0eSgpOworICAgIHJldHVybiBsaW5lQm94LmlzQ29uc2lkZXJlZEVtcHR5KCk7CiB9CiAKIGJv b2wgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aGFzU29mdFdyYXBPcHBvcnR1bml0 eUF0SW1hZ2UoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAppbmRleCAyMTg5NTRiNDEzMmFlOTllNjQxODIxNGMy YmVlZTFlZTVjNjQ2ZjZkLi4xNjg3NzkwNzVmOGI1ODNjOWMzMTgyYjgxNDUyNTU2YzliNDk0NWYy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lLmNwcApAQCAtNjAsMTEgKzYwLDExIEBAIHZvaWQgTGluZTo6aW5pdGlhbGl6ZShJ bmxpbmVMYXlvdXRVbml0IGhvcml6b250YWxDb25zdHJhaW50KQogewogICAgIG1faG9yaXpvbnRh bENvbnN0cmFpbnQgPSBob3Jpem9udGFsQ29uc3RyYWludDsKICAgICBtX2NvbnRlbnRMb2dpY2Fs V2lkdGggPSB7IH07Ci0gICAgbV9pc1Zpc3VhbGx5RW1wdHkgPSB0cnVlOwogICAgIG1fcnVucy5j bGVhcigpOwogICAgIG1fdHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggPSB7IH07CiAgICAgbV90cmlt bWFibGVUcmFpbGluZ0NvbnRlbnQucmVzZXQoKTsKLSAgICBtX2xpbmVJc1Zpc3VhbGx5RW1wdHlC ZWZvcmVUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQgPSB7IH07CisgICAgbV9pc0NvbnNpZGVyZWRF bXB0eSA9IHRydWU7CisgICAgbV9pc0NvbnNpZGVyZWRFbXB0eUJlZm9yZVRyaW1tYWJsZVRyYWls aW5nQ29udGVudCA9IHsgfTsKIH0KIAogdm9pZCBMaW5lOjpyZW1vdmVDb2xsYXBzaWJsZUNvbnRl bnQoKQpAQCAtMTQxLDE5ICsxNDEsMTcgQEAgdm9pZCBMaW5lOjpyZW1vdmVUcmFpbGluZ1RyaW1t YWJsZUNvbnRlbnQoKQogCiAgICAgbV9jb250ZW50TG9naWNhbFdpZHRoIC09IG1fdHJpbW1hYmxl VHJhaWxpbmdDb250ZW50LnJlbW92ZSgpOwogICAgIC8vIElmIHdlIHJlbW92ZWQgdGhlIGZpcnN0 IHZpc2libGUgcnVuIG9uIHRoZSBsaW5lLCB3ZSBuZWVkIHRvIHJlLWNoZWNrIHRoZSB2aXNpYmls aXR5IHN0YXR1cy4KLSAgICBpZiAobV9saW5lSXNWaXN1YWxseUVtcHR5QmVmb3JlVHJpbW1hYmxl VHJhaWxpbmdDb250ZW50KSB7Ci0gICAgICAgIC8vIEp1c3QgYmVjYXVzZSB0aGUgbGluZSB3YXMg dmlzdWFsbHkgZW1wdHkgYmVmb3JlIHRoZSByZW1vdmVkIGNvbnRlbnQsIGl0IGRvZXMgbm90IG5l Y2Vzc2FyaWx5IG1lYW4gaXQgaXMgc3RpbGwgdmlzdWFsbHkgZW1wdHkuCisgICAgaWYgKG1faXND b25zaWRlcmVkRW1wdHlCZWZvcmVUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQpIHsKKyAgICAgICAg Ly8gSnVzdCBiZWNhdXNlIHRoZSBsaW5lIHdhcyBjb25zaWRlcmVkIGVtcHR5IGJlZm9yZSB0aGUg cmVtb3ZlZCBjb250ZW50LCBpdCBkb2VzIG5vdCBuZWNlc3NhcmlseSBtZWFuIGl0IGlzIHN0aWxs IGVtcHR5LgogICAgICAgICAvLyA8c3Bhbj4gIDwvc3Bhbj48c3BhbiBzdHlsZT0icGFkZGluZy1s ZWZ0OiAxMHB4Ij48L3NwYW4+ICA8LSBub24tZW1wdHkKLSAgICAgICAgYXV0byBsaW5lSXNWaXN1 YWxseUVtcHR5ID0gWyZdIHsKKyAgICAgICAgbV9pc0NvbnNpZGVyZWRFbXB0eSA9IFsmXSB7CiAg ICAgICAgICAgICBmb3IgKGF1dG8mIHJ1biA6IG1fcnVucykgewotICAgICAgICAgICAgICAgIGlm IChpc1J1blZpc3VhbGx5Tm9uRW1wdHkocnVuKSkKKyAgICAgICAgICAgICAgICBpZiAoIWlzUnVu Q29uc2lkZXJlZEVtcHR5KHJ1bikpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICB9OwotICAg ICAgICAvLyBXZSBjb3VsZCBvbmx5IGdvIGZyb20gdmlzdWFsbHkgbm9uIGVtcHR5IC0+IHRvIHZp c3VhbGx5IGVtcHR5LiBUcmltbWVkIHJ1bnMgc2hvdWxkIG5ldmVyIG1ha2UgdGhlIGxpbmUgdmlz aWJsZS4KLSAgICAgICAgbV9pc1Zpc3VhbGx5RW1wdHkgPSBsaW5lSXNWaXN1YWxseUVtcHR5KCk7 Ci0gICAgICAgIG1fbGluZUlzVmlzdWFsbHlFbXB0eUJlZm9yZVRyaW1tYWJsZVRyYWlsaW5nQ29u dGVudCA9IHsgfTsKKyAgICAgICAgfSgpOworICAgICAgICBtX2lzQ29uc2lkZXJlZEVtcHR5QmVm b3JlVHJpbW1hYmxlVHJhaWxpbmdDb250ZW50ID0geyB9OwogICAgIH0KIH0KIApAQCAtMjMwLDkg KzIyOCw5IEBAIHZvaWQgTGluZTo6YXBwZW5kKGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0s IElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKQogICAgIGVsc2UKICAgICAgICAgQVNTRVJU X05PVF9SRUFDSEVEKCk7CiAKLSAgICAvLyBDaGVjayBpZiB0aGlzIG5ld2x5IGFwcGVuZGVkIGNv bnRlbnQgbWFrZXMgdGhlIGxpbmUgdmlzdWFsbHkgbm9uLWVtcHR5LgotICAgIGlmIChtX2lzVmlz dWFsbHlFbXB0eSAmJiAhbV9ydW5zLmlzRW1wdHkoKSAmJiBpc1J1blZpc3VhbGx5Tm9uRW1wdHko bV9ydW5zLmxhc3QoKSkpCi0gICAgICAgIG1faXNWaXN1YWxseUVtcHR5ID0gZmFsc2U7CisgICAg Ly8gQ2hlY2sgaWYgdGhpcyBuZXdseSBhcHBlbmRlZCBjb250ZW50IG1ha2VzIHRoZSBsaW5lIG5v bi1lbXB0eS4KKyAgICBpZiAobV9pc0NvbnNpZGVyZWRFbXB0eSAmJiAhbV9ydW5zLmlzRW1wdHko KSAmJiAhaXNSdW5Db25zaWRlcmVkRW1wdHkobV9ydW5zLmxhc3QoKSkpCisgICAgICAgIG1faXND b25zaWRlcmVkRW1wdHkgPSBmYWxzZTsKIH0KIAogdm9pZCBMaW5lOjphcHBlbmROb25CcmVha2Fi bGVTcGFjZShjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpbmVMYXlvdXRVbml0IGxv Z2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkKQEAgLTMwNiw3ICszMDQs NyBAQCB2b2lkIExpbmU6OmFwcGVuZFRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiBp bmxpbmVUZXh0SXRlbSwgSW5saW5lTGF5b3V0VQogICAgICAgICBtX3RyaW1tYWJsZVRyYWlsaW5n Q29udGVudC5hZGRGdWxseVRyaW1tYWJsZUNvbnRlbnQobV9ydW5zLnNpemUoKSAtIDEsIGxvZ2lj YWxXaWR0aCk7CiAgICAgICAgIC8vIElmIHdlIGV2ZXIgdHJpbSB0aGlzIGNvbnRlbnQsIHdlIG5l ZWQgdG8ga25vdyBpZiB0aGUgbGluZSB2aXNpYmlsaXR5IHN0YXRlIG5lZWRzIHRvIGJlIHJlY29t cHV0ZWQuCiAgICAgICAgIGlmIChtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5pc0VtcHR5KCkp Ci0gICAgICAgICAgICBtX2xpbmVJc1Zpc3VhbGx5RW1wdHlCZWZvcmVUcmltbWFibGVUcmFpbGlu Z0NvbnRlbnQgPSBpc1Zpc3VhbGx5RW1wdHkoKTsKKyAgICAgICAgICAgIG1faXNDb25zaWRlcmVk RW1wdHlCZWZvcmVUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQgPSBpc0NvbnNpZGVyZWRFbXB0eSgp OwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIC8vIEFueSBub24td2hpdGVzcGFjZSwgbm8t dHJpbW1hYmxlIGNvbnRlbnQgcmVzZXRzIHRoZSBleGlzdGluZyB0cmltbWFibGUuCkBAIC0zNDks MzcgKzM0NywzNyBAQCB2b2lkIExpbmU6OmFwcGVuZFdvcmRCcmVha09wcG9ydHVuaXR5KGNvbnN0 IElubGluZUl0ZW0mIGlubGluZUl0ZW0pCiAgICAgbV9ydW5zLmFwcGVuZCh7IGlubGluZUl0ZW0s IGNvbnRlbnRMb2dpY2FsV2lkdGgoKSwgMF9sdSB9KTsKIH0KIAotYm9vbCBMaW5lOjppc1J1blZp c3VhbGx5Tm9uRW1wdHkoY29uc3QgUnVuJiBydW4pIGNvbnN0Citib29sIExpbmU6OmlzUnVuQ29u c2lkZXJlZEVtcHR5KGNvbnN0IFJ1biYgcnVuKSBjb25zdAogewogICAgIGlmIChydW4uaXNUZXh0 KCkpCi0gICAgICAgIHJldHVybiB0cnVlOworICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBp ZiAocnVuLmlzTGluZUJyZWFrKCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgcmV0 dXJuIHRydWU7CiAKICAgICAvLyBOb3RlIHRoYXQgdGhpcyBkb2VzIG5vdCBjaGVjayB3aGV0aGVy IHRoZSBpbmxpbmUgY29udGFpbmVyIGhhcyBjb250ZW50LiBJdCBzaW1wbHkgY2hlY2tzIGlmIHRo ZSBjb250YWluZXIgaXRzZWxmIGlzIGNvbnNpZGVyZWQgbm9uLWVtcHR5LgogICAgIGlmIChydW4u aXNJbmxpbmVCb3hTdGFydCgpIHx8IHJ1bi5pc0lubGluZUJveEVuZCgpKSB7CiAgICAgICAgIGlm ICghcnVuLmxvZ2ljYWxXaWR0aCgpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAg ICAvLyBNYXJnaW4gZG9lcyBub3QgbWFrZSB0aGUgY29udGFpbmVyIHZpc3VhbGx5IG5vbi1lbXB0 eS4gQ2hlY2sgaWYgaXQgaGFzIGJvcmRlciBvciBwYWRkaW5nLgorICAgICAgICAgICAgcmV0dXJu IHRydWU7CisgICAgICAgIC8vIE1hcmdpbiBkb2VzIG5vdCBtYWtlIHRoZSBjb250YWluZXIgbm9u LWVtcHR5IG9ubHkgYm9yZGVyIG9yIHBhZGRpbmcuCiAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5 ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChydW4ubGF5b3V0Qm94KCkpOwot ICAgICAgICBpZiAocnVuLmlzSW5saW5lQm94U3RhcnQoKSkKLSAgICAgICAgICAgIHJldHVybiBi b3hHZW9tZXRyeS5ib3JkZXJMZWZ0KCkgfHwgKGJveEdlb21ldHJ5LnBhZGRpbmdMZWZ0KCkgJiYg Ym94R2VvbWV0cnkucGFkZGluZ0xlZnQoKS52YWx1ZSgpKTsKLSAgICAgICAgcmV0dXJuIGJveEdl b21ldHJ5LmJvcmRlclJpZ2h0KCkgfHwgKGJveEdlb21ldHJ5LnBhZGRpbmdSaWdodCgpICYmIGJv eEdlb21ldHJ5LnBhZGRpbmdSaWdodCgpLnZhbHVlKCkpOworICAgICAgICBhdXRvIGhhc0JvcmRl ck9yUGFkZGluZyA9IHJ1bi5pc0lubGluZUJveFN0YXJ0KCkgPyBib3hHZW9tZXRyeS5ib3JkZXJM ZWZ0KCkgfHwgKGJveEdlb21ldHJ5LnBhZGRpbmdMZWZ0KCkgJiYgYm94R2VvbWV0cnkucGFkZGlu Z0xlZnQoKS52YWx1ZSgpKQorICAgICAgICAgICAgOiBib3hHZW9tZXRyeS5ib3JkZXJSaWdodCgp IHx8IChib3hHZW9tZXRyeS5wYWRkaW5nUmlnaHQoKSAmJiBib3hHZW9tZXRyeS5wYWRkaW5nUmln aHQoKS52YWx1ZSgpKTsKKyAgICAgICAgcmV0dXJuICFoYXNCb3JkZXJPclBhZGRpbmc7CiAgICAg fQogCiAgICAgaWYgKHJ1bi5pc0JveCgpKSB7CiAgICAgICAgIGlmIChydW4ubGF5b3V0Qm94KCku aXNSZXBsYWNlZEJveCgpKQotICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgICAgIEFTU0VSVChydW4ubGF5b3V0Qm94KCkuaXNJbmxpbmVCbG9j a0JveCgpIHx8IHJ1bi5sYXlvdXRCb3goKS5pc0lubGluZVRhYmxlQm94KCkpOwotICAgICAgICBy ZXR1cm4gcnVuLmxvZ2ljYWxXaWR0aCgpOworICAgICAgICByZXR1cm4gIXJ1bi5sb2dpY2FsV2lk dGgoKTsKICAgICB9CiAKICAgICBpZiAocnVuLmlzV29yZEJyZWFrT3Bwb3J0dW5pdHkoKSkKLSAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOwotICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAog dm9pZCBMaW5lOjphZGRUcmFpbGluZ0h5cGhlbihJbmxpbmVMYXlvdXRVbml0IGh5cGhlbkxvZ2lj YWxXaWR0aCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmUuaAppbmRleCBmNDYyZDFhMmQ2MWZkOTIxYjhmZjg2MTJkYWNiZDQ3MTdmOWMz MjI5Li41MmRkNmU0Y2VlM2U3NTYyOTUwMWQzMWQyMjM4YTZlYTA4Y2FmYWViIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCkBA IC00Niw3ICs0NiwxMSBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGFwcGVuZChjb25zdCBJbmxpbmVJ dGVtJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwogCi0gICAgYm9vbCBpc1Zpc3Vh bGx5RW1wdHkoKSBjb25zdCB7IHJldHVybiBtX2lzVmlzdWFsbHlFbXB0eTsgfQorICAgIC8vIDxz cGFuPjwvc3Bhbj4gY29uc2lkZXJlZCBlbXB0eS4KKyAgICAvLyA8c3Bhbj48YnI+PC9zcGFuPiBp cyBjb25zaWRlcmVkIGVtcHR5LgorICAgIC8vIDxzcGFuPnRleHQ8L3NwYW4+IGlzIG5vdCBjb25z aWRlcmVkIGVtcHR5LgorICAgIC8vIDxzcGFuIHN0eWxlPSJwYWRkaW5nOiAxMHB4Ij48L3NwYW4+ IGlzIG5vdCBjb25zaWRlcmVkIGVtcHR5LiAKKyAgICBib29sIGlzQ29uc2lkZXJlZEVtcHR5KCkg Y29uc3QgeyByZXR1cm4gbV9pc0NvbnNpZGVyZWRFbXB0eTsgfQogCiAgICAgSW5saW5lTGF5b3V0 VW5pdCBob3Jpem9udGFsQ29uc3RyYWludCgpIGNvbnN0IHsgcmV0dXJuIG1faG9yaXpvbnRhbENv bnN0cmFpbnQ7IH0KICAgICBJbmxpbmVMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsV2lkdGgoKSBj b25zdCB7IHJldHVybiBtX2NvbnRlbnRMb2dpY2FsV2lkdGg7IH0KQEAgLTE0OCw3ICsxNTIsNyBA QCBwcml2YXRlOgogICAgIHZvaWQgcmVtb3ZlVHJhaWxpbmdUcmltbWFibGVDb250ZW50KCk7CiAg ICAgdm9pZCB2aXN1YWxseUNvbGxhcHNlUHJlV3JhcE92ZXJmbG93Q29udGVudCgpOwogCi0gICAg Ym9vbCBpc1J1blZpc3VhbGx5Tm9uRW1wdHkoY29uc3QgUnVuJikgY29uc3Q7CisgICAgYm9vbCBp c1J1bkNvbnNpZGVyZWRFbXB0eShjb25zdCBSdW4mKSBjb25zdDsKICAgICBjb25zdCBJbmxpbmVG b3JtYXR0aW5nQ29udGV4dCYgZm9ybWF0dGluZ0NvbnRleHQoKSBjb25zdDsKIAogICAgIHN0cnVj dCBUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQgewpAQCAtMTgxLDggKzE4NSw4IEBAIHByaXZhdGU6 CiAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2hvcml6b250YWxDb25zdHJhaW50IHsgMCB9OwogICAg IElubGluZUxheW91dFVuaXQgbV9jb250ZW50TG9naWNhbFdpZHRoIHsgMCB9OwogICAgIE9wdGlv bmFsPElubGluZUxheW91dFVuaXQ+IG1fdHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggeyAwIH07Ci0g ICAgYm9vbCBtX2lzVmlzdWFsbHlFbXB0eSB7IHRydWUgfTsKLSAgICBPcHRpb25hbDxib29sPiBt X2xpbmVJc1Zpc3VhbGx5RW1wdHlCZWZvcmVUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQ7CisgICAg Ym9vbCBtX2lzQ29uc2lkZXJlZEVtcHR5IHsgdHJ1ZSB9OworICAgIE9wdGlvbmFsPGJvb2w+IG1f aXNDb25zaWRlcmVkRW1wdHlCZWZvcmVUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQ7CiB9OwogCiBp bmxpbmUgdm9pZCBMaW5lOjpUcmltbWFibGVUcmFpbGluZ0NvbnRlbnQ6OnJlc2V0KCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC b3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZUJveC5jcHAKaW5kZXggNzA0ZWZhZDY1MmQwYjgyOTA4ODNlYmVjN2RhYzU5OTM1MTk3MDUyOC4u M2NiNGRmNzVmMzIwNjJmZmRiZjAwMWI5YTlhNmZmMTkzMzA4NDYxNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5j cHAKQEAgLTYzLDkgKzYzLDkgQEAgYm9vbCBMaW5lQm94OjpJbmxpbmVMZXZlbEJveDo6aGFzTGlu ZUJveFJlbGF0aXZlQWxpZ25tZW50KCkgY29uc3QKICAgICByZXR1cm4gdmVydGljYWxBbGlnbm1l bnQgPT0gVmVydGljYWxBbGlnbjo6VG9wIHx8IHZlcnRpY2FsQWxpZ25tZW50ID09IFZlcnRpY2Fs QWxpZ246OkJvdHRvbTsKIH0KIAotTGluZUJveDo6TGluZUJveChJbmxpbmVMYXlvdXRVbml0IGNv bnRlbnRMb2dpY2FsV2lkdGgsIElzTGluZVZpc3VhbGx5RW1wdHkgaXNMaW5lVmlzdWFsbHlFbXB0 eSkKK0xpbmVCb3g6OkxpbmVCb3goSW5saW5lTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRo LCBJc0xpbmVDb25zaWRlcmVkRW1wdHkgaXNMaW5lQ29uc2lkZXJlZEVtcHR5KQogICAgIDogbV9s b2dpY2FsU2l6ZShjb250ZW50TG9naWNhbFdpZHRoLCB7IH0pCi0gICAgLCBtX2lzTGluZVZpc3Vh bGx5RW1wdHkoaXNMaW5lVmlzdWFsbHlFbXB0eSA9PSBJc0xpbmVWaXN1YWxseUVtcHR5OjpZZXMp CisgICAgLCBtX2lzQ29uc2lkZXJlZEVtcHR5KGlzTGluZUNvbnNpZGVyZWRFbXB0eSA9PSBJc0xp bmVDb25zaWRlcmVkRW1wdHk6OlllcykKIHsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCmluZGV4IGQzMTUyMDNk MDFhYTMyN2IwYjE5OTUwMTg5YTQwYjg0ZTdjYzcyYjEuLmFmNzY1NGJmMDEwZTQzODlhMDE1NGFm N2YyNTE0NTMzNDMwOWU3ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKQEAgLTEyOCwxNSArMTI4LDE1IEBAIHB1 YmxpYzoKICAgICAgICAgVHlwZSBtX3R5cGUgeyBUeXBlOjpJbmxpbmVCb3ggfTsKICAgICB9Owog Ci0gICAgZW51bSBjbGFzcyBJc0xpbmVWaXN1YWxseUVtcHR5IHsgTm8sIFllcyB9OwotICAgIExp bmVCb3goSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIElzTGluZVZpc3VhbGx5RW1wdHkp OworICAgIGVudW0gY2xhc3MgSXNMaW5lQ29uc2lkZXJlZEVtcHR5IHsgTm8sIFllcyB9OworICAg IExpbmVCb3goSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgsIElzTGluZUNvbnNpZGVyZWRF bXB0eSk7CiAKICAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0 dXJuIG1fbG9naWNhbFNpemUud2lkdGgoKTsgfQogICAgIElubGluZUxheW91dFVuaXQgbG9naWNh bEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbFNpemUuaGVpZ2h0KCk7IH0KICAgICBJ bmxpbmVMYXlvdXRTaXplIGxvZ2ljYWxTaXplKCkgY29uc3QgeyByZXR1cm4gbV9sb2dpY2FsU2l6 ZTsgfQogCiAgICAgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gaG9yaXpvbnRhbEFsaWdubWVu dE9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1faG9yaXpvbnRhbEFsaWdubWVudE9mZnNldDsgfQot ICAgIGJvb2wgaXNMaW5lVmlzdWFsbHlFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1faXNMaW5lVmlz dWFsbHlFbXB0eTsgfQorICAgIGJvb2wgaXNDb25zaWRlcmVkRW1wdHkoKSBjb25zdCB7IHJldHVy biBtX2lzQ29uc2lkZXJlZEVtcHR5OyB9CiAKICAgICBjb25zdCBJbmxpbmVMZXZlbEJveCYgaW5s aW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3goY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0IHsgcmV0 dXJuICptX2lubGluZUxldmVsQm94UmVjdE1hcC5nZXQoJmxheW91dEJveCk7IH0KIApAQCAtMTY2 LDcgKzE2Niw3IEBAIHByaXZhdGU6CiBwcml2YXRlOgogICAgIElubGluZUxheW91dFNpemUgbV9s b2dpY2FsU2l6ZTsKICAgICBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiBtX2hvcml6b250YWxB bGlnbm1lbnRPZmZzZXQ7Ci0gICAgYm9vbCBtX2lzTGluZVZpc3VhbGx5RW1wdHkgeyB0cnVlIH07 CisgICAgYm9vbCBtX2lzQ29uc2lkZXJlZEVtcHR5IHsgdHJ1ZSB9OwogCiAgICAgc3RkOjp1bmlx dWVfcHRyPElubGluZUxldmVsQm94PiBtX3Jvb3RJbmxpbmVCb3g7CiAgICAgSW5saW5lTGV2ZWxC b3hMaXN0IG1fbm9uUm9vdElubGluZUxldmVsQm94TGlzdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNw cAppbmRleCAzOTY3Zjc0ZDA1MTAxOGE1MTk2OTg2OGViMWVkZWE0ZTM0MjgwNzQ3Li42MGZjZTBk MDM1NzhmZjMwZDBhNmI0ZWIzZTkxNzczY2E3MjEwYzMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIu Y3BwCkBAIC0yNzYsNyArMjc2LDcgQEAgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50IExpbmVCdWls ZGVyOjpsYXlvdXRJbmxpbmVDb250ZW50KGNvbnN0IElubGluZUl0ZW1SYW5nZSYKICAgICAgICAg LCBsaW5lTG9naWNhbFRvcExlZnQKICAgICAgICAgLCBtX2xpbmUuaG9yaXpvbnRhbENvbnN0cmFp bnQoKQogICAgICAgICAsIG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRoKCkKLSAgICAgICAgLCBt X2xpbmUuaXNWaXN1YWxseUVtcHR5KCkKKyAgICAgICAgLCBtX2xpbmUuaXNDb25zaWRlcmVkRW1w dHkoKQogICAgICAgICAsIGlzTGFzdExpbmUKICAgICAgICAgLCBtX2xpbmUucnVucygpfTsKIH0K QEAgLTM2MCw3ICszNjAsNyBAQCBMaW5lQnVpbGRlcjo6SW5saW5lSXRlbVJhbmdlIExpbmVCdWls ZGVyOjpjbG9zZShjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIG5lZWRzTGF5bwogICAgIGlmIChydW5z RXhwYW5kSG9yaXpvbnRhbGx5KQogICAgICAgICBtX2xpbmUuYXBwbHlSdW5FeHBhbnNpb24oKTsK ICAgICBhdXRvIGxpbmVFbmRzV2l0aEh5cGhlbiA9IGZhbHNlOwotICAgIGlmICghbV9saW5lLmlz VmlzdWFsbHlFbXB0eSgpKSB7CisgICAgaWYgKCFtX2xpbmUuaXNDb25zaWRlcmVkRW1wdHkoKSkg ewogICAgICAgICBBU1NFUlQoIW1fbGluZS5ydW5zKCkuaXNFbXB0eSgpKTsKICAgICAgICAgYXV0 byYgbGFzdFRleHRDb250ZW50ID0gbV9saW5lLnJ1bnMoKS5sYXN0KCkudGV4dENvbnRlbnQoKTsK ICAgICAgICAgbGluZUVuZHNXaXRoSHlwaGVuID0gbGFzdFRleHRDb250ZW50ICYmIGxhc3RUZXh0 Q29udGVudC0+bmVlZHNIeXBoZW4oKTsKQEAgLTU5Nyw3ICs1OTcsNyBAQCBMaW5lQnVpbGRlcjo6 UmVzdWx0IExpbmVCdWlsZGVyOjpoYW5kbGVGbG9hdHNBbmRJbmxpbmVDb250ZW50KElubGluZUNv bnRlbnRCcmVhawogICAgIGF1dG8mIGZsb2F0Q29udGVudCA9IGxpbmVDYW5kaWRhdGUuZmxvYXRD b250ZW50OwogICAgIC8vIENoZWNrIGlmIHRoaXMgbmV3IGNvbnRlbnQgZml0cy4KICAgICBhdXRv IGF2YWlsYWJsZVdpZHRoID0gbV9saW5lLmF2YWlsYWJsZVdpZHRoKCkgLSBmbG9hdENvbnRlbnQu aW50cnVzaXZlV2lkdGgoKTsKLSAgICBhdXRvIGlzTGluZUNvbnNpZGVyZWRFbXB0eSA9IG1fbGlu ZS5pc1Zpc3VhbGx5RW1wdHkoKSAmJiAhbV9jb250ZW50SXNDb25zdHJhaW5lZEJ5RmxvYXQ7Cisg ICAgYXV0byBpc0xpbmVDb25zaWRlcmVkRW1wdHkgPSBtX2xpbmUuaXNDb25zaWRlcmVkRW1wdHko KSAmJiAhbV9jb250ZW50SXNDb25zdHJhaW5lZEJ5RmxvYXQ7CiAgICAgYXV0byBsaW5lU3RhdHVz ID0gSW5saW5lQ29udGVudEJyZWFrZXI6OkxpbmVTdGF0dXMgeyBhdmFpbGFibGVXaWR0aCwgbV9s aW5lLnRyaW1tYWJsZVRyYWlsaW5nV2lkdGgoKSwgbV9saW5lLnRyYWlsaW5nU29mdEh5cGhlbldp ZHRoKCksIG1fbGluZS5pc1RyYWlsaW5nUnVuRnVsbHlUcmltbWFibGUoKSwgaXNMaW5lQ29uc2lk ZXJlZEVtcHR5IH07CiAgICAgYXV0byByZXN1bHQgPSBpbmxpbmVDb250ZW50QnJlYWtlci5wcm9j ZXNzSW5saW5lQ29udGVudChjb250aW51b3VzSW5saW5lQ29udGVudCwgbGluZVN0YXR1cyk7CiAg ICAgaWYgKHJlc3VsdC5sYXN0V3JhcE9wcG9ydHVuaXR5SXRlbSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5o CmluZGV4IDU4MDAxYmY4ZTQyMjVlOTYyZmJiNzdjZTBjZmY1MzllMGM3ODEwOTMuLjE0MTMwYmUx ODU3ZmNlMzgxYjc4ZWQ0ZjVmNGQxMGExNjMxMjA5ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuaApA QCAtNjAsNyArNjAsNyBAQCBwdWJsaWM6CiAgICAgICAgIElubGluZUxheW91dFBvaW50IGxvZ2lj YWxUb3BMZWZ0OwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxpbmVMb2dpY2FsV2lkdGg7CiAg ICAgICAgIElubGluZUxheW91dFVuaXQgbGluZUNvbnRlbnRMb2dpY2FsV2lkdGg7Ci0gICAgICAg IGJvb2wgaXNMaW5lVmlzdWFsbHlFbXB0eSB7IHRydWUgfTsKKyAgICAgICAgYm9vbCBpc0xpbmVD b25zaWRlcmVkRW1wdHkgeyB0cnVlIH07CiAgICAgICAgIGJvb2wgaXNMYXN0TGluZVdpdGhJbmxp bmVDb250ZW50IHsgdHJ1ZSB9OwogICAgICAgICBjb25zdCBMaW5lOjpSdW5MaXN0JiBydW5zOwog ICAgIH07Cg==