201408 2019-09-02 16:22:57 -0700 [LFC] FloatingState should not need to query for display boxes. 2019-09-03 12:53:54 -0700 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 1567245 0 zalan 2019-09-02 16:22:57 -0700 ssia 1567246 1 webkit-bug-importer 2019-09-02 16:23:20 -0700 <rdar://problem/54958348> 1567247 2 377864 zalan 2019-09-02 16:28:54 -0700 Created attachment 377864 Patch 1567476 3 zalan 2019-09-03 12:53:54 -0700 Committed r249439: <https://trac.webkit.org/changeset/249439> 377864 2019-09-02 16:28:54 -0700 2019-09-03 10:15:12 -0700 Patch bug-201408-20190902162844.patch text/plain 11258 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5MzU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2Y0M2RjYjllNTljYzM0 ZDU5YmZmMmQ1NjM4YTdhMTk4M2JmNjI2MS4uOTUzZjdjNGY4NThmNjVhMzA5ZDRhODQ5NmNkNWM0 NTNiZWI1NDAwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE5LTA5LTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gRmxvYXRpbmdTdGF0 ZSBzaG91bGQgbm90IG5lZWQgdG8gcXVlcnkgZm9yIGRpc3BsYXkgYm94ZXMuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE0MDgKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzU0OTU4MzQ4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIHRyYW5zaXRpb25pbmcg dGhlIGZsb2F0aW5nIGNvZGViYXNlIHRvIHVzZSB0aGUgZm9ybWF0dGluZyBjb250ZXh0IGZvcgor ICAgICAgICByZXRyaWV2aW5nIGRpc3BsYXkgYm94ZXMuCisgICAgICAgIEZsb2F0aW5nQ29udGV4 dCBzaG91bGQgYmUgcmVzcG9uc2libGUgZm9yIGFkZGluZy9yZW1vdmluZyB0aGUgbmV3L2V4aXN0 aW5nIGZsb2F0IGJveGVzIHRvIHRoZSBzdGF0ZS4KKworICAgICAgICAqIGxheW91dC9ibG9ja2Zv cm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dEZvcm1hdHRpbmdDb250ZXh0Um9v dCk6CisgICAgICAgICogbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpGbG9hdGluZ0NvbnRleHQ6OmFwcGVuZCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXlvdXQ6OkZsb2F0aW5nQ29udGV4dDo6cmVtb3ZlKToKKyAgICAgICAgKiBsYXlv dXQvZmxvYXRzL0Zsb2F0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91dC9mbG9hdHMvRmxv YXRpbmdTdGF0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZsb2F0aW5nU3RhdGU6 OmFwcGVuZCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OmJlbG9uZ3NUb1RoaXNGbG9hdGlu Z0NvbnRleHQpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9mbG9hdHMvRmxvYXRpbmdTdGF0 ZS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGbG9hdGluZ1N0YXRlOjpGbG9hdEl0ZW06 Omhvcml6b250YWxNYXJnaW4gY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpJbmxpbmVMYXlvdXQ6OmNyZWF0 ZURpc3BsYXlSdW5zIGNvbnN0KToKKwogMjAxOS0wOS0wMiAgWmFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0Zsb2F0c10gRG8gbm90IHBhc3MgRmxvYXRpbmdT dGF0ZSB0byBGbG9hdEl0ZW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9j a2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGYw YjkwYmZmZDVlZDU3NGM5Nzg2ZjNkZDBkYTFhNDFmYTc2OTgyNjEuLmJmNGY2NGMyOWFjZDIyY2Jh ZjY1ZjIyMTViOGU4OTFjMmFhYzAzMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNw cApAQCAtMTgwLDcgKzE4MCw3IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0 Rm9ybWF0dGluZ0NvbnRleHRSb290KEZsb2F0aW5nQ29udGV4dCYgZmxvYXRpCiAgICAgLy8gRmxv YXQgcmVsYXRlZCBmaW5hbCBwb3NpdGlvbmluZy4KICAgICBpZiAobGF5b3V0Qm94LmlzRmxvYXRp bmdQb3NpdGlvbmVkKCkpIHsKICAgICAgICAgY29tcHV0ZUZsb2F0aW5nUG9zaXRpb24oZmxvYXRp bmdDb250ZXh0LCBsYXlvdXRCb3gpOwotICAgICAgICBmbG9hdGluZ0NvbnRleHQuZmxvYXRpbmdT dGF0ZSgpLmFwcGVuZChsYXlvdXRCb3gpOworICAgICAgICBmbG9hdGluZ0NvbnRleHQuYXBwZW5k KGxheW91dEJveCk7CiAgICAgfSBlbHNlIGlmIChsYXlvdXRCb3guZXN0YWJsaXNoZXNCbG9ja0Zv cm1hdHRpbmdDb250ZXh0KCkpCiAgICAgICAgIGNvbXB1dGVQb3NpdGlvblRvQXZvaWRGbG9hdHMo ZmxvYXRpbmdDb250ZXh0LCBsYXlvdXRCb3gpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuY3BwCmluZGV4IGFhNzEwYWM3MmU3NjUzYWFmOTgw NGM1ZmM3ZGEzMGYxOTYyNDIxOWMuLmU5ZWNmMDQ5ZmU4NGM1Y2Y2NWNlZTY0MWY2ODRiM2JmOWU5 Mjc3MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRpbmdD b250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0aW5nQ29u dGV4dC5jcHAKQEAgLTM0MSw2ICszNDEsMTYgQEAgRmxvYXRpbmdDb250ZXh0OjpDb25zdHJhaW50 cyBGbG9hdGluZ0NvbnRleHQ6OmNvbnN0cmFpbnRzKFBvc2l0aW9uSW5Db250ZXh0Um9vdAogICAg IHJldHVybiBjb25zdHJhaW50czsKIH0KIAordm9pZCBGbG9hdGluZ0NvbnRleHQ6OmFwcGVuZChj b25zdCBCb3gmIGZsb2F0Qm94KQoreworICAgIGZsb2F0aW5nU3RhdGUoKS5hcHBlbmQoRmxvYXRp bmdTdGF0ZTo6RmxvYXRJdGVtIHsgZmxvYXRCb3gsIEZvcm1hdHRpbmdDb250ZXh0OjptYXBCb3hU b0FuY2VzdG9yKGxheW91dFN0YXRlKCksIGZsb2F0Qm94LCBkb3duY2FzdDxDb250YWluZXI+KGZs b2F0aW5nU3RhdGUoKS5yb290KCkpKSB9KTsKK30KKwordm9pZCBGbG9hdGluZ0NvbnRleHQ6OnJl bW92ZShjb25zdCBCb3gmIGZsb2F0Qm94KQoreworICAgIGZsb2F0aW5nU3RhdGUoKS5yZW1vdmUo ZmxvYXRCb3gpOworfQorCiBzdGF0aWMgRmxvYXRQYWlyOjpMZWZ0UmlnaHRJbmRleCBmaW5kQXZh aWxhYmxlUG9zaXRpb24oRmxvYXRBdm9pZGVyJiBmbG9hdEF2b2lkZXIsIGNvbnN0IEZsb2F0aW5n U3RhdGU6OkZsb2F0TGlzdCYgZmxvYXRzKQogewogICAgIE9wdGlvbmFsPFBvc2l0aW9uSW5Db250 ZXh0Um9vdD4gYm90dG9tTW9zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m bG9hdHMvRmxvYXRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zs b2F0aW5nQ29udGV4dC5oCmluZGV4IDg5OTNhMGE3MDFjNmZjMGQwMTU4YmUwNmU3YWU1YjIyYWUw NTk1MDguLjlmMzQxYWUzOTFmM2ZiNzJhYjA3ZjZjNTQ0MGNiNGEyZDc1ZDZiZjYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRpbmdDb250ZXh0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ0NvbnRleHQuaApAQCAtNjYsNiAr NjYsOCBAQCBwdWJsaWM6CiAgICAgICAgIE9wdGlvbmFsPFBvaW50SW5Db250ZXh0Um9vdD4gcmln aHQ7CiAgICAgfTsKICAgICBDb25zdHJhaW50cyBjb25zdHJhaW50cyhQb3NpdGlvbkluQ29udGV4 dFJvb3QgdmVydGljYWxQb3NpdGlvbikgY29uc3Q7CisgICAgdm9pZCBhcHBlbmQoY29uc3QgQm94 Jik7CisgICAgdm9pZCByZW1vdmUoY29uc3QgQm94Jik7CiAKIHByaXZhdGU6CiAgICAgTGF5b3V0 U3RhdGUmIGxheW91dFN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9mbG9hdGluZ1N0YXRlLmxheW91 dFN0YXRlKCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxv YXRpbmdTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZmxvYXRzL0Zsb2F0aW5nU3Rh dGUuY3BwCmluZGV4IDFhMDJmOWFlMTg0ZmFhODA0OTM0NjQ2YzZmMDFlN2FhYzZmNGU2YmQuLmFj NGZjNGZkZjc1NjNhYmM1MzU4NDY5NmNkNmIwNmZmOTc4ZmNhZjEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRpbmdTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ1N0YXRlLmNwcApAQCAtNTEsMjEgKzUxLDYgQEAg RmxvYXRpbmdTdGF0ZTo6RmxvYXRpbmdTdGF0ZShMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGNv bnN0IEJveCYgZm9ybWF0dGluZ0NvbnQKIHsKIH0KIAotI2lmbmRlZiBOREVCVUcKLXN0YXRpYyBi b29sIGJlbG9uZ3NUb1RoaXNGbG9hdGluZ0NvbnRleHQoY29uc3QgQm94JiBsYXlvdXRCb3gsIGNv bnN0IEJveCYgZmxvYXRpbmdTdGF0ZVJvb3QpCi17Ci0gICAgYXV0byYgZm9ybWF0dGluZ0NvbnRl eHRSb290ID0gbGF5b3V0Qm94LmZvcm1hdHRpbmdDb250ZXh0Um9vdCgpOwotICAgIGlmICgmZm9y bWF0dGluZ0NvbnRleHRSb290ID09ICZmbG9hdGluZ1N0YXRlUm9vdCkKLSAgICAgICAgcmV0dXJu IHRydWU7Ci0KLSAgICAvLyBNYXliZSB0aGUgbGF5b3V0IGJveCBiZWxvbmdzIHRvIGFuIGlubGlu ZSBmb3JtYXR0aW5nIGNvbnRleHQgdGhhdCBpbmhlcml0cyB0aGUgZmxvYXRpbmcgc3RhdGUgZnJv bSB0aGUgcGFyZW50IChibG9jaykgZm9ybWF0dGluZyBjb250ZXh0LiAKLSAgICBpZiAoIWZvcm1h dHRpbmdDb250ZXh0Um9vdC5lc3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkpCi0g ICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIHJldHVybiAmZm9ybWF0dGluZ0NvbnRleHRSb290 LmZvcm1hdHRpbmdDb250ZXh0Um9vdCgpID09ICZmbG9hdGluZ1N0YXRlUm9vdDsKLX0KLSNlbmRp ZgotCiB2b2lkIEZsb2F0aW5nU3RhdGU6OnJlbW92ZShjb25zdCBCb3gmIGxheW91dEJveCkKIHsK ICAgICBmb3IgKHNpemVfdCBpbmRleCA9IDA7IGluZGV4IDwgbV9mbG9hdHMuc2l6ZSgpOyArK2lu ZGV4KSB7CkBAIC03NywzNiArNjIsMzMgQEAgdm9pZCBGbG9hdGluZ1N0YXRlOjpyZW1vdmUoY29u c3QgQm94JiBsYXlvdXRCb3gpCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiB9CiAKLXZvaWQg RmxvYXRpbmdTdGF0ZTo6YXBwZW5kKGNvbnN0IEJveCYgbGF5b3V0Qm94KQordm9pZCBGbG9hdGlu Z1N0YXRlOjphcHBlbmQoRmxvYXRJdGVtIGZsb2F0SXRlbSkKIHsKICAgICBBU1NFUlQoaXM8Q29u dGFpbmVyPigqbV9mb3JtYXR0aW5nQ29udGV4dFJvb3QpKTsKLSAgICBBU1NFUlQoYmVsb25nc1Rv VGhpc0Zsb2F0aW5nQ29udGV4dChsYXlvdXRCb3gsICptX2Zvcm1hdHRpbmdDb250ZXh0Um9vdCkp OwotICAgIEFTU0VSVChpczxDb250YWluZXI+KCptX2Zvcm1hdHRpbmdDb250ZXh0Um9vdCkpOwog Ci0gICAgYXV0byBuZXdGbG9hdEl0ZW0gPSBGbG9hdEl0ZW0geyBsYXlvdXRCb3gsIEZvcm1hdHRp bmdDb250ZXh0OjptYXBCb3hUb0FuY2VzdG9yKGxheW91dFN0YXRlKCksIGxheW91dEJveCwgZG93 bmNhc3Q8Q29udGFpbmVyPihyb290KCkpKX07CiAgICAgaWYgKG1fZmxvYXRzLmlzRW1wdHkoKSkK LSAgICAgICAgcmV0dXJuIG1fZmxvYXRzLmFwcGVuZChuZXdGbG9hdEl0ZW0pOworICAgICAgICBy ZXR1cm4gbV9mbG9hdHMuYXBwZW5kKGZsb2F0SXRlbSk7CiAKLSAgICBhdXRvJiBkaXNwbGF5Qm94 ID0gbV9sYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7Ci0gICAg YXV0byBpc0xlZnRQb3NpdGlvbmVkID0gbGF5b3V0Qm94LmlzTGVmdEZsb2F0aW5nUG9zaXRpb25l ZCgpOworICAgIGF1dG8gaXNMZWZ0UG9zaXRpb25lZCA9IGZsb2F0SXRlbS5pc0xlZnRQb3NpdGlv bmVkKCk7CiAgICAgLy8gV2hlbiBhZGRpbmcgYSBuZXcgZmxvYXQgaXRlbSB0byB0aGUgbGlzdCwg d2UgaGF2ZSB0byBlbnN1cmUgdGhhdCBpdCBpcyBkZWZpbml0ZWx5IHRoZSBsZWZ0KHJpZ2h0KS1t b3N0IGl0ZW0uCiAgICAgLy8gTm9ybWFsbHkgaXQgaXMsIGJ1dCBuZWdhdGl2ZSBob3Jpem9udGFs IG1hcmdpbnMgY2FuIHB1c2ggdGhlIGZsb2F0IGJveCBiZXlvbmQgYW5vdGhlciBmbG9hdCBib3gu CiAgICAgLy8gRmxvYXQgaXRlbXMgaW4gbV9mbG9hdHMgbGlzdCBzaG91bGQgc3RheSBpbiBob3Jp em9udGFsIHBvc2l0aW9uIG9yZGVyIChsZWZ0L3JpZ2h0IGVkZ2UpIG9uIHRoZSBzYW1lIHZlcnRp Y2FsIHBvc2l0aW9uLgotICAgIGF1dG8gaGFzTmVnYXRpdmVIb3Jpem9udGFsTWFyZ2luID0gKGlz TGVmdFBvc2l0aW9uZWQgJiYgZGlzcGxheUJveC5tYXJnaW5TdGFydCgpIDwgMCkgfHwgKCFpc0xl ZnRQb3NpdGlvbmVkICYmIGRpc3BsYXlCb3gubWFyZ2luRW5kKCkgPCAwKTsKKyAgICBhdXRvIGhv cml6b250YWxNYXJnaW4gPSBmbG9hdEl0ZW0uaG9yaXpvbnRhbE1hcmdpbigpOworICAgIGF1dG8g aGFzTmVnYXRpdmVIb3Jpem9udGFsTWFyZ2luID0gKGlzTGVmdFBvc2l0aW9uZWQgJiYgaG9yaXpv bnRhbE1hcmdpbi5zdGFydCA8IDApIHx8ICghaXNMZWZ0UG9zaXRpb25lZCAmJiBob3Jpem9udGFs TWFyZ2luLmVuZCA8IDApOwogICAgIGlmICghaGFzTmVnYXRpdmVIb3Jpem9udGFsTWFyZ2luKQot ICAgICAgICByZXR1cm4gbV9mbG9hdHMuYXBwZW5kKG5ld0Zsb2F0SXRlbSk7CisgICAgICAgIHJl dHVybiBtX2Zsb2F0cy5hcHBlbmQoZmxvYXRJdGVtKTsKIAogICAgIGZvciAoaW50IGkgPSBtX2Zs b2F0cy5zaXplKCkgLSAxOyBpID49IDA7IC0taSkgewogICAgICAgICBhdXRvJiBmbG9hdEl0ZW0g PSBtX2Zsb2F0c1tpXTsKICAgICAgICAgaWYgKGlzTGVmdFBvc2l0aW9uZWQgIT0gZmxvYXRJdGVt LmlzTGVmdFBvc2l0aW9uZWQoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBpZiAo bmV3RmxvYXRJdGVtLnJlY3RXaXRoTWFyZ2luKCkudG9wKCkgPCBmbG9hdEl0ZW0ucmVjdFdpdGhN YXJnaW4oKS5ib3R0b20oKSkKKyAgICAgICAgaWYgKGZsb2F0SXRlbS5yZWN0V2l0aE1hcmdpbigp LnRvcCgpIDwgZmxvYXRJdGVtLnJlY3RXaXRoTWFyZ2luKCkuYm90dG9tKCkpCiAgICAgICAgICAg ICBjb250aW51ZTsKLSAgICAgICAgaWYgKChpc0xlZnRQb3NpdGlvbmVkICYmIG5ld0Zsb2F0SXRl bS5yZWN0V2l0aE1hcmdpbigpLnJpZ2h0KCkgPj0gZmxvYXRJdGVtLnJlY3RXaXRoTWFyZ2luKCku cmlnaHQoKSkKLSAgICAgICAgICAgIHx8ICghaXNMZWZ0UG9zaXRpb25lZCAmJiBuZXdGbG9hdEl0 ZW0ucmVjdFdpdGhNYXJnaW4oKS5sZWZ0KCkgPD0gZmxvYXRJdGVtLnJlY3RXaXRoTWFyZ2luKCku bGVmdCgpKSkKLSAgICAgICAgICAgIHJldHVybiBtX2Zsb2F0cy5pbnNlcnQoaSArIDEsIG5ld0Zs b2F0SXRlbSk7CisgICAgICAgIGlmICgoaXNMZWZ0UG9zaXRpb25lZCAmJiBmbG9hdEl0ZW0ucmVj dFdpdGhNYXJnaW4oKS5yaWdodCgpID49IGZsb2F0SXRlbS5yZWN0V2l0aE1hcmdpbigpLnJpZ2h0 KCkpCisgICAgICAgICAgICB8fCAoIWlzTGVmdFBvc2l0aW9uZWQgJiYgZmxvYXRJdGVtLnJlY3RX aXRoTWFyZ2luKCkubGVmdCgpIDw9IGZsb2F0SXRlbS5yZWN0V2l0aE1hcmdpbigpLmxlZnQoKSkp CisgICAgICAgICAgICByZXR1cm4gbV9mbG9hdHMuaW5zZXJ0KGkgKyAxLCBmbG9hdEl0ZW0pOwog ICAgIH0KLSAgICByZXR1cm4gbV9mbG9hdHMuaW5zZXJ0KDAsIG5ld0Zsb2F0SXRlbSk7CisgICAg cmV0dXJuIG1fZmxvYXRzLmluc2VydCgwLCBmbG9hdEl0ZW0pOwogfQogCiBPcHRpb25hbDxQb3Np dGlvbkluQ29udGV4dFJvb3Q+IEZsb2F0aW5nU3RhdGU6OmJvdHRvbShjb25zdCBCb3gmIGZvcm1h dHRpbmdDb250ZXh0Um9vdCwgQ2xlYXIgdHlwZSkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mbG9hdHMvRmxvYXRpbmdTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zsb2F0cy9GbG9hdGluZ1N0YXRlLmgKaW5kZXggZDM0ZWM2MDBlOTliOTIwNjgzZTg0MWVk NWNhYTU1MGJmMGE4MjVlYS4uMDQ1Y2Q3NzViNGY3NDRiOWViMWVjY2JjYjNkNTZlZTU4MTNiY2I0 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ1N0YXRl LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zsb2F0cy9GbG9hdGluZ1N0YXRlLmgKQEAg LTM4LDYgKzM4LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBuYW1lc3BhY2UgTGF5b3V0IHsK IAorY2xhc3MgRmxvYXRpbmdDb250ZXh0OwogY2xhc3MgRm9ybWF0dGluZ1N0YXRlOwogY2xhc3Mg TGF5b3V0U3RhdGU7CiAKQEAgLTQ3LDkgKzQ4LDYgQEAgY2xhc3MgRmxvYXRpbmdTdGF0ZSA6IHB1 YmxpYyBSZWZDb3VudGVkPEZsb2F0aW5nU3RhdGU+IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUmVm PEZsb2F0aW5nU3RhdGU+IGNyZWF0ZShMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGNvbnN0IEJv eCYgZm9ybWF0dGluZ0NvbnRleHRSb290KSB7IHJldHVybiBhZG9wdFJlZigqbmV3IEZsb2F0aW5n U3RhdGUobGF5b3V0U3RhdGUsIGZvcm1hdHRpbmdDb250ZXh0Um9vdCkpOyB9CiAKLSAgICB2b2lk IGFwcGVuZChjb25zdCBCb3gmIGxheW91dEJveCk7Ci0gICAgdm9pZCByZW1vdmUoY29uc3QgQm94 JiBsYXlvdXRCb3gpOwotCiAgICAgY29uc3QgQm94JiByb290KCkgY29uc3QgeyByZXR1cm4gKm1f Zm9ybWF0dGluZ0NvbnRleHRSb290OyB9CiAKICAgICBPcHRpb25hbDxQb3NpdGlvbkluQ29udGV4 dFJvb3Q+IHRvcChjb25zdCBCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCkgY29uc3Q7CkBAIC02 Nyw2ICs2NSw3IEBAIHB1YmxpYzoKICAgICAgICAgYm9vbCBpc0Rlc2NlbmRhbnRPZkZvcm1hdHRp bmdSb290KGNvbnN0IEJveCYpIGNvbnN0OwogCiAgICAgICAgIERpc3BsYXk6OlJlY3QgcmVjdFdp dGhNYXJnaW4oKSBjb25zdCB7IHJldHVybiBtX2Fic29sdXRlRGlzcGxheUJveC5yZWN0V2l0aE1h cmdpbigpOyB9CisgICAgICAgIFVzZWRIb3Jpem9udGFsTWFyZ2luIGhvcml6b250YWxNYXJnaW4o KSBjb25zdCB7IHJldHVybiBtX2Fic29sdXRlRGlzcGxheUJveC5ob3Jpem9udGFsTWFyZ2luKCk7 IH0KICAgICAgICAgUG9zaXRpb25JbkNvbnRleHRSb290IGJvdHRvbSgpIGNvbnN0IHsgcmV0dXJu IHsgbV9hYnNvbHV0ZURpc3BsYXlCb3guYm90dG9tKCkgfTsgfQogCiAgICAgcHJpdmF0ZToKQEAg LTgxLDYgKzgwLDkgQEAgcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgRmxvYXRpbmdDb250ZXh0 OwogICAgIEZsb2F0aW5nU3RhdGUoTGF5b3V0U3RhdGUmLCBjb25zdCBCb3gmIGZvcm1hdHRpbmdD b250ZXh0Um9vdCk7CiAKKyAgICB2b2lkIGFwcGVuZChGbG9hdEl0ZW0pOworICAgIHZvaWQgcmVt b3ZlKGNvbnN0IEJveCYgbGF5b3V0Qm94KTsKKwogICAgIExheW91dFN0YXRlJiBsYXlvdXRTdGF0 ZSgpIGNvbnN0IHsgcmV0dXJuIG1fbGF5b3V0U3RhdGU7IH0KIAogICAgIE9wdGlvbmFsPFBvc2l0 aW9uSW5Db250ZXh0Um9vdD4gYm90dG9tKGNvbnN0IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290 LCBDbGVhcikgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRM aW5lTGF5b3V0LmNwcAppbmRleCAzZmU1OGZmMDE3MmY1MzI5YzlmOTE5ZmJmYmJhNzEyMDFkY2Jj Y2JhLi5mYWI4YzhkZDIyYzM3NDRkMzczYTI1Mjg3MTliYThhNjViOTAyZWJhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5n Q29udGV4dExpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dC5jcHAKQEAgLTM2NCw4 ICszNjQsNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpJbmxpbmVMYXlvdXQ6OmNy ZWF0ZURpc3BsYXlSdW5zKGNvbnN0IExpbmU6OkNvbnRlbgogICAgIGF1dG8mIGxheW91dFN0YXRl ID0gdGhpcy0+bGF5b3V0U3RhdGUoKTsKICAgICBhdXRvJiBmb3JtYXR0aW5nQ29udGV4dCA9IHRo aXMtPmZvcm1hdHRpbmdDb250ZXh0KCk7CiAgICAgYXV0byYgZm9ybWF0dGluZ1N0YXRlID0gZG93 bmNhc3Q8SW5saW5lRm9ybWF0dGluZ1N0YXRlPihsYXlvdXRTdGF0ZS5lc3RhYmxpc2hlZEZvcm1h dHRpbmdTdGF0ZShmb3JtYXR0aW5nUm9vdCgpKSk7Ci0gICAgYXV0byYgZmxvYXRpbmdTdGF0ZSA9 IGZvcm1hdHRpbmdTdGF0ZS5mbG9hdGluZ1N0YXRlKCk7Ci0gICAgYXV0byBmbG9hdGluZ0NvbnRl eHQgPSBGbG9hdGluZ0NvbnRleHQgeyBmb3JtYXR0aW5nUm9vdCgpLCBmbG9hdGluZ1N0YXRlIH07 CisgICAgYXV0byBmbG9hdGluZ0NvbnRleHQgPSBGbG9hdGluZ0NvbnRleHQgeyBmb3JtYXR0aW5n Um9vdCgpLCBmb3JtYXR0aW5nU3RhdGUuZmxvYXRpbmdTdGF0ZSgpIH07CiAKICAgICAvLyBNb3Zl IGZsb2F0cyB0byB0aGVpciBmaW5hbCBwb3NpdGlvbi4KICAgICBmb3IgKGF1dG8gZmxvYXRJdGVt IDogZmxvYXRzKSB7CkBAIC0zNzYsNyArMzc1LDcgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dDo6SW5saW5lTGF5b3V0OjpjcmVhdGVEaXNwbGF5UnVucyhjb25zdCBMaW5lOjpDb250ZW4K ICAgICAgICAgZGlzcGxheUJveC5zZXRUb3BMZWZ0KHsgbGluZUNvbnRlbnQubG9naWNhbExlZnQo KSwgbGluZUNvbnRlbnQubG9naWNhbFRvcCgpIH0pOwogICAgICAgICAvLyBGbG9hdCBpdC4KICAg ICAgICAgZGlzcGxheUJveC5zZXRUb3BMZWZ0KGZsb2F0aW5nQ29udGV4dC5wb3NpdGlvbkZvckZs b2F0KGZsb2F0Qm94KSk7Ci0gICAgICAgIGZsb2F0aW5nU3RhdGUuYXBwZW5kKGZsb2F0Qm94KTsK KyAgICAgICAgZmxvYXRpbmdDb250ZXh0LmFwcGVuZChmbG9hdEJveCk7CiAgICAgfQogCiAgICAg aWYgKGxpbmVDb250ZW50LmlzRW1wdHkoKSkgewo=