181101 2017-12-21 13:50:22 -0800 [RenderTreeBuilder] Move RenderRubyAsInline::addChild mutation to a RenderTreeBuilder 2017-12-21 15:03:33 -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 1384241 0 zalan 2017-12-21 13:50:22 -0800 ssia. 1384243 1 webkit-bug-importer 2017-12-21 13:50:54 -0800 <rdar://problem/36184788> 1384259 2 330066 zalan 2017-12-21 14:14:40 -0800 Created attachment 330066 Patch 1384284 3 330066 commit-queue 2017-12-21 15:03:32 -0800 Comment on attachment 330066 Patch Clearing flags on attachment: 330066 Committed r226246: <https://trac.webkit.org/changeset/226246> 1384286 4 commit-queue 2017-12-21 15:03:33 -0800 All reviewed patches have been landed. Closing bug. 330066 2017-12-21 14:14:40 -0800 2017-12-21 15:03:32 -0800 Patch bug-181101-20171221141440.patch text/plain 12382 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2MjQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGYzODM3Y2JjOWYwNmY3 OTg5NjcwNzkyMjI3MDE4N2EyNzMzMmQxZC4uNTc5MWJiZmQ4MDdlOTc0ZmU0MWE5NDI3NDMwNGMy ODI0OGVkM2Y4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE3LTEyLTIxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBNb3ZlIFJlbmRlclJ1YnlBc0lubGluZTo6YWRkQ2hpbGQgbXV0YXRpb24gdG8gYSBSZW5kZXJU cmVlQnVpbGRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTgxMTAxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNjE4NDc4OD4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJS dWJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmlzUnVieUJlZm9yZUJsb2NrKTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OmlzUnVieUFmdGVyQmxvY2spOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6cnVieUJlZm9yZUJsb2NrKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OnJ1 YnlBZnRlckJsb2NrKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUFub255bW91 c1J1YnlJbmxpbmVCbG9jayk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpsYXN0UnVieVJ1 bik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSdWJ5QXNJbmxpbmU6OmFkZENo aWxkKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyUnVieS5oOgorICAgICAg ICAqIHJlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRlcjo6aW5zZXJ0Q2hpbGQpOgorICAgICAgICAqIHJlbmRl cmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclJ1YnkuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyVHJlZUJ1aWxkZXI6OlJ1Ynk6OmZpbmRPckNyZWF0ZVBhcmVudEZvckNoaWxkKToK KyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJSdWJ5Lmg6CisK IDIwMTctMTItMjEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBb UmVuZGVyVHJlZUJ1aWxkZXJdIE1vdmUgUmVuZGVyUnVieUFzQmxvY2s6OmFkZENoaWxkIG11dGF0 aW9uIHRvIGEgUmVuZGVyVHJlZUJ1aWxkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJSdWJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJS dWJ5LmNwcAppbmRleCAyZTI5YmM3NTJkNTI3YWY1MmViMDZmODY1MWFiMWFlNmRhYmIzYmEyLi43 ZjU3ZDk3NDY5YjQxZmJhY2QzM2ZmM2E4MTUxODc4MWFlM2IzN2MzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUnVieS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclJ1YnkuY3BwCkBAIC02MSwyMiArNjEsNiBAQCBzdGF0aWMgaW5saW5l IGJvb2wgaXNBbm9ueW1vdXNSdWJ5SW5saW5lQmxvY2soY29uc3QgUmVuZGVyT2JqZWN0KiBvYmpl Y3QpCiAgICAgICAgICYmICFpczxSZW5kZXJSdWJ5UnVuPigqb2JqZWN0KTsKIH0KIAotc3RhdGlj IGlubGluZSBib29sIGlzUnVieUJlZm9yZUJsb2NrKGNvbnN0IFJlbmRlck9iamVjdCogb2JqZWN0 KQotewotICAgIHJldHVybiBpc0Fub255bW91c1J1YnlJbmxpbmVCbG9jayhvYmplY3QpCi0gICAg ICAgICYmICFvYmplY3QtPnByZXZpb3VzU2libGluZygpCi0gICAgICAgICYmIGRvd25jYXN0PFJl bmRlckJsb2NrPigqb2JqZWN0KS5maXJzdENoaWxkKCkKLSAgICAgICAgJiYgZG93bmNhc3Q8UmVu ZGVyQmxvY2s+KCpvYmplY3QpLmZpcnN0Q2hpbGQoKS0+c3R5bGUoKS5zdHlsZVR5cGUoKSA9PSBC RUZPUkU7Ci19Ci0KLXN0YXRpYyBpbmxpbmUgYm9vbCBpc1J1YnlBZnRlckJsb2NrKGNvbnN0IFJl bmRlck9iamVjdCogb2JqZWN0KQotewotICAgIHJldHVybiBpc0Fub255bW91c1J1YnlJbmxpbmVC bG9jayhvYmplY3QpCi0gICAgICAgICYmICFvYmplY3QtPm5leHRTaWJsaW5nKCkKLSAgICAgICAg JiYgZG93bmNhc3Q8UmVuZGVyQmxvY2s+KCpvYmplY3QpLmZpcnN0Q2hpbGQoKQotICAgICAgICAm JiBkb3duY2FzdDxSZW5kZXJCbG9jaz4oKm9iamVjdCkuZmlyc3RDaGlsZCgpLT5zdHlsZSgpLnN0 eWxlVHlwZSgpID09IEFGVEVSOwotfQotCiAjaWZuZGVmIEFTU0VSVF9ESVNBQkxFRAogc3RhdGlj IGlubGluZSBib29sIGlzUnVieUNoaWxkRm9yTm9ybWFsUmVtb3ZhbChjb25zdCBSZW5kZXJPYmpl Y3QmIG9iamVjdCkKIHsKQEAgLTg5LDM3ICs3Myw2IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBpc1J1 YnlDaGlsZEZvck5vcm1hbFJlbW92YWwoY29uc3QgUmVuZGVyT2JqZWN0JiBvYmplY3QpCiB9CiAj ZW5kaWYKIAotc3RhdGljIGlubGluZSBSZW5kZXJCbG9jayogcnVieUJlZm9yZUJsb2NrKGNvbnN0 IFJlbmRlckVsZW1lbnQqIHJ1YnkpCi17Ci0gICAgUmVuZGVyT2JqZWN0KiBjaGlsZCA9IHJ1Ynkt PmZpcnN0Q2hpbGQoKTsKLSAgICByZXR1cm4gaXNSdWJ5QmVmb3JlQmxvY2soY2hpbGQpID8gZG93 bmNhc3Q8UmVuZGVyQmxvY2s+KGNoaWxkKSA6IG51bGxwdHI7Ci19Ci0KLXN0YXRpYyBpbmxpbmUg UmVuZGVyQmxvY2sqIHJ1YnlBZnRlckJsb2NrKGNvbnN0IFJlbmRlckVsZW1lbnQqIHJ1YnkpCi17 Ci0gICAgUmVuZGVyT2JqZWN0KiBjaGlsZCA9IHJ1YnktPmxhc3RDaGlsZCgpOwotICAgIHJldHVy biBpc1J1YnlBZnRlckJsb2NrKGNoaWxkKSA/IGRvd25jYXN0PFJlbmRlckJsb2NrPihjaGlsZCkg OiBudWxscHRyOwotfQotCi1zdGF0aWMgYXV0byBjcmVhdGVBbm9ueW1vdXNSdWJ5SW5saW5lQmxv Y2soUmVuZGVyT2JqZWN0JiBydWJ5KQotewotICAgIGF1dG8gbmV3QmxvY2sgPSBjcmVhdGVSZW5k ZXJlcjxSZW5kZXJCbG9ja0Zsb3c+KHJ1YnkuZG9jdW1lbnQoKSwgUmVuZGVyU3R5bGU6OmNyZWF0 ZUFub255bW91c1N0eWxlV2l0aERpc3BsYXkocnVieS5zdHlsZSgpLCBJTkxJTkVfQkxPQ0spKTsK LSAgICBuZXdCbG9jay0+aW5pdGlhbGl6ZVN0eWxlKCk7Ci0gICAgcmV0dXJuIG5ld0Jsb2NrOwot fQotCi1zdGF0aWMgUmVuZGVyUnVieVJ1biogbGFzdFJ1YnlSdW4oY29uc3QgUmVuZGVyRWxlbWVu dCogcnVieSkKLXsKLSAgICBSZW5kZXJPYmplY3QqIGNoaWxkID0gcnVieS0+bGFzdENoaWxkKCk7 Ci0gICAgaWYgKGNoaWxkICYmICFpczxSZW5kZXJSdWJ5UnVuPigqY2hpbGQpKQotICAgICAgICBj aGlsZCA9IGNoaWxkLT5wcmV2aW91c1NpYmxpbmcoKTsKLSAgICBpZiAoIWlzPFJlbmRlclJ1YnlS dW4+KGNoaWxkKSkgewotICAgICAgICBBU1NFUlQoIWNoaWxkIHx8IGNoaWxkLT5pc0JlZm9yZUNv bnRlbnQoKSB8fCBjaGlsZCA9PSBydWJ5QmVmb3JlQmxvY2socnVieSkpOwotICAgICAgICByZXR1 cm4gbnVsbHB0cjsKLSAgICB9Ci0gICAgcmV0dXJuIGRvd25jYXN0PFJlbmRlclJ1YnlSdW4+KGNo aWxkKTsKLX0KLQogc3RhdGljIGlubGluZSBSZW5kZXJSdWJ5UnVuJiBmaW5kUnVieVJ1blBhcmVu dChSZW5kZXJPYmplY3QmIGNoaWxkKQogewogICAgIHJldHVybiAqbGluZWFnZU9mVHlwZTxSZW5k ZXJSdWJ5UnVuPihjaGlsZCkuZmlyc3QoKTsKQEAgLTE0MCw3NCArOTMsNiBAQCB2b2lkIFJlbmRl clJ1YnlBc0lubGluZTo6c3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0 IFJlbmRlclN0eWxlKgogICAgIHByb3BhZ2F0ZVN0eWxlVG9Bbm9ueW1vdXNDaGlsZHJlbihQcm9w YWdhdGVUb0FsbENoaWxkcmVuKTsKIH0KIAotdm9pZCBSZW5kZXJSdWJ5QXNJbmxpbmU6OmFkZENo aWxkKFJlbmRlclRyZWVCdWlsZGVyJiBidWlsZGVyLCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBj aGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCkKLXsKLSAgICAvLyBJbnNlcnQgOmJlZm9y ZSBhbmQgOmFmdGVyIGNvbnRlbnQgYmVmb3JlL2FmdGVyIHRoZSBSZW5kZXJSdWJ5UnVuKHMpCi0g ICAgaWYgKGNoaWxkLT5pc0JlZm9yZUNvbnRlbnQoKSkgewotICAgICAgICBpZiAoY2hpbGQtPmlz SW5saW5lKCkpIHsKLSAgICAgICAgICAgIC8vIEFkZCBnZW5lcmF0ZWQgaW5saW5lIGNvbnRlbnQg bm9ybWFsbHkKLSAgICAgICAgICAgIFJlbmRlcklubGluZTo6YWRkQ2hpbGQoYnVpbGRlciwgV1RG TW92ZShjaGlsZCksIGZpcnN0Q2hpbGQoKSk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAg ICAvLyBXcmFwIG5vbi1pbmxpbmUgY29udGVudCB3aXRoIGFuIGFub255bW91cyBpbmxpbmUtYmxv Y2suCi0gICAgICAgICAgICBSZW5kZXJCbG9jayogYmVmb3JlQmxvY2sgPSBydWJ5QmVmb3JlQmxv Y2sodGhpcyk7Ci0gICAgICAgICAgICBpZiAoIWJlZm9yZUJsb2NrKSB7Ci0gICAgICAgICAgICAg ICAgYXV0byBuZXdCbG9jayA9IGNyZWF0ZUFub255bW91c1J1YnlJbmxpbmVCbG9jaygqdGhpcyk7 Ci0gICAgICAgICAgICAgICAgYmVmb3JlQmxvY2sgPSBuZXdCbG9jay5nZXQoKTsKLSAgICAgICAg ICAgICAgICBSZW5kZXJJbmxpbmU6OmFkZENoaWxkKGJ1aWxkZXIsIFdURk1vdmUobmV3QmxvY2sp LCBmaXJzdENoaWxkKCkpOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgYnVpbGRlci5pbnNl cnRDaGlsZCgqYmVmb3JlQmxvY2ssIFdURk1vdmUoY2hpbGQpKTsKLSAgICAgICAgfQotICAgICAg ICByZXR1cm47Ci0gICAgfQotICAgIGlmIChjaGlsZC0+aXNBZnRlckNvbnRlbnQoKSkgewotICAg ICAgICBpZiAoY2hpbGQtPmlzSW5saW5lKCkpIHsKLSAgICAgICAgICAgIC8vIEFkZCBnZW5lcmF0 ZWQgaW5saW5lIGNvbnRlbnQgbm9ybWFsbHkKLSAgICAgICAgICAgIFJlbmRlcklubGluZTo6YWRk Q2hpbGQoYnVpbGRlciwgV1RGTW92ZShjaGlsZCkpOwotICAgICAgICB9IGVsc2UgewotICAgICAg ICAgICAgLy8gV3JhcCBub24taW5saW5lIGNvbnRlbnQgd2l0aCBhbiBhbm9ueW1vdXMgaW5saW5l LWJsb2NrLgotICAgICAgICAgICAgUmVuZGVyQmxvY2sqIGFmdGVyQmxvY2sgPSBydWJ5QWZ0ZXJC bG9jayh0aGlzKTsKLSAgICAgICAgICAgIGlmICghYWZ0ZXJCbG9jaykgewotICAgICAgICAgICAg ICAgIGF1dG8gbmV3QmxvY2sgPSBjcmVhdGVBbm9ueW1vdXNSdWJ5SW5saW5lQmxvY2soKnRoaXMp OwotICAgICAgICAgICAgICAgIGFmdGVyQmxvY2sgPSBuZXdCbG9jay5nZXQoKTsKLSAgICAgICAg ICAgICAgICBSZW5kZXJJbmxpbmU6OmFkZENoaWxkKGJ1aWxkZXIsIFdURk1vdmUobmV3QmxvY2sp KTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGJ1aWxkZXIuaW5zZXJ0Q2hpbGQoKmFmdGVy QmxvY2ssIFdURk1vdmUoY2hpbGQpKTsKLSAgICAgICAgfQotICAgICAgICByZXR1cm47Ci0gICAg fQotCi0gICAgLy8gSWYgdGhlIGNoaWxkIGlzIGEgcnVieSBydW4sIGp1c3QgYWRkIGl0IG5vcm1h bGx5LgotICAgIGlmIChjaGlsZC0+aXNSdWJ5UnVuKCkpIHsKLSAgICAgICAgUmVuZGVySW5saW5l OjphZGRDaGlsZChidWlsZGVyLCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOwotICAgICAg ICByZXR1cm47Ci0gICAgfQotCi0gICAgaWYgKGJlZm9yZUNoaWxkICYmICFpc0FmdGVyQ29udGVu dChiZWZvcmVDaGlsZCkpIHsKLSAgICAgICAgLy8gaW5zZXJ0IGNoaWxkIGludG8gcnVuCi0gICAg ICAgIEFTU0VSVCghYmVmb3JlQ2hpbGQtPmlzUnVieVJ1bigpKTsKLSAgICAgICAgUmVuZGVyRWxl bWVudCogcnVuID0gYmVmb3JlQ2hpbGQtPnBhcmVudCgpOwotICAgICAgICB3aGlsZSAocnVuICYm ICFydW4tPmlzUnVieVJ1bigpKQotICAgICAgICAgICAgcnVuID0gcnVuLT5wYXJlbnQoKTsKLSAg ICAgICAgaWYgKHJ1bikgewotICAgICAgICAgICAgYnVpbGRlci5pbnNlcnRDaGlsZCgqcnVuLCBX VEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQpOwotICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICB9Ci0gICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOyAvLyBiZWZvcmVDaGlsZCBzaG91bGQg YWx3YXlzIGhhdmUgYSBydW4gYXMgcGFyZW50IQotICAgICAgICAvLyBFbWVyZ2VuY3kgZmFsbGJh Y2s6IGZhbGwgdGhyb3VnaCBhbmQganVzdCBhcHBlbmQuCi0gICAgfQotCi0gICAgLy8gSWYgdGhl IG5ldyBjaGlsZCB3b3VsZCBiZSBhcHBlbmRlZCwgdHJ5IHRvIGFkZCB0aGUgY2hpbGQgdG8gdGhl IHByZXZpb3VzIHJ1bgotICAgIC8vIGlmIHBvc3NpYmxlLCBvciBjcmVhdGUgYSBuZXcgcnVuIG90 aGVyd2lzZS4KLSAgICAvLyAoVGhlIFJlbmRlclJ1YnlSdW4gb2JqZWN0IHdpbGwgaGFuZGxlIHRo ZSBkZXRhaWxzKQotICAgIFJlbmRlclJ1YnlSdW4qIGxhc3RSdW4gPSBsYXN0UnVieVJ1bih0aGlz KTsKLSAgICBpZiAoIWxhc3RSdW4gfHwgbGFzdFJ1bi0+aGFzUnVieVRleHQoKSkgewotICAgICAg ICBhdXRvIG5ld1J1biA9IFJlbmRlclJ1YnlSdW46OnN0YXRpY0NyZWF0ZVJ1YnlSdW4odGhpcyk7 Ci0gICAgICAgIGxhc3RSdW4gPSBuZXdSdW4uZ2V0KCk7Ci0gICAgICAgIFJlbmRlcklubGluZTo6 YWRkQ2hpbGQoYnVpbGRlciwgV1RGTW92ZShuZXdSdW4pLCBiZWZvcmVDaGlsZCk7Ci0gICAgfQot ICAgIGJ1aWxkZXIuaW5zZXJ0Q2hpbGQoKmxhc3RSdW4sIFdURk1vdmUoY2hpbGQpKTsKLX0KLQog UmVuZGVyUHRyPFJlbmRlck9iamVjdD4gUmVuZGVyUnVieUFzSW5saW5lOjp0YWtlQ2hpbGQoUmVu ZGVyT2JqZWN0JiBjaGlsZCkKIHsKICAgICAvLyBJZiB0aGUgY2hpbGQncyBwYXJlbnQgaXMgKnRo aXMgKG11c3QgYmUgYSBydWJ5IHJ1biBvciBnZW5lcmF0ZWQgY29udGVudCBvciBhbm9ueW1vdXMg YmxvY2spLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJ1Ynku aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSdWJ5LmgKaW5kZXggNmFjZjdmZTM5 NzYwN2I4ZWEyODA5NzdiZTJmNTk3YzNkMjZiYjJmZS4uY2JmYzIzYmM1ZGY0MTkzZWRkNDBkMmJj ODY4YjFlY2MwNzIzODc1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclJ1YnkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUnVieS5oCkBA IC01Niw3ICs1Niw2IEBAIHB1YmxpYzoKICAgICBSZW5kZXJSdWJ5QXNJbmxpbmUoRWxlbWVudCYs IFJlbmRlclN0eWxlJiYpOwogICAgIHZpcnR1YWwgflJlbmRlclJ1YnlBc0lubGluZSgpOwogCi0g ICAgdm9pZCBhZGRDaGlsZChSZW5kZXJUcmVlQnVpbGRlciYsIFJlbmRlclB0cjxSZW5kZXJPYmpl Y3Q+IGNoaWxkLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkID0gMCkgb3ZlcnJpZGU7CiAgICAg UmVuZGVyUHRyPFJlbmRlck9iamVjdD4gdGFrZUNoaWxkKFJlbmRlck9iamVjdCYgY2hpbGQpIG92 ZXJyaWRlOwogCiBwcm90ZWN0ZWQ6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcAppbmRleCBlZmUwNzBhOGQ1NGZjZWM0 OTFiMmYyNGIwOWI5MTgwYWQ4YWRkM2FiLi5hMmY5NDFjOGNiYzM2MGNiZDQ5MGZiNTQxMWU4OTU1 YzdjZDhhZGQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcv UmVuZGVyVHJlZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRh dGluZy9SZW5kZXJUcmVlQnVpbGRlci5jcHAKQEAgLTk3LDYgKzk3LDExIEBAIHZvaWQgUmVuZGVy VHJlZUJ1aWxkZXI6Omluc2VydENoaWxkKFJlbmRlckVsZW1lbnQmIHBhcmVudCwgUmVuZGVyUHRy PFJlbmRlck9iamVjCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBpZiAoaXM8UmVuZGVy UnVieUFzSW5saW5lPihwYXJlbnQpKSB7CisgICAgICAgIGluc2VydFJlY3Vyc2l2ZUlmTmVlZGVk KHJ1YnlCdWlsZGVyKCkuZmluZE9yQ3JlYXRlUGFyZW50Rm9yQ2hpbGQoZG93bmNhc3Q8UmVuZGVy UnVieUFzSW5saW5lPihwYXJlbnQpLCAqY2hpbGQsIGJlZm9yZUNoaWxkKSk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisKICAgICBpZiAoaXM8UmVuZGVyUnVieVJ1bj4ocGFyZW50KSkgewogICAg ICAgICBydWJ5QnVpbGRlcigpLmluc2VydENoaWxkKGRvd25jYXN0PFJlbmRlclJ1YnlSdW4+KHBh cmVudCksIFdURk1vdmUoY2hpbGQpLCBiZWZvcmVDaGlsZCk7CiAgICAgICAgIHJldHVybjsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVp bGRlclJ1YnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRy ZWVCdWlsZGVyUnVieS5jcHAKaW5kZXggZjk4NjZjZGIyZGMxMGEyZjAxODI3Njk5MGI5MTE4MDg0 MWQ5MmUwZS4uMDViY2Q5NzdjMjE1MTg2NTQ2YzUwYzRhNzg1NTA2ZjI4NDJhZDkzNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVy UnVieS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRy ZWVCdWlsZGVyUnVieS5jcHAKQEAgLTIxOCw2ICsyMTgsNjYgQEAgUmVuZGVyRWxlbWVudCYgUmVu ZGVyVHJlZUJ1aWxkZXI6OlJ1Ynk6OmZpbmRPckNyZWF0ZVBhcmVudEZvckNoaWxkKFJlbmRlclJ1 YnlBc0IKICAgICByZXR1cm4gKmxhc3RSdW47CiB9CiAKK1JlbmRlckVsZW1lbnQmIFJlbmRlclRy ZWVCdWlsZGVyOjpSdWJ5OjpmaW5kT3JDcmVhdGVQYXJlbnRGb3JDaGlsZChSZW5kZXJSdWJ5QXNJ bmxpbmUmIHBhcmVudCwgY29uc3QgUmVuZGVyT2JqZWN0JiBjaGlsZCwgUmVuZGVyT2JqZWN0KiYg YmVmb3JlQ2hpbGQpCit7CisgICAgLy8gSW5zZXJ0IDpiZWZvcmUgYW5kIDphZnRlciBjb250ZW50 IGJlZm9yZS9hZnRlciB0aGUgUmVuZGVyUnVieVJ1bihzKQorICAgIGlmIChjaGlsZC5pc0JlZm9y ZUNvbnRlbnQoKSkgeworICAgICAgICAvLyBBZGQgZ2VuZXJhdGVkIGlubGluZSBjb250ZW50IG5v cm1hbGx5CisgICAgICAgIGlmIChjaGlsZC5pc0lubGluZSgpKQorICAgICAgICAgICAgcmV0dXJu IHBhcmVudDsKKyAgICAgICAgLy8gV3JhcCBub24taW5saW5lIGNvbnRlbnQgd2l0aCBhbiBhbm9u eW1vdXMgaW5saW5lLWJsb2NrLgorICAgICAgICBhdXRvKiBiZWZvcmVCbG9jayA9IHJ1YnlCZWZv cmVCbG9jaygmcGFyZW50KTsKKyAgICAgICAgaWYgKCFiZWZvcmVCbG9jaykgeworICAgICAgICAg ICAgYXV0byBuZXdCbG9jayA9IGNyZWF0ZUFub255bW91c1J1YnlJbmxpbmVCbG9jayhwYXJlbnQp OworICAgICAgICAgICAgYmVmb3JlQmxvY2sgPSBuZXdCbG9jay5nZXQoKTsKKyAgICAgICAgICAg IHBhcmVudC5SZW5kZXJJbmxpbmU6OmFkZENoaWxkKG1fYnVpbGRlciwgV1RGTW92ZShuZXdCbG9j ayksIHBhcmVudC5maXJzdENoaWxkKCkpOworICAgICAgICB9CisgICAgICAgIGJlZm9yZUNoaWxk ID0gbnVsbHB0cjsKKyAgICAgICAgcmV0dXJuICpiZWZvcmVCbG9jazsKKyAgICB9CisKKyAgICBp ZiAoY2hpbGQuaXNBZnRlckNvbnRlbnQoKSkgeworICAgICAgICAvLyBBZGQgZ2VuZXJhdGVkIGlu bGluZSBjb250ZW50IG5vcm1hbGx5CisgICAgICAgIGlmIChjaGlsZC5pc0lubGluZSgpKQorICAg ICAgICAgICAgcmV0dXJuIHBhcmVudDsKKyAgICAgICAgLy8gV3JhcCBub24taW5saW5lIGNvbnRl bnQgd2l0aCBhbiBhbm9ueW1vdXMgaW5saW5lLWJsb2NrLgorICAgICAgICBhdXRvKiBhZnRlckJs b2NrID0gcnVieUFmdGVyQmxvY2soJnBhcmVudCk7CisgICAgICAgIGlmICghYWZ0ZXJCbG9jaykg eworICAgICAgICAgICAgYXV0byBuZXdCbG9jayA9IGNyZWF0ZUFub255bW91c1J1YnlJbmxpbmVC bG9jayhwYXJlbnQpOworICAgICAgICAgICAgYWZ0ZXJCbG9jayA9IG5ld0Jsb2NrLmdldCgpOwor ICAgICAgICAgICAgcGFyZW50LlJlbmRlcklubGluZTo6YWRkQ2hpbGQobV9idWlsZGVyLCBXVEZN b3ZlKG5ld0Jsb2NrKSk7CisgICAgICAgIH0KKyAgICAgICAgYmVmb3JlQ2hpbGQgPSBudWxscHRy OworICAgICAgICByZXR1cm4gKmFmdGVyQmxvY2s7CisgICAgfQorCisgICAgLy8gSWYgdGhlIGNo aWxkIGlzIGEgcnVieSBydW4sIGp1c3QgYWRkIGl0IG5vcm1hbGx5LgorICAgIGlmIChjaGlsZC5p c1J1YnlSdW4oKSkKKyAgICAgICAgcmV0dXJuIHBhcmVudDsKKworICAgIGlmIChiZWZvcmVDaGls ZCAmJiAhcGFyZW50LmlzQWZ0ZXJDb250ZW50KGJlZm9yZUNoaWxkKSkgeworICAgICAgICAvLyBp bnNlcnQgY2hpbGQgaW50byBydW4KKyAgICAgICAgQVNTRVJUKCFiZWZvcmVDaGlsZC0+aXNSdWJ5 UnVuKCkpOworICAgICAgICBhdXRvKiBydW4gPSBiZWZvcmVDaGlsZC0+cGFyZW50KCk7CisgICAg ICAgIHdoaWxlIChydW4gJiYgIXJ1bi0+aXNSdWJ5UnVuKCkpCisgICAgICAgICAgICBydW4gPSBy dW4tPnBhcmVudCgpOworICAgICAgICBpZiAocnVuKQorICAgICAgICAgICAgcmV0dXJuICpydW47 CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOyAvLyBiZWZvcmVDaGlsZCBzaG91bGQgYWx3 YXlzIGhhdmUgYSBydW4gYXMgcGFyZW50IQorICAgICAgICAvLyBFbWVyZ2VuY3kgZmFsbGJhY2s6 IGZhbGwgdGhyb3VnaCBhbmQganVzdCBhcHBlbmQuCisgICAgfQogCisgICAgLy8gSWYgdGhlIG5l dyBjaGlsZCB3b3VsZCBiZSBhcHBlbmRlZCwgdHJ5IHRvIGFkZCB0aGUgY2hpbGQgdG8gdGhlIHBy ZXZpb3VzIHJ1bgorICAgIC8vIGlmIHBvc3NpYmxlLCBvciBjcmVhdGUgYSBuZXcgcnVuIG90aGVy d2lzZS4KKyAgICAvLyAoVGhlIFJlbmRlclJ1YnlSdW4gb2JqZWN0IHdpbGwgaGFuZGxlIHRoZSBk ZXRhaWxzKQorICAgIGF1dG8qIGxhc3RSdW4gPSBsYXN0UnVieVJ1bigmcGFyZW50KTsKKyAgICBp ZiAoIWxhc3RSdW4gfHwgbGFzdFJ1bi0+aGFzUnVieVRleHQoKSkgeworICAgICAgICBhdXRvIG5l d1J1biA9IFJlbmRlclJ1YnlSdW46OnN0YXRpY0NyZWF0ZVJ1YnlSdW4oJnBhcmVudCk7CisgICAg ICAgIGxhc3RSdW4gPSBuZXdSdW4uZ2V0KCk7CisgICAgICAgIHBhcmVudC5SZW5kZXJJbmxpbmU6 OmFkZENoaWxkKG1fYnVpbGRlciwgV1RGTW92ZShuZXdSdW4pLCBiZWZvcmVDaGlsZCk7CisgICAg fQorICAgIGJlZm9yZUNoaWxkID0gbnVsbHB0cjsKKyAgICByZXR1cm4gKmxhc3RSdW47CiB9CiAK K30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJU cmVlQnVpbGRlclJ1YnkuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5k ZXJUcmVlQnVpbGRlclJ1YnkuaAppbmRleCBkOWVlZDliM2JmYWRhOGFjMzFlOGUxZGYyOTBiMjVl YzNkYWE5YjBkLi5hYWE2ODg3OWE0NTc5MzBmYzg1YmY2MjQ4MjNhNTJkMTFiZjQwNGJlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxk ZXJSdWJ5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRy ZWVCdWlsZGVyUnVieS5oCkBAIC0zMiw2ICszMiw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNs YXNzIFJlbmRlckVsZW1lbnQ7CiBjbGFzcyBSZW5kZXJPYmplY3Q7CiBjbGFzcyBSZW5kZXJSdWJ5 QXNCbG9jazsKK2NsYXNzIFJlbmRlclJ1YnlBc0lubGluZTsKIGNsYXNzIFJlbmRlclJ1YnlSdW47 CiBjbGFzcyBSZW5kZXJUcmVlQnVpbGRlcjsKIApAQCAtNDEsNiArNDIsNyBAQCBwdWJsaWM6CiAK ICAgICB2b2lkIGluc2VydENoaWxkKFJlbmRlclJ1YnlSdW4mIHBhcmVudCwgUmVuZGVyUHRyPFJl bmRlck9iamVjdD4gY2hpbGQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQpOwogICAgIFJlbmRl ckVsZW1lbnQmIGZpbmRPckNyZWF0ZVBhcmVudEZvckNoaWxkKFJlbmRlclJ1YnlBc0Jsb2NrJiBw YXJlbnQsIGNvbnN0IFJlbmRlck9iamVjdCYgY2hpbGQsIFJlbmRlck9iamVjdComIGJlZm9yZUNo aWxkKTsKKyAgICBSZW5kZXJFbGVtZW50JiBmaW5kT3JDcmVhdGVQYXJlbnRGb3JDaGlsZChSZW5k ZXJSdWJ5QXNJbmxpbmUmIHBhcmVudCwgY29uc3QgUmVuZGVyT2JqZWN0JiBjaGlsZCwgUmVuZGVy T2JqZWN0KiYgYmVmb3JlQ2hpbGQpOwogCiBwcml2YXRlOgogICAgIFJlbmRlclRyZWVCdWlsZGVy JiBtX2J1aWxkZXI7Cg==