186052 2018-05-29 07:35:06 -0700 [LFC] Miscellaneous fixes to ensure no assertion in LayoutContext::layout 2018-05-29 08:20:56 -0700 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 sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1428067 0 zalan 2018-05-29 07:35:06 -0700 while running <html><body><div></div></body></html> 1428068 1 341488 zalan 2018-05-29 07:50:08 -0700 Created attachment 341488 Patch 1428070 2 341488 commit-queue 2018-05-29 08:19:55 -0700 Comment on attachment 341488 Patch Clearing flags on attachment: 341488 Committed r232257: <https://trac.webkit.org/changeset/232257> 1428071 3 commit-queue 2018-05-29 08:19:57 -0700 All reviewed patches have been landed. Closing bug. 1428072 4 webkit-bug-importer 2018-05-29 08:20:56 -0700 <rdar://problem/40615570> 341488 2018-05-29 07:50:08 -0700 2018-05-29 08:19:55 -0700 Patch bug-186052-20180529075007.patch text/plain 12323 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMjUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzA5N2UxMjc4MzAzNTlj N2JhMTc2ZjNmYmMyYThlZDUxODVlMDAwNi4uZDQyNGMyYzc0YzM4Y2FhYWY0MTYzNTcxZGQ2NDNk NDg0MTRiZDhlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE4LTA1LTI5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gTWlzY2VsbGFuZW91 cyBmaXhlcyB0byBlbnN1cmUgbm8gYXNzZXJ0aW9uIGluIExheW91dENvbnRleHQ6OmxheW91dAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg2MDUyCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2l0aCB0aGlz IHBhdGNoLCBMYXlvdXRDb250ZXh0OjpsYXlvdXQoKSBkb2VzIG5vdCBhc3NlcnQgb24gPGh0bWw+ PGJvZHk+PGRpdj48L2Rpdj48L2JvZHk+PC9odG1sPiBhbnltb3JlLgorCisgICAgICAgICogbGF5 b3V0L0xheW91dENvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMYXlvdXRD b250ZXh0Ojppbml0aWFsaXplUm9vdCk6IE5ldyBjb250ZXh0IHJvb3QgaXMgYWx3YXlzIGEgbGF5 b3V0IHJvb3QuCisgICAgICAgICogbGF5b3V0L0xheW91dENvbnRleHQuaDoKKyAgICAgICAgKiBs YXlvdXQvVmVyaWZpY2F0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6b3V0cHV0 TWlzbWF0Y2hpbmdCb3hJbmZvcm1hdGlvbklmTmVlZGVkKToKKyAgICAgICAgKiBsYXlvdXQvYmxv Y2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpsYXlvdXQgY29uc3QpOiB3ZSBuZWVk IGNvbXB1dGVkIG1hcmdpbi9ib3JkZXIvcGFkZGluZyBmb3Igd2lkdGggY29tcHV0YXRpb24gIAor ICAgICAgICAqIGxheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmNwcDogQWRkIGNsb25lKCkg bWV0aG9kIHRvIGJlIGFibGUgdG8gY2Fycnkgb3ZlciB0aGUgJ2hhc1ZhbGlkKicgYml0cy4KKyAg ICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6U3R5bGU6OlN0eWxlKToKKyAgICAgICAgKFdl YkNvcmU6OkRpc3BsYXk6OkJveDo6Ym9yZGVyQm94IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkRpc3BsYXk6OkJveDo6Y29udGVudEJveCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Rpc3Bs YXl0cmVlL0Rpc3BsYXlCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6UmVj dDo6b3BlcmF0b3IgTGF5b3V0UmVjdCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5 OjpCb3g6OnNldFNpemUpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6Qm94OjpzZXRIYXNW YWxpZE1hcmdpbik6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpCb3g6OnNldEhhc1ZhbGlk Qm9yZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6c2V0SGFzVmFsaWRQYWRk aW5nKToKKyAgICAgICAgKFdlYkNvcmU6OkRpc3BsYXk6OkJveDo6UmVjdDo6c2V0SGFzVmFsaWRQ b3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpCb3g6OlJlY3Q6OnNldEhhc1Zh bGlkU2l6ZSk6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpCb3g6OlJlY3Q6OnNldFNpemUp OgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6Qm94OjpSZWN0OjpjbG9uZSBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpCb3g6OnNldE1hcmdpbik6CisgICAgICAgIChXZWJD b3JlOjpEaXNwbGF5OjpCb3g6OnNldEJvcmRlcik6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5 OjpCb3g6OnNldFBhZGRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6Qm94OjpSZWN0 OjpSZWN0KTogRGVsZXRlZC4KKwogMjAxOC0wNS0yOCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dENvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L0xheW91dENvbnRleHQuY3BwCmluZGV4IDIwMmI4ZTRjZmFjY2Q4MjRhYzExNGYyN2I2ZTEw YzZhNjVhZDJhY2UuLjhmMjhlN2FiOGRmNzFlODg5MTQ3NWIxMjVlNmExNzQ0NDkyYjM4NTggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRDb250ZXh0LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0Q29udGV4dC5jcHAKQEAgLTUxLDEyICs1MSwxMyBA QCBMYXlvdXRDb250ZXh0OjpMYXlvdXRDb250ZXh0KCkKIAogdm9pZCBMYXlvdXRDb250ZXh0Ojpp bml0aWFsaXplUm9vdChjb25zdCBDb250YWluZXImIHJvb3QsIGNvbnN0IExheW91dFNpemUmIGNv bnRhaW5lclNpemUpCiB7CisgICAgQVNTRVJUKHJvb3QuZXN0YWJsaXNoZXNGb3JtYXR0aW5nQ29u dGV4dCgpKTsKKwogICAgIG1fcm9vdCA9IG1ha2VXZWFrUHRyKGNvbnN0X2Nhc3Q8Q29udGFpbmVy Jj4ocm9vdCkpOwogICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBjcmVhdGVEaXNwbGF5Qm94KHJvb3Qp OwogICAgIC8vIFJvb3QgaXMgYWx3YXlzIGF0IDAgMCB3aXRoIG5vIG1hcmdpbiAKICAgICBkaXNw bGF5Qm94LnNldFRvcExlZnQoeyB9KTsKLSAgICBkaXNwbGF5Qm94LnNldFdpZHRoKGNvbnRhaW5l clNpemUud2lkdGgoKSk7Ci0gICAgZGlzcGxheUJveC5zZXRIZWlnaHQoY29udGFpbmVyU2l6ZS5o ZWlnaHQoKSk7CisgICAgZGlzcGxheUJveC5zZXRTaXplKGNvbnRhaW5lclNpemUpOwogICAgIGRp c3BsYXlCb3guc2V0TWFyZ2luKHsgfSk7CiAKICAgICBhdXRvJiBzdHlsZSA9IHJvb3Quc3R5bGUo KTsKQEAgLTY2LDE0ICs2NywxNiBAQCB2b2lkIExheW91dENvbnRleHQ6OmluaXRpYWxpemVSb290 KGNvbnN0IENvbnRhaW5lciYgcm9vdCwgY29uc3QgTGF5b3V0U2l6ZSYgY29udAogICAgICAgICBz dHlsZS5ib3JkZXJMZWZ0KCkud2lkdGgoKSwKICAgICAgICAgc3R5bGUuYm9yZGVyQm90dG9tKCku d2lkdGgoKSwKICAgICAgICAgc3R5bGUuYm9yZGVyUmlnaHQoKS53aWR0aCgpCi0KICAgICB9KTsK KwogICAgIGRpc3BsYXlCb3guc2V0UGFkZGluZyh7CiAgICAgICAgIHZhbHVlRm9yTGVuZ3RoKHN0 eWxlLnBhZGRpbmdUb3AoKSwgY29udGFpbmVyU2l6ZS53aWR0aCgpKSwKICAgICAgICAgdmFsdWVG b3JMZW5ndGgoc3R5bGUucGFkZGluZ0xlZnQoKSwgY29udGFpbmVyU2l6ZS53aWR0aCgpKSwKICAg ICAgICAgdmFsdWVGb3JMZW5ndGgoc3R5bGUucGFkZGluZ0JvdHRvbSgpLCBjb250YWluZXJTaXpl LndpZHRoKCkpLAogICAgICAgICB2YWx1ZUZvckxlbmd0aChzdHlsZS5wYWRkaW5nUmlnaHQoKSwg Y29udGFpbmVyU2l6ZS53aWR0aCgpKQogICAgIH0pOworCisgICAgbV9mb3JtYXR0aW5nQ29udGV4 dFJvb3RMaXN0Rm9yTGF5b3V0LmFkZCgmcm9vdCk7CiB9CiAKIHZvaWQgTGF5b3V0Q29udGV4dDo6 dXBkYXRlTGF5b3V0KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9MYXlvdXRD b250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvTGF5b3V0Q29udGV4dC5oCmluZGV4IDcw M2Q4M2YyZDJiODgxNzM1ZDRiMDk5Mjg5ZThiMzFiOWRhN2VhOTMuLmQwMmI2ZTU0OTY0NmUxYzI4 MTVhN2I4Y2NhZDY4YjJiZDZiZGYzY2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9MYXlvdXRDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0xheW91dENvbnRl eHQuaApAQCAtNzcsMTIgKzc3LDEyIEBAIHB1YmxpYzoKICAgICBGb3JtYXR0aW5nU3RhdGUmIGVz dGFibGlzaGVkRm9ybWF0dGluZ1N0YXRlKGNvbnN0IEJveCYgZm9ybWF0dGluZ0NvbnRleHRSb290 LCBjb25zdCBGb3JtYXR0aW5nQ29udGV4dCYpOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxGb3JtYXR0 aW5nQ29udGV4dD4gZm9ybWF0dGluZ0NvbnRleHQoY29uc3QgQm94JiBmb3JtYXR0aW5nQ29udGV4 dFJvb3QpOwogCi0gICAgLy8gRm9yIHRlc3RpbmcgcHVycG9zZXMgb25seQotICAgIHZvaWQgdmVy aWZ5QW5kT3V0cHV0TWlzbWF0Y2hpbmdMYXlvdXRUcmVlKGNvbnN0IFJlbmRlclZpZXcmKSBjb25z dDsKLQogICAgIERpc3BsYXk6OkJveCYgY3JlYXRlRGlzcGxheUJveChjb25zdCBCb3gmKTsKICAg ICBEaXNwbGF5OjpCb3gqIGRpc3BsYXlCb3hGb3JMYXlvdXRCb3goY29uc3QgQm94JiBsYXlvdXRC b3gpIGNvbnN0IHsgcmV0dXJuIG1fbGF5b3V0VG9EaXNwbGF5Qm94LmdldCgmbGF5b3V0Qm94KTsg fQogCisgICAgLy8gRm9yIHRlc3RpbmcgcHVycG9zZXMgb25seQorICAgIHZvaWQgdmVyaWZ5QW5k T3V0cHV0TWlzbWF0Y2hpbmdMYXlvdXRUcmVlKGNvbnN0IFJlbmRlclZpZXcmKSBjb25zdDsKKwog cHJpdmF0ZToKICAgICBXZWFrUHRyPENvbnRhaW5lcj4gbV9yb290OwogICAgIEhhc2hTZXQ8Y29u c3QgQ29udGFpbmVyKj4gbV9mb3JtYXR0aW5nQ29udGV4dFJvb3RMaXN0Rm9yTGF5b3V0OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L1ZlcmlmaWNhdGlvbi5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvVmVyaWZpY2F0aW9uLmNwcAppbmRleCA1ZjE2ODQxNGZkODhjOGFhODQ0 MTk0NDIxYTdlNGMxNWFhZjhhYWQzLi5hN2FmNzMxMTYzMTU3NGI4ZjQ3Nzg4Y2U5YzcxOTA2Njkx ZTUwNTQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvVmVyaWZpY2F0aW9uLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvVmVyaWZpY2F0aW9uLmNwcApAQCAtNTYsNyAr NTYsNyBAQCBzdGF0aWMgdm9pZCBvdXRwdXRNaXNtYXRjaGluZ0JveEluZm9ybWF0aW9uSWZOZWVk ZWQoVGV4dFN0cmVhbSYgc3RyZWFtLCBjb25zdCBMYQogICAgIGF1dG8qIGRpc3BsYXlCb3ggPSBj b250ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KTsKICAgICBBU1NFUlQoZGlz cGxheUJveCk7CiAKLSAgICBpZiAocmVuZGVyZXIubWFyZ2luQm94UmVjdCgpICE9IGRpc3BsYXlC b3gtPm1hcmdpbkJveCgpKQorICAgIGlmIChyZW5kZXJlci5mcmFtZVJlY3QoKSAhPSBkaXNwbGF5 Qm94LT5yZWN0KCkpCiAgICAgICAgIG91dHB1dFJlY3QoImZyYW1lQm94IiwgcmVuZGVyZXIuZnJh bWVSZWN0KCksIGRpc3BsYXlCb3gtPnJlY3QoKSk7CiAKICAgICBpZiAocmVuZGVyZXIubWFyZ2lu Qm94UmVjdCgpICE9IGRpc3BsYXlCb3gtPm1hcmdpbkJveCgpKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5n Q29udGV4dC5jcHAKaW5kZXggYmRlYTNhYjA5MjZkNTA4ZmY2YmUxNjZkNGE5OWUwNDI4YmI0N2Uz Ny4uNWMwNmE2NTQwOGEwYjBiNGYzMjU2MTI1ZjA1OTllYWMwYzAzMWYxYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC03MywxMCArNzMsMTAgQEAgdm9pZCBCbG9ja0Zvcm1h dHRpbmdDb250ZXh0OjpsYXlvdXQoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgRm9ybWF0 dGluZ1N0YXQKICAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxheW91dFBhaXIubGF5b3V0 Qm94OwogICAgICAgICAgICAgYXV0byYgZGlzcGxheUJveCA9IGxheW91dFBhaXIuZGlzcGxheUJv eDsKICAgICAgICAgICAgIAotICAgICAgICAgICAgY29tcHV0ZVdpZHRoKGxheW91dENvbnRleHQs IGxheW91dEJveCwgZGlzcGxheUJveCk7CiAgICAgICAgICAgICBjb21wdXRlTWFyZ2luKGxheW91 dENvbnRleHQsIGxheW91dEJveCwgZGlzcGxheUJveCk7CiAgICAgICAgICAgICBjb21wdXRlQm9y ZGVyQW5kUGFkZGluZyhsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gsIGRpc3BsYXlCb3gpOwogICAg ICAgICAgICAgY29tcHV0ZVN0YXRpY1Bvc2l0aW9uKGxheW91dENvbnRleHQsIGxheW91dEJveCwg ZGlzcGxheUJveCk7CisgICAgICAgICAgICBjb21wdXRlV2lkdGgobGF5b3V0Q29udGV4dCwgbGF5 b3V0Qm94LCBkaXNwbGF5Qm94KTsKICAgICAgICAgICAgIGlmIChsYXlvdXRCb3guZXN0YWJsaXNo ZXNGb3JtYXR0aW5nQ29udGV4dCgpKSB7CiAgICAgICAgICAgICAgICAgYXV0byBmb3JtYXR0aW5n Q29udGV4dCA9IGxheW91dENvbnRleHQuZm9ybWF0dGluZ0NvbnRleHQobGF5b3V0Qm94KTsKICAg ICAgICAgICAgICAgICBmb3JtYXR0aW5nQ29udGV4dC0+bGF5b3V0KGxheW91dENvbnRleHQsIGxh eW91dENvbnRleHQuZXN0YWJsaXNoZWRGb3JtYXR0aW5nU3RhdGUobGF5b3V0Qm94LCAqZm9ybWF0 dGluZ0NvbnRleHQpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5 dHJlZS9EaXNwbGF5Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9E aXNwbGF5Qm94LmNwcAppbmRleCBmNGYzNzM5MzUxMzVmNjljNTliY2JhODJlOGViY2I4MDZmNTJk OWJkLi5kN2Q1NTg0N2VmY2Q4NWJiMDE1NGY0OTZkMWEwMWI1Y2U5NzFiOTRhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guY3BwCkBAIC00OCw3 ICs0OCw2IEBAIEJveDo6fkJveCgpCiBCb3g6OlN0eWxlOjpTdHlsZShjb25zdCBSZW5kZXJTdHls ZSYgc3R5bGUpCiAgICAgOiBib3hTaXppbmcoc3R5bGUuYm94U2l6aW5nKCkpCiB7Ci0KIH0KIAog Qm94OjpSZWN0IEJveDo6bWFyZ2luQm94KCkgY29uc3QKQEAgLTY2LDE1ICs2NSwxNyBAQCBCb3g6 OlJlY3QgQm94OjptYXJnaW5Cb3goKSBjb25zdAogCiBCb3g6OlJlY3QgQm94Ojpib3JkZXJCb3go KSBjb25zdAogeworICAgIGF1dG8gcmVjdCA9IG1fcmVjdC5jbG9uZSgpOworICAgIHJlY3Quc2V0 VG9wTGVmdCh7IH0pOworCiAgICAgaWYgKG1fc3R5bGUuYm94U2l6aW5nID09IEJveFNpemluZzo6 Qm9yZGVyQm94KQotICAgICAgICByZXR1cm4gQm94OjpSZWN0KCB7IH0sIHNpemUoKSk7CisgICAg ICAgIHJldHVybiByZWN0OwogCiAgICAgLy8gV2lkdGggaXMgY29udGVudCBib3guCiAgICAgQVNT RVJUKG1faGFzVmFsaWRCb3JkZXIpOwogICAgIEFTU0VSVChtX2hhc1ZhbGlkUGFkZGluZyk7Ci0g ICAgYXV0byBib3JkZXJCb3hTaXplID0gc2l6ZSgpOwotICAgIGJvcmRlckJveFNpemUuZXhwYW5k KGJvcmRlckxlZnQoKSArIHBhZGRpbmdMZWZ0KCkgKyBwYWRkaW5nUmlnaHQoKSArIGJvcmRlclJp Z2h0KCksIGJvcmRlclRvcCgpICsgcGFkZGluZ1RvcCgpICsgcGFkZGluZ0JvdHRvbSgpICsgYm9y ZGVyQm90dG9tKCkpOwotICAgIHJldHVybiBCb3g6OlJlY3QoIHsgfSwgYm9yZGVyQm94U2l6ZSk7 CisgICAgcmVjdC5leHBhbmQoYm9yZGVyTGVmdCgpICsgcGFkZGluZ0xlZnQoKSArIHBhZGRpbmdS aWdodCgpICsgYm9yZGVyUmlnaHQoKSwgYm9yZGVyVG9wKCkgKyBwYWRkaW5nVG9wKCkgKyBwYWRk aW5nQm90dG9tKCkgKyBib3JkZXJCb3R0b20oKSk7CisgICAgcmV0dXJuIHJlY3Q7CiB9CiAKIEJv eDo6UmVjdCBCb3g6OnBhZGRpbmdCb3goKSBjb25zdApAQCAtOTIsOCArOTMsMTEgQEAgQm94OjpS ZWN0IEJveDo6cGFkZGluZ0JveCgpIGNvbnN0CiAKIEJveDo6UmVjdCBCb3g6OmNvbnRlbnRCb3go KSBjb25zdAogewotICAgIGlmIChtX3N0eWxlLmJveFNpemluZyA9PSBCb3hTaXppbmc6OkNvbnRl bnRCb3gpCi0gICAgICAgIHJldHVybiBCb3g6OlJlY3QoTGF5b3V0UG9pbnQoMCwgMCksIHNpemUo KSk7CisgICAgaWYgKG1fc3R5bGUuYm94U2l6aW5nID09IEJveFNpemluZzo6Q29udGVudEJveCkg eworICAgICAgICBhdXRvIHJlY3QgPSBtX3JlY3QuY2xvbmUoKTsKKyAgICAgICAgcmVjdC5zZXRU b3BMZWZ0KHsgfSk7CisgICAgICAgIHJldHVybiByZWN0OworICAgIH0KIAogICAgIC8vIFdpZHRo IGlzIGJvcmRlciBib3guCiAgICAgQVNTRVJUKG1faGFzVmFsaWRQYWRkaW5nKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5Qm94LmggYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheUJveC5oCmluZGV4IDZhZTU3MGFi NzBjOWRjMzUyMjYxZTU2N2QwMTFmNDE5M2QyNDgzOTMuLjhjMWUyNjFlNGMwMTk5M2E3MDJjZTIy YTljMGE1ZDU1NTg4NTBkZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNw bGF5dHJlZS9EaXNwbGF5Qm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0 cmVlL0Rpc3BsYXlCb3guaApAQCAtNTUsNyArNTUsNiBAQCBwdWJsaWM6CiAgICAgY2xhc3MgUmVj dCB7CiAgICAgcHVibGljOgogICAgICAgICBSZWN0KCkgPSBkZWZhdWx0OwotICAgICAgICBSZWN0 KGNvbnN0IExheW91dFBvaW50JiwgY29uc3QgTGF5b3V0U2l6ZSYpOwogICAgICAgICAKICAgICAg ICAgTGF5b3V0VW5pdCB0b3AoKSBjb25zdDsKICAgICAgICAgTGF5b3V0VW5pdCBsZWZ0KCkgY29u c3Q7CkBAIC03NCw2ICs3Myw3IEBAIHB1YmxpYzoKICAgICAgICAgdm9pZCBzZXRUb3BMZWZ0KGNv bnN0IExheW91dFBvaW50Jik7CiAgICAgICAgIHZvaWQgc2V0V2lkdGgoTGF5b3V0VW5pdCk7CiAg ICAgICAgIHZvaWQgc2V0SGVpZ2h0KExheW91dFVuaXQpOworICAgICAgICB2b2lkIHNldFNpemUo Y29uc3QgTGF5b3V0U2l6ZSYpOwogCiAgICAgICAgIHZvaWQgc2hpZnRMZWZ0VG8oTGF5b3V0VW5p dCk7CiAgICAgICAgIHZvaWQgc2hpZnRSaWdodFRvKExheW91dFVuaXQpOwpAQCAtODIsNyArODIs OCBAQCBwdWJsaWM6CiAKICAgICAgICAgdm9pZCBleHBhbmQoTGF5b3V0VW5pdCwgTGF5b3V0VW5p dCk7CiAKLSAgICAgICAgb3BlcmF0b3IgTGF5b3V0UmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fcmVj dDsgfQorICAgICAgICBSZWN0IGNsb25lKCkgY29uc3Q7CisgICAgICAgIG9wZXJhdG9yIExheW91 dFJlY3QoKSBjb25zdDsKIAogICAgIHByaXZhdGU6CiAjaWYgIUFTU0VSVF9ESVNBQkxFRApAQCAt OTcsNiArOTgsNyBAQCBwdWJsaWM6CiAgICAgICAgIGJvb2wgaGFzVmFsaWRHZW9tZXRyeSgpIGNv bnN0IHsgcmV0dXJuIGhhc1ZhbGlkUG9zaXRpb24oKSAmJiBoYXNWYWxpZFNpemUoKTsgfQogICAg IAogICAgICAgICB2b2lkIHNldEhhc1ZhbGlkUG9zaXRpb24oKTsKKyAgICAgICAgdm9pZCBzZXRI YXNWYWxpZFNpemUoKTsKIAogICAgICAgICBib29sIG1faGFzVmFsaWRUb3AgeyBmYWxzZSB9Owog ICAgICAgICBib29sIG1faGFzVmFsaWRMZWZ0IHsgZmFsc2UgfTsKQEAgLTE1Niw2ICsxNTgsNyBA QCBwcml2YXRlOgogICAgIHZvaWQgc2V0TGVmdChMYXlvdXRVbml0IGxlZnQpIHsgbV9yZWN0LnNl dExlZnQobGVmdCk7IH0KICAgICB2b2lkIHNldFdpZHRoKExheW91dFVuaXQgd2lkdGgpIHsgbV9y ZWN0LnNldFdpZHRoKHdpZHRoKTsgfQogICAgIHZvaWQgc2V0SGVpZ2h0KExheW91dFVuaXQgaGVp Z2h0KSB7IG1fcmVjdC5zZXRIZWlnaHQoaGVpZ2h0KTsgfQorICAgIHZvaWQgc2V0U2l6ZShjb25z dCBMYXlvdXRTaXplJiBzaXplKSB7IG1fcmVjdC5zZXRTaXplKHNpemUpOyB9CiAKICAgICBzdHJ1 Y3QgRWRnZXMgewogICAgICAgICBFZGdlcygpID0gZGVmYXVsdDsKQEAgLTE4MCw5ICsxODMsOSBA QCBwcml2YXRlOgogICAgIHZvaWQgaW52YWxpZGF0ZUJvcmRlcigpIHsgbV9oYXNWYWxpZEJvcmRl ciA9IGZhbHNlOyB9CiAgICAgdm9pZCBpbnZhbGlkYXRlUGFkZGluZygpIHsgbV9oYXNWYWxpZFBh ZGRpbmcgPSBmYWxzZTsgfQogCi0gICAgdm9pZCBzZXRIYXNWYWxpZE1hcmdpbigpOwotICAgIHZv aWQgc2V0SGFzVmFsaWRCb3JkZXIoKTsKLSAgICB2b2lkIHNldEhhc1ZhbGlkUGFkZGluZygpOwor ICAgIHZvaWQgc2V0SGFzVmFsaWRNYXJnaW4oKSB7IG1faGFzVmFsaWRNYXJnaW4gPSB0cnVlOyB9 CisgICAgdm9pZCBzZXRIYXNWYWxpZEJvcmRlcigpIHsgbV9oYXNWYWxpZEJvcmRlciA9IHRydWU7 IH0KKyAgICB2b2lkIHNldEhhc1ZhbGlkUGFkZGluZygpIHsgbV9oYXNWYWxpZFBhZGRpbmcgPSB0 cnVlOyB9CiAjZW5kaWYKIAogICAgIGNvbnN0IFN0eWxlIG1fc3R5bGU7CkBAIC0yMTIsMTMgKzIx NSwxMyBAQCBpbmxpbmUgdm9pZCBCb3g6OlJlY3Q6OnNldEhhc1ZhbGlkUG9zaXRpb24oKQogICAg IG1faGFzVmFsaWRUb3AgPSB0cnVlOwogICAgIG1faGFzVmFsaWRMZWZ0ID0gdHJ1ZTsKIH0KLSNl bmRpZgogCi1pbmxpbmUgQm94OjpSZWN0OjpSZWN0KGNvbnN0IExheW91dFBvaW50JiB0b3BMZWZ0 LCBjb25zdCBMYXlvdXRTaXplJiBzaXplKQotICAgIDogbV9yZWN0KHRvcExlZnQsIHNpemUpCitp bmxpbmUgdm9pZCBCb3g6OlJlY3Q6OnNldEhhc1ZhbGlkU2l6ZSgpCiB7Ci0KKyAgICBtX2hhc1Zh bGlkV2lkdGggPSB0cnVlOworICAgIG1faGFzVmFsaWRIZWlnaHQgPSB0cnVlOwogfQorI2VuZGlm CiAKIGlubGluZSBMYXlvdXRVbml0IEJveDo6UmVjdDo6dG9wKCkgY29uc3QKIHsKQEAgLTMxNiw2 ICszMTksMTQgQEAgaW5saW5lIHZvaWQgQm94OjpSZWN0OjpzZXRIZWlnaHQoTGF5b3V0VW5pdCBo ZWlnaHQpCiAgICAgbV9yZWN0LnNldEhlaWdodChoZWlnaHQpOwogfQogCitpbmxpbmUgdm9pZCBC b3g6OlJlY3Q6OnNldFNpemUoY29uc3QgTGF5b3V0U2l6ZSYgc2l6ZSkKK3sKKyNpZiAhQVNTRVJU X0RJU0FCTEVECisgICAgc2V0SGFzVmFsaWRTaXplKCk7CisjZW5kaWYKKyAgICBtX3JlY3Quc2V0 U2l6ZShzaXplKTsKK30KKwogaW5saW5lIHZvaWQgQm94OjpSZWN0OjpzaGlmdExlZnRUbyhMYXlv dXRVbml0IGxlZnQpCiB7CiAgICAgQVNTRVJUKG1faGFzVmFsaWRMZWZ0KTsKQEAgLTM0NiwxMCAr MzU3LDI5IEBAIGlubGluZSB2b2lkIEJveDo6UmVjdDo6ZXhwYW5kKExheW91dFVuaXQgd2lkdGgs IExheW91dFVuaXQgaGVpZ2h0KQogICAgIG1fcmVjdC5leHBhbmQod2lkdGgsIGhlaWdodCk7CiB9 CiAKK2lubGluZSBCb3g6OlJlY3QgQm94OjpSZWN0OjpjbG9uZSgpIGNvbnN0Cit7CisgICAgUmVj dCByZWN0OworI2lmICFBU1NFUlRfRElTQUJMRUQKKyAgICByZWN0Lm1faGFzVmFsaWRUb3AgPSBt X2hhc1ZhbGlkVG9wOworICAgIHJlY3QubV9oYXNWYWxpZExlZnQgPSBtX2hhc1ZhbGlkTGVmdDsK KyAgICByZWN0Lm1faGFzVmFsaWRXaWR0aCA9IG1faGFzVmFsaWRXaWR0aDsKKyAgICByZWN0Lm1f aGFzVmFsaWRIZWlnaHQgID0gbV9oYXNWYWxpZEhlaWdodDsKKyNlbmRpZiAKKyAgICByZWN0Lm1f cmVjdCA9IG1fcmVjdDsKKyAgICByZXR1cm4gcmVjdDsKK30KKworaW5saW5lIEJveDo6UmVjdDo6 b3BlcmF0b3IgTGF5b3V0UmVjdCgpIGNvbnN0Cit7CisgICAgQVNTRVJUKGhhc1ZhbGlkR2VvbWV0 cnkoKSk7IAorICAgIHJldHVybiBtX3JlY3Q7Cit9CisKIGlubGluZSB2b2lkIEJveDo6c2V0TWFy Z2luKEVkZ2VzIG1hcmdpbikKIHsKICNpZiAhQVNTRVJUX0RJU0FCTEVECi0gICAgdm9pZCBzZXRI YXNWYWxpZE1hcmdpbigpOworICAgIHNldEhhc1ZhbGlkTWFyZ2luKCk7CiAjZW5kaWYKICAgICBt X21hcmdpbiA9IG1hcmdpbjsKIH0KQEAgLTM1Nyw3ICszODcsNyBAQCBpbmxpbmUgdm9pZCBCb3g6 OnNldE1hcmdpbihFZGdlcyBtYXJnaW4pCiBpbmxpbmUgdm9pZCBCb3g6OnNldEJvcmRlcihFZGdl cyBib3JkZXIpCiB7CiAjaWYgIUFTU0VSVF9ESVNBQkxFRAotICAgIHZvaWQgc2V0SGFzVmFsaWRC b3JkZXIoKTsKKyAgICBzZXRIYXNWYWxpZEJvcmRlcigpOwogI2VuZGlmCiAgICAgbV9ib3JkZXIg PSBib3JkZXI7CiB9CkBAIC0zNjUsNyArMzk1LDcgQEAgaW5saW5lIHZvaWQgQm94OjpzZXRCb3Jk ZXIoRWRnZXMgYm9yZGVyKQogaW5saW5lIHZvaWQgQm94OjpzZXRQYWRkaW5nKEVkZ2VzIHBhZGRp bmcpCiB7CiAjaWYgIUFTU0VSVF9ESVNBQkxFRAotICAgIHZvaWQgc2V0SGFzVmFsaWRQYWRkaW5n KCk7CisgICAgc2V0SGFzVmFsaWRQYWRkaW5nKCk7CiAjZW5kaWYKICAgICBtX3BhZGRpbmcgPSBw YWRkaW5nOwogfQo=