182746 2018-02-13 14:20:54 -0800 [RenderTreeBuilder] Move RenderBlock::takeChild() to RenderTreeBuilder 2018-02-13 15:34:54 -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 1398770 0 zalan 2018-02-13 14:20:54 -0800 ssia 1398772 1 webkit-bug-importer 2018-02-13 14:21:40 -0800 <rdar://problem/37512871> 1398774 2 333724 zalan 2018-02-13 14:23:27 -0800 Created attachment 333724 Patch 1398775 3 333725 zalan 2018-02-13 14:26:04 -0800 Created attachment 333725 Patch 1398819 4 333725 commit-queue 2018-02-13 15:34:53 -0800 Comment on attachment 333725 Patch Clearing flags on attachment: 333725 Committed r228441: <https://trac.webkit.org/changeset/228441> 1398820 5 commit-queue 2018-02-13 15:34:54 -0800 All reviewed patches have been landed. Closing bug. 333724 2018-02-13 14:23:27 -0800 2018-02-13 14:25:18 -0800 Patch bug-182746-20180213142326.patch text/plain 7025 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDNiMWI4NjVhNzcxMjQ5 NzA3Y2E2ZTFkZjFkOWFlNWViNmFlODIzNS4uNzUzYjYyMjIyY2MzOTVkZmM2NGZkNDE0NTdmODhl YWI0YzFiZTNjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE4LTAyLTEzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlcnRyZWVCdWlsZGVy XSBNb3ZlIFJlbmRlckJsb2NrOjp0YWtlQ2hpbGQoKSB0byBSZW5kZXJUcmVlQnVpbGRlcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgyNzQ2CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8zNzUxMjg3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCbG9jazo6dGFrZUNoaWxkKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy QmxvY2suaDoKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6OnRha2VDaGlsZCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRlcjo6dGFrZUNoaWxkRnJvbVJlbmRlck1l bnVMaXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVCdWlsZGVyOjp0YWtlQ2hpbGRG cm9tUmVuZGVyQnV0dG9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVCdWlsZGVyOjp0 YWtlQ2hpbGRGcm9tUmVuZGVyR3JpZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVp bGRlcjo6dGFrZUNoaWxkRnJvbVJlbmRlckJsb2NrKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5k ZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuaDoKKyAgICAgICAgKiByZW5kZXJpbmcv dXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUcmVlQnVpbGRlcjo6QmxvY2s6OnRha2VDaGlsZCk6CisKIDIwMTgtMDItMTMgIFphbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbUmVuZGVyVHJlZUJ1aWxkZXJd IE1vdmUgUmVuZGVyQmxvY2tGbG93Ojp0YWtlQ2hpbGQoKSB0byBSZW5kZXJUcmVlQnVpbGRlcgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggMjZlZWUxZjAxMTIx OWUzMjE4YTQyY2E2ZWI2NTc0YjkyMTI1NzVlOS4uMzg4ZWE0NTk3NDZiY2U3YTA3ZmMzNzY1OThk NzIzZTMwMjg0NGIzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3Bw CkBAIC00ODIsMTEgKzQ4Miw2IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmRlbGV0ZUxpbmVzKCkKICAg ICAgICAgY2FjaGUtPmRlZmVyUmVjb21wdXRlSXNJZ25vcmVkKGVsZW1lbnQoKSk7CiB9CiAKLVJl bmRlclB0cjxSZW5kZXJPYmplY3Q+IFJlbmRlckJsb2NrOjp0YWtlQ2hpbGQoUmVuZGVyVHJlZUJ1 aWxkZXImIGJ1aWxkZXIsIFJlbmRlck9iamVjdCYgb2xkQ2hpbGQpCi17Ci0gICAgcmV0dXJuIGJ1 aWxkZXIudGFrZUNoaWxkRnJvbVJlbmRlckJsb2NrKCp0aGlzLCBvbGRDaGlsZCk7Ci19Ci0KIGJv b2wgUmVuZGVyQmxvY2s6OmNoaWxkcmVuUHJldmVudFNlbGZDb2xsYXBzaW5nKCkgY29uc3QKIHsK ICAgICAvLyBXaGV0aGVyIG9yIG5vdCB3ZSBjb2xsYXBzZSBpcyBkZXBlbmRlbnQgb24gd2hldGhl ciBhbGwgb3VyIG5vcm1hbCBmbG93IGNoaWxkcmVuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5oCmluZGV4IDgxODJkNzVlOTZlNzAwZjAxZjdmZmFhYmQ4MjJiOGMzYmNjNjY5NmQu LjE0Y2ExNGFhMjc5MzA5NGE3NzE2ZDlkMmVlNDMyNzI2NDQwNmYyODQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCkBAIC03NCw3ICs3NCw2IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIHZvaWQgZGVsZXRlTGluZXMoKTsKIAogICAgIHZvaWQgYWRkQ2hpbGQoUmVuZGVyVHJl ZUJ1aWxkZXImLCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBuZXdDaGlsZCwgUmVuZGVyT2JqZWN0 KiBiZWZvcmVDaGlsZCA9IDApIG92ZXJyaWRlOwotICAgIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+ IHRha2VDaGlsZChSZW5kZXJUcmVlQnVpbGRlciYsIFJlbmRlck9iamVjdCYpIG92ZXJyaWRlOwog CiAgICAgdmlydHVhbCB2b2lkIGxheW91dEJsb2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5 b3V0VW5pdCBwYWdlTG9naWNhbEhlaWdodCA9IDApOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcAppbmRleCAwMmZh NDQxMjAxY2NmZDY4ZWExOTNmMTJhODkwZTAxNjY5ZGEwODFkLi5iODA1MmJiMzdlYThiN2MyNzVl Y2ZhNmUyN2QwNTI0ZjYxZWZjZjdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAKQEAgLTIyNyw2ICsyMjcsOSBA QCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBSZW5kZXJUcmVlQnVpbGRlcjo6dGFrZUNoaWxkKFJl bmRlckVsZW1lbnQmIHBhcmVudCwgUmVuZAogICAgIGlmIChpczxSZW5kZXJCbG9ja0Zsb3c+KHBh cmVudCkpCiAgICAgICAgIHJldHVybiBibG9ja0J1aWxkZXIoKS50YWtlQ2hpbGQoZG93bmNhc3Q8 UmVuZGVyQmxvY2tGbG93PihwYXJlbnQpLCBjaGlsZCk7CiAKKyAgICBpZiAoaXM8UmVuZGVyQmxv Y2s+KHBhcmVudCkpCisgICAgICAgIHJldHVybiBibG9ja0J1aWxkZXIoKS50YWtlQ2hpbGQoZG93 bmNhc3Q8UmVuZGVyQmxvY2s+KHBhcmVudCksIGNoaWxkKTsKKwogICAgIHJldHVybiBwYXJlbnQu dGFrZUNoaWxkKCp0aGlzLCBjaGlsZCk7CiB9CiAKQEAgLTUxNCwxMSArNTE3LDYgQEAgdm9pZCBS ZW5kZXJUcmVlQnVpbGRlcjo6aW5zZXJ0Q2hpbGRUb1JlbmRlck1hdGhNTEZlbmNlZChSZW5kZXJN YXRoTUxGZW5jZWQmIHBhcmUKICAgICBtYXRoTUxCdWlsZGVyKCkuaW5zZXJ0Q2hpbGQocGFyZW50 LCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOwogfQogCi1SZW5kZXJQdHI8UmVuZGVyT2Jq ZWN0PiBSZW5kZXJUcmVlQnVpbGRlcjo6dGFrZUNoaWxkRnJvbVJlbmRlckJsb2NrKFJlbmRlckJs b2NrJiBwYXJlbnQsIFJlbmRlck9iamVjdCYgb2xkQ2hpbGQpCi17Ci0gICAgcmV0dXJuIGJsb2Nr QnVpbGRlcigpLnRha2VDaGlsZChwYXJlbnQsIG9sZENoaWxkKTsKLX0KLQogdm9pZCBSZW5kZXJU cmVlQnVpbGRlcjo6dXBkYXRlQWZ0ZXJEZXNjZW5kYW50cyhSZW5kZXJFbGVtZW50JiByZW5kZXJl cikKIHsKICAgICBpZiAoaXM8UmVuZGVyQmxvY2s+KHJlbmRlcmVyKSkKQEAgLTUzOCw3ICs1MzYs NyBAQCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBSZW5kZXJUcmVlQnVpbGRlcjo6dGFrZUNoaWxk RnJvbVJlbmRlck1lbnVMaXN0KFJlbmRlck1lbgogewogICAgIGF1dG8qIGlubmVyUmVuZGVyZXIg PSBwYXJlbnQuaW5uZXJSZW5kZXJlcigpOwogICAgIGlmICghaW5uZXJSZW5kZXJlciB8fCAmY2hp bGQgPT0gaW5uZXJSZW5kZXJlcikKLSAgICAgICAgcmV0dXJuIHBhcmVudC5SZW5kZXJCbG9jazo6 dGFrZUNoaWxkKCp0aGlzLCBjaGlsZCk7CisgICAgICAgIHJldHVybiBibG9ja0J1aWxkZXIoKS50 YWtlQ2hpbGQocGFyZW50LCBjaGlsZCk7CiAgICAgcmV0dXJuIHRha2VDaGlsZCgqaW5uZXJSZW5k ZXJlciwgY2hpbGQpOwogfQogCkBAIC01NDcsMTQgKzU0NSwxNCBAQCBSZW5kZXJQdHI8UmVuZGVy T2JqZWN0PiBSZW5kZXJUcmVlQnVpbGRlcjo6dGFrZUNoaWxkRnJvbVJlbmRlckJ1dHRvbihSZW5k ZXJCdXR0bwogICAgIGF1dG8qIGlubmVyUmVuZGVyZXIgPSBwYXJlbnQuaW5uZXJSZW5kZXJlcigp OwogICAgIGlmICghaW5uZXJSZW5kZXJlciB8fCAmY2hpbGQgPT0gaW5uZXJSZW5kZXJlciB8fCBj aGlsZC5wYXJlbnQoKSA9PSAmcGFyZW50KSB7CiAgICAgICAgIEFTU0VSVCgmY2hpbGQgPT0gaW5u ZXJSZW5kZXJlciB8fCAhaW5uZXJSZW5kZXJlcik7Ci0gICAgICAgIHJldHVybiBwYXJlbnQuUmVu ZGVyQmxvY2s6OnRha2VDaGlsZCgqdGhpcywgY2hpbGQpOworICAgICAgICByZXR1cm4gYmxvY2tC dWlsZGVyKCkudGFrZUNoaWxkKHBhcmVudCwgY2hpbGQpOwogICAgIH0KICAgICByZXR1cm4gdGFr ZUNoaWxkKCppbm5lclJlbmRlcmVyLCBjaGlsZCk7CiB9CiAKIFJlbmRlclB0cjxSZW5kZXJPYmpl Y3Q+IFJlbmRlclRyZWVCdWlsZGVyOjp0YWtlQ2hpbGRGcm9tUmVuZGVyR3JpZChSZW5kZXJHcmlk JiBwYXJlbnQsIFJlbmRlck9iamVjdCYgY2hpbGQpCiB7Ci0gICAgYXV0byB0YWtlbkNoaWxkID0g cGFyZW50LlJlbmRlckJsb2NrOjp0YWtlQ2hpbGQoKnRoaXMsIGNoaWxkKTsKKyAgICBhdXRvIHRh a2VuQ2hpbGQgPSBibG9ja0J1aWxkZXIoKS50YWtlQ2hpbGQocGFyZW50LCBjaGlsZCk7CiAgICAg Ly8gUG9zaXRpb25lZCBncmlkIGl0ZW1zIGRvIG5vdCB0YWtlIHVwIHNwYWNlIG9yIG90aGVyd2lz ZSBwYXJ0aWNpcGF0ZSBpbiB0aGUgbGF5b3V0IG9mIHRoZSBncmlkLAogICAgIC8vIGZvciB0aGF0 IHJlYXNvbiB3ZSBkb24ndCBuZWVkIHRvIG1hcmsgdGhlIGdyaWQgYXMgZGlydHkgd2hlbiB0aGV5 IGFyZSByZW1vdmVkLgogICAgIGlmIChjaGlsZC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVp bGRlci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWls ZGVyLmgKaW5kZXggNDYzMjdkNDRiYWZhMWI5YzhiYWRjMDdhYWUyY2NjYjRkOTViZmRiZS4uMWEy Y2RkY2U5MDAwYmE5YzY1YjZiMGE2NDQ2YTllNjMyZjhhZDllNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmgKQEAgLTc4 LDggKzc4LDYgQEAgcHVibGljOgogICAgIHZvaWQgaW5zZXJ0Q2hpbGRUb1JlbmRlclRhYmxlUm93 KFJlbmRlclRhYmxlUm93JiBwYXJlbnQsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IGNoaWxkLCBS ZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkID0gbnVsbHB0cik7CiAgICAgdm9pZCBpbnNlcnRDaGls ZFRvUmVuZGVyTWF0aE1MRmVuY2VkKFJlbmRlck1hdGhNTEZlbmNlZCYgcGFyZW50LCBSZW5kZXJQ dHI8UmVuZGVyT2JqZWN0PiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IG51bGxw dHIpOwogCi0gICAgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gdGFrZUNoaWxkRnJvbVJlbmRlckJs b2NrKFJlbmRlckJsb2NrJiBwYXJlbnQsIFJlbmRlck9iamVjdCYgb2xkQ2hpbGQpOwotCiAgICAg Ym9vbCBjaGlsZFJlcXVpcmVzVGFibGUoY29uc3QgUmVuZGVyRWxlbWVudCYgcGFyZW50LCBjb25z dCBSZW5kZXJPYmplY3QmIGNoaWxkKTsKICAgICB2b2lkIG1ha2VDaGlsZHJlbk5vbklubGluZShS ZW5kZXJCbG9jayYgcGFyZW50LCBSZW5kZXJPYmplY3QqIGluc2VydGlvblBvaW50ID0gbnVsbHB0 cik7CiAgICAgUmVuZGVyT2JqZWN0KiBzcGxpdEFub255bW91c0JveGVzQXJvdW5kQ2hpbGQoUmVu ZGVyQm94JiBwYXJlbnQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyQmxvY2su Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVy QmxvY2suY3BwCmluZGV4IDIxOGY1ZDcyODg1YjkxNDM0MTFiZjM1M2U1NzZkOWE5ZTM1NWExYTYu LjAzY2RmNWE4MjYwNDljZmQ2MGExOWI5YTUxMzU3MTdlNzhlYTJkNGYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlckJsb2NrLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxk ZXJCbG9jay5jcHAKQEAgLTM3Myw3ICszNzMsNyBAQCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBS ZW5kZXJUcmVlQnVpbGRlcjo6QmxvY2s6OnRha2VDaGlsZChSZW5kZXJCbG9ja0Zsb3cmIHBhcgog ICAgICAgICBpZiAoZnJhZ21lbnRlZEZsb3cgJiYgZnJhZ21lbnRlZEZsb3cgIT0gJmNoaWxkKQog ICAgICAgICAgICAgbV9idWlsZGVyLm11bHRpQ29sdW1uQnVpbGRlcigpLm11bHRpQ29sdW1uUmVs YXRpdmVXaWxsQmVSZW1vdmVkKCpmcmFnbWVudGVkRmxvdywgY2hpbGQpOwogICAgIH0KLSAgICBy ZXR1cm4gcGFyZW50LlJlbmRlckJsb2NrOjp0YWtlQ2hpbGQobV9idWlsZGVyLCBjaGlsZCk7Cisg ICAgcmV0dXJuIHRha2VDaGlsZChzdGF0aWNfY2FzdDxSZW5kZXJCbG9jayY+KHBhcmVudCksIGNo aWxkKTsKIH0KIAogfQo= 333725 2018-02-13 14:26:04 -0800 2018-02-13 15:34:53 -0800 Patch bug-182746-20180213142603.patch text/plain 7025 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDNiMWI4NjVhNzcxMjQ5 NzA3Y2E2ZTFkZjFkOWFlNWViNmFlODIzNS4uNGY0ZjBhMTdmYzc1NWE4YzRjYWVhM2EyZTgyNTIx NWMxOTA5MDllZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE4LTAyLTEzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBNb3ZlIFJlbmRlckJsb2NrOjp0YWtlQ2hpbGQoKSB0byBSZW5kZXJUcmVlQnVpbGRlcgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgyNzQ2CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8zNzUxMjg3MT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJCbG9jazo6dGFrZUNoaWxkKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy QmxvY2suaDoKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6OnRha2VDaGlsZCk6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRlcjo6dGFrZUNoaWxkRnJvbVJlbmRlck1l bnVMaXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVCdWlsZGVyOjp0YWtlQ2hpbGRG cm9tUmVuZGVyQnV0dG9uKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVCdWlsZGVyOjp0 YWtlQ2hpbGRGcm9tUmVuZGVyR3JpZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVp bGRlcjo6dGFrZUNoaWxkRnJvbVJlbmRlckJsb2NrKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5k ZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuaDoKKyAgICAgICAgKiByZW5kZXJpbmcv dXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJUcmVlQnVpbGRlcjo6QmxvY2s6OnRha2VDaGlsZCk6CisKIDIwMTgtMDItMTMgIFphbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbUmVuZGVyVHJlZUJ1aWxkZXJd IE1vdmUgUmVuZGVyQmxvY2tGbG93Ojp0YWtlQ2hpbGQoKSB0byBSZW5kZXJUcmVlQnVpbGRlcgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKaW5kZXggMjZlZWUxZjAxMTIx OWUzMjE4YTQyY2E2ZWI2NTc0YjkyMTI1NzVlOS4uMzg4ZWE0NTk3NDZiY2U3YTA3ZmMzNzY1OThk NzIzZTMwMjg0NGIzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3Bw CkBAIC00ODIsMTEgKzQ4Miw2IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmRlbGV0ZUxpbmVzKCkKICAg ICAgICAgY2FjaGUtPmRlZmVyUmVjb21wdXRlSXNJZ25vcmVkKGVsZW1lbnQoKSk7CiB9CiAKLVJl bmRlclB0cjxSZW5kZXJPYmplY3Q+IFJlbmRlckJsb2NrOjp0YWtlQ2hpbGQoUmVuZGVyVHJlZUJ1 aWxkZXImIGJ1aWxkZXIsIFJlbmRlck9iamVjdCYgb2xkQ2hpbGQpCi17Ci0gICAgcmV0dXJuIGJ1 aWxkZXIudGFrZUNoaWxkRnJvbVJlbmRlckJsb2NrKCp0aGlzLCBvbGRDaGlsZCk7Ci19Ci0KIGJv b2wgUmVuZGVyQmxvY2s6OmNoaWxkcmVuUHJldmVudFNlbGZDb2xsYXBzaW5nKCkgY29uc3QKIHsK ICAgICAvLyBXaGV0aGVyIG9yIG5vdCB3ZSBjb2xsYXBzZSBpcyBkZXBlbmRlbnQgb24gd2hldGhl ciBhbGwgb3VyIG5vcm1hbCBmbG93IGNoaWxkcmVuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5oCmluZGV4IDgxODJkNzVlOTZlNzAwZjAxZjdmZmFhYmQ4MjJiOGMzYmNjNjY5NmQu LjE0Y2ExNGFhMjc5MzA5NGE3NzE2ZDlkMmVlNDMyNzI2NDQwNmYyODQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCkBAIC03NCw3ICs3NCw2IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIHZvaWQgZGVsZXRlTGluZXMoKTsKIAogICAgIHZvaWQgYWRkQ2hpbGQoUmVuZGVyVHJl ZUJ1aWxkZXImLCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBuZXdDaGlsZCwgUmVuZGVyT2JqZWN0 KiBiZWZvcmVDaGlsZCA9IDApIG92ZXJyaWRlOwotICAgIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+ IHRha2VDaGlsZChSZW5kZXJUcmVlQnVpbGRlciYsIFJlbmRlck9iamVjdCYpIG92ZXJyaWRlOwog CiAgICAgdmlydHVhbCB2b2lkIGxheW91dEJsb2NrKGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5 b3V0VW5pdCBwYWdlTG9naWNhbEhlaWdodCA9IDApOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcAppbmRleCAwMmZh NDQxMjAxY2NmZDY4ZWExOTNmMTJhODkwZTAxNjY5ZGEwODFkLi5iODA1MmJiMzdlYThiN2MyNzVl Y2ZhNmUyN2QwNTI0ZjYxZWZjZjdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAKQEAgLTIyNyw2ICsyMjcsOSBA QCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBSZW5kZXJUcmVlQnVpbGRlcjo6dGFrZUNoaWxkKFJl bmRlckVsZW1lbnQmIHBhcmVudCwgUmVuZAogICAgIGlmIChpczxSZW5kZXJCbG9ja0Zsb3c+KHBh cmVudCkpCiAgICAgICAgIHJldHVybiBibG9ja0J1aWxkZXIoKS50YWtlQ2hpbGQoZG93bmNhc3Q8 UmVuZGVyQmxvY2tGbG93PihwYXJlbnQpLCBjaGlsZCk7CiAKKyAgICBpZiAoaXM8UmVuZGVyQmxv Y2s+KHBhcmVudCkpCisgICAgICAgIHJldHVybiBibG9ja0J1aWxkZXIoKS50YWtlQ2hpbGQoZG93 bmNhc3Q8UmVuZGVyQmxvY2s+KHBhcmVudCksIGNoaWxkKTsKKwogICAgIHJldHVybiBwYXJlbnQu dGFrZUNoaWxkKCp0aGlzLCBjaGlsZCk7CiB9CiAKQEAgLTUxNCwxMSArNTE3LDYgQEAgdm9pZCBS ZW5kZXJUcmVlQnVpbGRlcjo6aW5zZXJ0Q2hpbGRUb1JlbmRlck1hdGhNTEZlbmNlZChSZW5kZXJN YXRoTUxGZW5jZWQmIHBhcmUKICAgICBtYXRoTUxCdWlsZGVyKCkuaW5zZXJ0Q2hpbGQocGFyZW50 LCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOwogfQogCi1SZW5kZXJQdHI8UmVuZGVyT2Jq ZWN0PiBSZW5kZXJUcmVlQnVpbGRlcjo6dGFrZUNoaWxkRnJvbVJlbmRlckJsb2NrKFJlbmRlckJs b2NrJiBwYXJlbnQsIFJlbmRlck9iamVjdCYgb2xkQ2hpbGQpCi17Ci0gICAgcmV0dXJuIGJsb2Nr QnVpbGRlcigpLnRha2VDaGlsZChwYXJlbnQsIG9sZENoaWxkKTsKLX0KLQogdm9pZCBSZW5kZXJU cmVlQnVpbGRlcjo6dXBkYXRlQWZ0ZXJEZXNjZW5kYW50cyhSZW5kZXJFbGVtZW50JiByZW5kZXJl cikKIHsKICAgICBpZiAoaXM8UmVuZGVyQmxvY2s+KHJlbmRlcmVyKSkKQEAgLTUzOCw3ICs1MzYs NyBAQCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBSZW5kZXJUcmVlQnVpbGRlcjo6dGFrZUNoaWxk RnJvbVJlbmRlck1lbnVMaXN0KFJlbmRlck1lbgogewogICAgIGF1dG8qIGlubmVyUmVuZGVyZXIg PSBwYXJlbnQuaW5uZXJSZW5kZXJlcigpOwogICAgIGlmICghaW5uZXJSZW5kZXJlciB8fCAmY2hp bGQgPT0gaW5uZXJSZW5kZXJlcikKLSAgICAgICAgcmV0dXJuIHBhcmVudC5SZW5kZXJCbG9jazo6 dGFrZUNoaWxkKCp0aGlzLCBjaGlsZCk7CisgICAgICAgIHJldHVybiBibG9ja0J1aWxkZXIoKS50 YWtlQ2hpbGQocGFyZW50LCBjaGlsZCk7CiAgICAgcmV0dXJuIHRha2VDaGlsZCgqaW5uZXJSZW5k ZXJlciwgY2hpbGQpOwogfQogCkBAIC01NDcsMTQgKzU0NSwxNCBAQCBSZW5kZXJQdHI8UmVuZGVy T2JqZWN0PiBSZW5kZXJUcmVlQnVpbGRlcjo6dGFrZUNoaWxkRnJvbVJlbmRlckJ1dHRvbihSZW5k ZXJCdXR0bwogICAgIGF1dG8qIGlubmVyUmVuZGVyZXIgPSBwYXJlbnQuaW5uZXJSZW5kZXJlcigp OwogICAgIGlmICghaW5uZXJSZW5kZXJlciB8fCAmY2hpbGQgPT0gaW5uZXJSZW5kZXJlciB8fCBj aGlsZC5wYXJlbnQoKSA9PSAmcGFyZW50KSB7CiAgICAgICAgIEFTU0VSVCgmY2hpbGQgPT0gaW5u ZXJSZW5kZXJlciB8fCAhaW5uZXJSZW5kZXJlcik7Ci0gICAgICAgIHJldHVybiBwYXJlbnQuUmVu ZGVyQmxvY2s6OnRha2VDaGlsZCgqdGhpcywgY2hpbGQpOworICAgICAgICByZXR1cm4gYmxvY2tC dWlsZGVyKCkudGFrZUNoaWxkKHBhcmVudCwgY2hpbGQpOwogICAgIH0KICAgICByZXR1cm4gdGFr ZUNoaWxkKCppbm5lclJlbmRlcmVyLCBjaGlsZCk7CiB9CiAKIFJlbmRlclB0cjxSZW5kZXJPYmpl Y3Q+IFJlbmRlclRyZWVCdWlsZGVyOjp0YWtlQ2hpbGRGcm9tUmVuZGVyR3JpZChSZW5kZXJHcmlk JiBwYXJlbnQsIFJlbmRlck9iamVjdCYgY2hpbGQpCiB7Ci0gICAgYXV0byB0YWtlbkNoaWxkID0g cGFyZW50LlJlbmRlckJsb2NrOjp0YWtlQ2hpbGQoKnRoaXMsIGNoaWxkKTsKKyAgICBhdXRvIHRh a2VuQ2hpbGQgPSBibG9ja0J1aWxkZXIoKS50YWtlQ2hpbGQocGFyZW50LCBjaGlsZCk7CiAgICAg Ly8gUG9zaXRpb25lZCBncmlkIGl0ZW1zIGRvIG5vdCB0YWtlIHVwIHNwYWNlIG9yIG90aGVyd2lz ZSBwYXJ0aWNpcGF0ZSBpbiB0aGUgbGF5b3V0IG9mIHRoZSBncmlkLAogICAgIC8vIGZvciB0aGF0 IHJlYXNvbiB3ZSBkb24ndCBuZWVkIHRvIG1hcmsgdGhlIGdyaWQgYXMgZGlydHkgd2hlbiB0aGV5 IGFyZSByZW1vdmVkLgogICAgIGlmIChjaGlsZC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVp bGRlci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWls ZGVyLmgKaW5kZXggNDYzMjdkNDRiYWZhMWI5YzhiYWRjMDdhYWUyY2NjYjRkOTViZmRiZS4uMWEy Y2RkY2U5MDAwYmE5YzY1YjZiMGE2NDQ2YTllNjMyZjhhZDllNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmgKQEAgLTc4 LDggKzc4LDYgQEAgcHVibGljOgogICAgIHZvaWQgaW5zZXJ0Q2hpbGRUb1JlbmRlclRhYmxlUm93 KFJlbmRlclRhYmxlUm93JiBwYXJlbnQsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IGNoaWxkLCBS ZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkID0gbnVsbHB0cik7CiAgICAgdm9pZCBpbnNlcnRDaGls ZFRvUmVuZGVyTWF0aE1MRmVuY2VkKFJlbmRlck1hdGhNTEZlbmNlZCYgcGFyZW50LCBSZW5kZXJQ dHI8UmVuZGVyT2JqZWN0PiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCA9IG51bGxw dHIpOwogCi0gICAgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gdGFrZUNoaWxkRnJvbVJlbmRlckJs b2NrKFJlbmRlckJsb2NrJiBwYXJlbnQsIFJlbmRlck9iamVjdCYgb2xkQ2hpbGQpOwotCiAgICAg Ym9vbCBjaGlsZFJlcXVpcmVzVGFibGUoY29uc3QgUmVuZGVyRWxlbWVudCYgcGFyZW50LCBjb25z dCBSZW5kZXJPYmplY3QmIGNoaWxkKTsKICAgICB2b2lkIG1ha2VDaGlsZHJlbk5vbklubGluZShS ZW5kZXJCbG9jayYgcGFyZW50LCBSZW5kZXJPYmplY3QqIGluc2VydGlvblBvaW50ID0gbnVsbHB0 cik7CiAgICAgUmVuZGVyT2JqZWN0KiBzcGxpdEFub255bW91c0JveGVzQXJvdW5kQ2hpbGQoUmVu ZGVyQm94JiBwYXJlbnQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyQmxvY2su Y3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVy QmxvY2suY3BwCmluZGV4IDIxOGY1ZDcyODg1YjkxNDM0MTFiZjM1M2U1NzZkOWE5ZTM1NWExYTYu LjAzY2RmNWE4MjYwNDljZmQ2MGExOWI5YTUxMzU3MTdlNzhlYTJkNGYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlckJsb2NrLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxk ZXJCbG9jay5jcHAKQEAgLTM3Myw3ICszNzMsNyBAQCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBS ZW5kZXJUcmVlQnVpbGRlcjo6QmxvY2s6OnRha2VDaGlsZChSZW5kZXJCbG9ja0Zsb3cmIHBhcgog ICAgICAgICBpZiAoZnJhZ21lbnRlZEZsb3cgJiYgZnJhZ21lbnRlZEZsb3cgIT0gJmNoaWxkKQog ICAgICAgICAgICAgbV9idWlsZGVyLm11bHRpQ29sdW1uQnVpbGRlcigpLm11bHRpQ29sdW1uUmVs YXRpdmVXaWxsQmVSZW1vdmVkKCpmcmFnbWVudGVkRmxvdywgY2hpbGQpOwogICAgIH0KLSAgICBy ZXR1cm4gcGFyZW50LlJlbmRlckJsb2NrOjp0YWtlQ2hpbGQobV9idWlsZGVyLCBjaGlsZCk7Cisg ICAgcmV0dXJuIHRha2VDaGlsZChzdGF0aWNfY2FzdDxSZW5kZXJCbG9jayY+KHBhcmVudCksIGNo aWxkKTsKIH0KIAogfQo=