190582 2018-10-15 08:49:16 -0700 RenderLayer::addChild() and removeChild() should take references 2018-10-15 10:51:51 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1469250 0 simon.fraser 2018-10-15 08:49:16 -0700 RenderLayer::addChild() and removeChild() should take references 1469251 1 352326 simon.fraser 2018-10-15 08:49:53 -0700 Created attachment 352326 Patch 1469322 2 simon.fraser 2018-10-15 10:50:33 -0700 https://trac.webkit.org/r237121 1469328 3 webkit-bug-importer 2018-10-15 10:51:51 -0700 <rdar://problem/45276562> 352326 2018-10-15 08:49:53 -0700 2018-10-15 09:24:16 -0700 Patch bug-190582-20181015084952.patch text/plain 10514 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM3MDYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTYxMjA2NGFhNGYyZjcy ZDJkNDg1NWI0NmNmMDM0MTFmYWU1NGU1MS4uZjRiYTllZWIxNjdmMGQ3MzU1ZmUxZWMyZDRiN2Fj ZDViZTUyMTBkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE4LTEwLTE1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmRlckxheWVy OjphZGRDaGlsZCgpIGFuZCByZW1vdmVDaGlsZCgpIHNob3VsZCB0YWtlIHJlZmVyZW5jZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MDU4MgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFBhc3MgdGhlIGxh eWVyIHRvIGJlIGFkZGVkIG9yIHJlbW92ZWQgYXMgYSByZWZlcmVuY2U7IGl0J3MgbmV2ZXIgbnVs bC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OmFkZExheWVycyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVtZW50OjpyZW1v dmVMYXllcnMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVudDo6bW92ZUxheWVycyk6 CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckxheWVyOjphZGRDaGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6 cmVtb3ZlQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6Omluc2VydE9ubHlU aGlzTGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnJlbW92ZU9ubHlUaGlz TGF5ZXIpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorCiAyMDE4LTEwLTE0 ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbmRl ckxheWVyIHRyZWUtcmVsYXRlZCBjbGVhbnVwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyRWxlbWVudC5jcHAKaW5kZXggZDYzZTc5ZWJlMDk5MWNmNmRmMTk5MzE3NjdlNjI2YjlmMWIy ODQwNS4uNDhhZGQ4NGU5MWQxNmI0OGJjMzE2MjEzOTc4ZmUxMzM5NzEzYTMwNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcApAQCAtNTQ4LDcgKzU0OCw3IEBA IHN0YXRpYyB2b2lkIGFkZExheWVycyhSZW5kZXJFbGVtZW50JiByZW5kZXJlciwgUmVuZGVyTGF5 ZXIqIHBhcmVudExheWVyLCBSZW5kZXJFCiAgICAgICAgICAgICBiZWZvcmVDaGlsZCA9IG5ld09i amVjdC0+cGFyZW50KCktPmZpbmROZXh0TGF5ZXIocGFyZW50TGF5ZXIsIG5ld09iamVjdCk7CiAg ICAgICAgICAgICBuZXdPYmplY3QgPSBudWxscHRyOwogICAgICAgICB9Ci0gICAgICAgIHBhcmVu dExheWVyLT5hZGRDaGlsZChkb3duY2FzdDxSZW5kZXJMYXllck1vZGVsT2JqZWN0PihyZW5kZXJl cikubGF5ZXIoKSwgYmVmb3JlQ2hpbGQpOworICAgICAgICBwYXJlbnRMYXllci0+YWRkQ2hpbGQo KmRvd25jYXN0PFJlbmRlckxheWVyTW9kZWxPYmplY3Q+KHJlbmRlcmVyKS5sYXllcigpLCBiZWZv cmVDaGlsZCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTU3Miw3ICs1NzIsNyBAQCB2 b2lkIFJlbmRlckVsZW1lbnQ6OnJlbW92ZUxheWVycyhSZW5kZXJMYXllciogcGFyZW50TGF5ZXIp CiAgICAgICAgIHJldHVybjsKIAogICAgIGlmIChoYXNMYXllcigpKSB7Ci0gICAgICAgIHBhcmVu dExheWVyLT5yZW1vdmVDaGlsZChkb3duY2FzdDxSZW5kZXJMYXllck1vZGVsT2JqZWN0PigqdGhp cykubGF5ZXIoKSk7CisgICAgICAgIHBhcmVudExheWVyLT5yZW1vdmVDaGlsZCgqZG93bmNhc3Q8 UmVuZGVyTGF5ZXJNb2RlbE9iamVjdD4oKnRoaXMpLmxheWVyKCkpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogCkBAIC01ODksOCArNTg5LDggQEAgdm9pZCBSZW5kZXJFbGVtZW50Ojptb3ZlTGF5 ZXJzKFJlbmRlckxheWVyKiBvbGRQYXJlbnQsIFJlbmRlckxheWVyKiBuZXdQYXJlbnQpCiAgICAg ICAgIFJlbmRlckxheWVyKiBsYXllciA9IGRvd25jYXN0PFJlbmRlckxheWVyTW9kZWxPYmplY3Q+ KCp0aGlzKS5sYXllcigpOwogICAgICAgICBBU1NFUlQob2xkUGFyZW50ID09IGxheWVyLT5wYXJl bnQoKSk7CiAgICAgICAgIGlmIChvbGRQYXJlbnQpCi0gICAgICAgICAgICBvbGRQYXJlbnQtPnJl bW92ZUNoaWxkKGxheWVyKTsKLSAgICAgICAgbmV3UGFyZW50LT5hZGRDaGlsZChsYXllcik7Cisg ICAgICAgICAgICBvbGRQYXJlbnQtPnJlbW92ZUNoaWxkKCpsYXllcik7CisgICAgICAgIG5ld1Bh cmVudC0+YWRkQ2hpbGQoKmxheWVyKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggOTFjZjJiZTlkYjgwYzZiNWMz MzI1ZGE2NDMyMGY4MjJhYjNkY2NhNy4uZDBkZjM2NWY1MmNmODU3N2Y3NGQwNzY1NzQ5YTUwOGVj YmVlM2M5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0z NzUsOTIgKzM3NSw5MCBAQCBSZW5kZXJMYXllcjo6flJlbmRlckxheWVyKCkKICAgICBSRUxFQVNF X0FTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKHJlbmRlcmVyKCkucmVuZGVyVHJlZUJl aW5nRGVzdHJveWVkKCkgfHwgIW1fZmlyc3QpOwogfQogCi12b2lkIFJlbmRlckxheWVyOjphZGRD aGlsZChSZW5kZXJMYXllciogY2hpbGQsIFJlbmRlckxheWVyKiBiZWZvcmVDaGlsZCkKK3ZvaWQg UmVuZGVyTGF5ZXI6OmFkZENoaWxkKFJlbmRlckxheWVyJiBjaGlsZCwgUmVuZGVyTGF5ZXIqIGJl Zm9yZUNoaWxkKQogewogICAgIFJlbmRlckxheWVyKiBwcmV2U2libGluZyA9IGJlZm9yZUNoaWxk ID8gYmVmb3JlQ2hpbGQtPnByZXZpb3VzU2libGluZygpIDogbGFzdENoaWxkKCk7CiAgICAgaWYg KHByZXZTaWJsaW5nKSB7Ci0gICAgICAgIGNoaWxkLT5zZXRQcmV2aW91c1NpYmxpbmcocHJldlNp YmxpbmcpOwotICAgICAgICBwcmV2U2libGluZy0+c2V0TmV4dFNpYmxpbmcoY2hpbGQpOwotICAg ICAgICBBU1NFUlQocHJldlNpYmxpbmcgIT0gY2hpbGQpOworICAgICAgICBjaGlsZC5zZXRQcmV2 aW91c1NpYmxpbmcocHJldlNpYmxpbmcpOworICAgICAgICBwcmV2U2libGluZy0+c2V0TmV4dFNp YmxpbmcoJmNoaWxkKTsKKyAgICAgICAgQVNTRVJUKHByZXZTaWJsaW5nICE9ICZjaGlsZCk7CiAg ICAgfSBlbHNlCi0gICAgICAgIHNldEZpcnN0Q2hpbGQoY2hpbGQpOworICAgICAgICBzZXRGaXJz dENoaWxkKCZjaGlsZCk7CiAKICAgICBpZiAoYmVmb3JlQ2hpbGQpIHsKLSAgICAgICAgYmVmb3Jl Q2hpbGQtPnNldFByZXZpb3VzU2libGluZyhjaGlsZCk7Ci0gICAgICAgIGNoaWxkLT5zZXROZXh0 U2libGluZyhiZWZvcmVDaGlsZCk7Ci0gICAgICAgIEFTU0VSVChiZWZvcmVDaGlsZCAhPSBjaGls ZCk7CisgICAgICAgIGJlZm9yZUNoaWxkLT5zZXRQcmV2aW91c1NpYmxpbmcoJmNoaWxkKTsKKyAg ICAgICAgY2hpbGQuc2V0TmV4dFNpYmxpbmcoYmVmb3JlQ2hpbGQpOworICAgICAgICBBU1NFUlQo YmVmb3JlQ2hpbGQgIT0gJmNoaWxkKTsKICAgICB9IGVsc2UKLSAgICAgICAgc2V0TGFzdENoaWxk KGNoaWxkKTsKKyAgICAgICAgc2V0TGFzdENoaWxkKCZjaGlsZCk7CiAKLSAgICBjaGlsZC0+c2V0 UGFyZW50KHRoaXMpOworICAgIGNoaWxkLnNldFBhcmVudCh0aGlzKTsKIAotICAgIGlmIChjaGls ZC0+aXNOb3JtYWxGbG93T25seSgpKQorICAgIGlmIChjaGlsZC5pc05vcm1hbEZsb3dPbmx5KCkp CiAgICAgICAgIGRpcnR5Tm9ybWFsRmxvd0xpc3QoKTsKIAotICAgIGlmICghY2hpbGQtPmlzTm9y bWFsRmxvd09ubHkoKSB8fCBjaGlsZC0+Zmlyc3RDaGlsZCgpKSB7CisgICAgaWYgKCFjaGlsZC5p c05vcm1hbEZsb3dPbmx5KCkgfHwgY2hpbGQuZmlyc3RDaGlsZCgpKSB7CiAgICAgICAgIC8vIERp cnR5IHRoZSB6LW9yZGVyIGxpc3QgaW4gd2hpY2ggd2UgYXJlIGNvbnRhaW5lZC4gVGhlIHN0YWNr aW5nQ29udGV4dCgpIGNhbiBiZSBudWxsIGluIHRoZQogICAgICAgICAvLyBjYXNlIHdoZXJlIHdl J3JlIGJ1aWxkaW5nIHVwIGdlbmVyYXRlZCBjb250ZW50IGxheWVycy4gVGhpcyBpcyBvaywgc2lu Y2UgdGhlIGxpc3RzIHdpbGwgc3RhcnQKICAgICAgICAgLy8gb2ZmIGRpcnR5IGluIHRoYXQgY2Fz ZSBhbnl3YXkuCi0gICAgICAgIGNoaWxkLT5kaXJ0eVN0YWNraW5nQ29udGV4dFpPcmRlckxpc3Rz KCk7CisgICAgICAgIGNoaWxkLmRpcnR5U3RhY2tpbmdDb250ZXh0Wk9yZGVyTGlzdHMoKTsKICAg ICB9CiAKLSAgICBjaGlsZC0+dXBkYXRlRGVzY2VuZGFudERlcGVuZGVudEZsYWdzKCk7Ci0gICAg aWYgKGNoaWxkLT5tX2hhc1Zpc2libGVDb250ZW50IHx8IGNoaWxkLT5tX2hhc1Zpc2libGVEZXNj ZW5kYW50KQorICAgIGNoaWxkLnVwZGF0ZURlc2NlbmRhbnREZXBlbmRlbnRGbGFncygpOworICAg IGlmIChjaGlsZC5tX2hhc1Zpc2libGVDb250ZW50IHx8IGNoaWxkLm1faGFzVmlzaWJsZURlc2Nl bmRhbnQpCiAgICAgICAgIHNldEFuY2VzdG9yQ2hhaW5IYXNWaXNpYmxlRGVzY2VuZGFudCgpOwog Ci0gICAgaWYgKGNoaWxkLT5pc1NlbGZQYWludGluZ0xheWVyKCkgfHwgY2hpbGQtPmhhc1NlbGZQ YWludGluZ0xheWVyRGVzY2VuZGFudCgpKQorICAgIGlmIChjaGlsZC5pc1NlbGZQYWludGluZ0xh eWVyKCkgfHwgY2hpbGQuaGFzU2VsZlBhaW50aW5nTGF5ZXJEZXNjZW5kYW50KCkpCiAgICAgICAg IHNldEFuY2VzdG9yQ2hhaW5IYXNTZWxmUGFpbnRpbmdMYXllckRlc2NlbmRhbnQoKTsKIAogI2lm IEVOQUJMRShDU1NfQ09NUE9TSVRJTkcpCi0gICAgaWYgKGNoaWxkLT5oYXNCbGVuZE1vZGUoKSB8 fCAoY2hpbGQtPmhhc05vdElzb2xhdGVkQmxlbmRpbmdEZXNjZW5kYW50cygpICYmICFjaGlsZC0+ aXNvbGF0ZXNCbGVuZGluZygpKSkKKyAgICBpZiAoY2hpbGQuaGFzQmxlbmRNb2RlKCkgfHwgKGNo aWxkLmhhc05vdElzb2xhdGVkQmxlbmRpbmdEZXNjZW5kYW50cygpICYmICFjaGlsZC5pc29sYXRl c0JsZW5kaW5nKCkpKQogICAgICAgICB1cGRhdGVBbmNlc3RvckNoYWluSGFzQmxlbmRpbmdEZXNj ZW5kYW50cygpOwogI2VuZGlmCiAKLSAgICBjb21wb3NpdG9yKCkubGF5ZXJXYXNBZGRlZCgqdGhp cywgKmNoaWxkKTsKKyAgICBjb21wb3NpdG9yKCkubGF5ZXJXYXNBZGRlZCgqdGhpcywgY2hpbGQp OwogfQogCi1SZW5kZXJMYXllciogUmVuZGVyTGF5ZXI6OnJlbW92ZUNoaWxkKFJlbmRlckxheWVy KiBvbGRDaGlsZCkKK3ZvaWQgUmVuZGVyTGF5ZXI6OnJlbW92ZUNoaWxkKFJlbmRlckxheWVyJiBv bGRDaGlsZCkKIHsKICAgICBpZiAoIXJlbmRlcmVyKCkucmVuZGVyVHJlZUJlaW5nRGVzdHJveWVk KCkpCi0gICAgICAgIGNvbXBvc2l0b3IoKS5sYXllcldpbGxCZVJlbW92ZWQoKnRoaXMsICpvbGRD aGlsZCk7CisgICAgICAgIGNvbXBvc2l0b3IoKS5sYXllcldpbGxCZVJlbW92ZWQoKnRoaXMsIG9s ZENoaWxkKTsKIAogICAgIC8vIHJlbW92ZSB0aGUgY2hpbGQKLSAgICBpZiAob2xkQ2hpbGQtPnBy ZXZpb3VzU2libGluZygpKQotICAgICAgICBvbGRDaGlsZC0+cHJldmlvdXNTaWJsaW5nKCktPnNl dE5leHRTaWJsaW5nKG9sZENoaWxkLT5uZXh0U2libGluZygpKTsKLSAgICBpZiAob2xkQ2hpbGQt Pm5leHRTaWJsaW5nKCkpCi0gICAgICAgIG9sZENoaWxkLT5uZXh0U2libGluZygpLT5zZXRQcmV2 aW91c1NpYmxpbmcob2xkQ2hpbGQtPnByZXZpb3VzU2libGluZygpKTsKKyAgICBpZiAob2xkQ2hp bGQucHJldmlvdXNTaWJsaW5nKCkpCisgICAgICAgIG9sZENoaWxkLnByZXZpb3VzU2libGluZygp LT5zZXROZXh0U2libGluZyhvbGRDaGlsZC5uZXh0U2libGluZygpKTsKKyAgICBpZiAob2xkQ2hp bGQubmV4dFNpYmxpbmcoKSkKKyAgICAgICAgb2xkQ2hpbGQubmV4dFNpYmxpbmcoKS0+c2V0UHJl dmlvdXNTaWJsaW5nKG9sZENoaWxkLnByZXZpb3VzU2libGluZygpKTsKIAotICAgIGlmIChtX2Zp cnN0ID09IG9sZENoaWxkKQotICAgICAgICBtX2ZpcnN0ID0gb2xkQ2hpbGQtPm5leHRTaWJsaW5n KCk7Ci0gICAgaWYgKG1fbGFzdCA9PSBvbGRDaGlsZCkKLSAgICAgICAgbV9sYXN0ID0gb2xkQ2hp bGQtPnByZXZpb3VzU2libGluZygpOworICAgIGlmIChtX2ZpcnN0ID09ICZvbGRDaGlsZCkKKyAg ICAgICAgbV9maXJzdCA9IG9sZENoaWxkLm5leHRTaWJsaW5nKCk7CisgICAgaWYgKG1fbGFzdCA9 PSAmb2xkQ2hpbGQpCisgICAgICAgIG1fbGFzdCA9IG9sZENoaWxkLnByZXZpb3VzU2libGluZygp OwogCi0gICAgaWYgKG9sZENoaWxkLT5pc05vcm1hbEZsb3dPbmx5KCkpCisgICAgaWYgKG9sZENo aWxkLmlzTm9ybWFsRmxvd09ubHkoKSkKICAgICAgICAgZGlydHlOb3JtYWxGbG93TGlzdCgpOwot ICAgIGlmICghb2xkQ2hpbGQtPmlzTm9ybWFsRmxvd09ubHkoKSB8fCBvbGRDaGlsZC0+Zmlyc3RD aGlsZCgpKSB7CisgICAgaWYgKCFvbGRDaGlsZC5pc05vcm1hbEZsb3dPbmx5KCkgfHwgb2xkQ2hp bGQuZmlyc3RDaGlsZCgpKSB7CiAgICAgICAgIC8vIERpcnR5IHRoZSB6LW9yZGVyIGxpc3QgaW4g d2hpY2ggd2UgYXJlIGNvbnRhaW5lZC4gV2hlbiBjYWxsZWQgdmlhIHRoZQogICAgICAgICAvLyBy ZWF0dGFjaG1lbnQgcHJvY2VzcyBpbiByZW1vdmVPbmx5VGhpc0xheWVyLCB0aGUgbGF5ZXIgbWF5 IGFscmVhZHkgYmUgZGlzY29ubmVjdGVkCiAgICAgICAgIC8vIGZyb20gdGhlIG1haW4gbGF5ZXIg dHJlZSwgc28gd2UgbmVlZCB0byBudWxsLWNoZWNrIHRoZSB8c3RhY2tpbmdDb250ZXh0fCB2YWx1 ZS4KLSAgICAgICAgb2xkQ2hpbGQtPmRpcnR5U3RhY2tpbmdDb250ZXh0Wk9yZGVyTGlzdHMoKTsK KyAgICAgICAgb2xkQ2hpbGQuZGlydHlTdGFja2luZ0NvbnRleHRaT3JkZXJMaXN0cygpOwogICAg IH0KIAotICAgIG9sZENoaWxkLT5zZXRQcmV2aW91c1NpYmxpbmcobnVsbHB0cik7Ci0gICAgb2xk Q2hpbGQtPnNldE5leHRTaWJsaW5nKG51bGxwdHIpOwotICAgIG9sZENoaWxkLT5zZXRQYXJlbnQo bnVsbHB0cik7CisgICAgb2xkQ2hpbGQuc2V0UHJldmlvdXNTaWJsaW5nKG51bGxwdHIpOworICAg IG9sZENoaWxkLnNldE5leHRTaWJsaW5nKG51bGxwdHIpOworICAgIG9sZENoaWxkLnNldFBhcmVu dChudWxscHRyKTsKICAgICAKLSAgICBvbGRDaGlsZC0+dXBkYXRlRGVzY2VuZGFudERlcGVuZGVu dEZsYWdzKCk7Ci0gICAgaWYgKG9sZENoaWxkLT5tX2hhc1Zpc2libGVDb250ZW50IHx8IG9sZENo aWxkLT5tX2hhc1Zpc2libGVEZXNjZW5kYW50KQorICAgIG9sZENoaWxkLnVwZGF0ZURlc2NlbmRh bnREZXBlbmRlbnRGbGFncygpOworICAgIGlmIChvbGRDaGlsZC5tX2hhc1Zpc2libGVDb250ZW50 IHx8IG9sZENoaWxkLm1faGFzVmlzaWJsZURlc2NlbmRhbnQpCiAgICAgICAgIGRpcnR5QW5jZXN0 b3JDaGFpblZpc2libGVEZXNjZW5kYW50U3RhdHVzKCk7CiAKLSAgICBpZiAob2xkQ2hpbGQtPmlz U2VsZlBhaW50aW5nTGF5ZXIoKSB8fCBvbGRDaGlsZC0+aGFzU2VsZlBhaW50aW5nTGF5ZXJEZXNj ZW5kYW50KCkpCisgICAgaWYgKG9sZENoaWxkLmlzU2VsZlBhaW50aW5nTGF5ZXIoKSB8fCBvbGRD aGlsZC5oYXNTZWxmUGFpbnRpbmdMYXllckRlc2NlbmRhbnQoKSkKICAgICAgICAgZGlydHlBbmNl c3RvckNoYWluSGFzU2VsZlBhaW50aW5nTGF5ZXJEZXNjZW5kYW50U3RhdHVzKCk7CiAKICNpZiBF TkFCTEUoQ1NTX0NPTVBPU0lUSU5HKQotICAgIGlmIChvbGRDaGlsZC0+aGFzQmxlbmRNb2RlKCkg fHwgKG9sZENoaWxkLT5oYXNOb3RJc29sYXRlZEJsZW5kaW5nRGVzY2VuZGFudHMoKSAmJiAhb2xk Q2hpbGQtPmlzb2xhdGVzQmxlbmRpbmcoKSkpCisgICAgaWYgKG9sZENoaWxkLmhhc0JsZW5kTW9k ZSgpIHx8IChvbGRDaGlsZC5oYXNOb3RJc29sYXRlZEJsZW5kaW5nRGVzY2VuZGFudHMoKSAmJiAh b2xkQ2hpbGQuaXNvbGF0ZXNCbGVuZGluZygpKSkKICAgICAgICAgZGlydHlBbmNlc3RvckNoYWlu SGFzQmxlbmRpbmdEZXNjZW5kYW50cygpOwogI2VuZGlmCi0KLSAgICByZXR1cm4gb2xkQ2hpbGQ7 CiB9CiAKIHZvaWQgUmVuZGVyTGF5ZXI6Omluc2VydE9ubHlUaGlzTGF5ZXIoKQpAQCAtNDcxLDcg KzQ2OSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6Omluc2VydE9ubHlUaGlzTGF5ZXIoKQogICAgICAg ICBSZW5kZXJMYXllciogcGFyZW50TGF5ZXIgPSByZW5kZXJlcigpLnBhcmVudCgpLT5lbmNsb3Np bmdMYXllcigpOwogICAgICAgICBBU1NFUlQocGFyZW50TGF5ZXIpOwogICAgICAgICBSZW5kZXJM YXllciogYmVmb3JlQ2hpbGQgPSBwYXJlbnRMYXllci0+cmVmbGVjdGlvbkxheWVyKCkgIT0gdGhp cyA/IHJlbmRlcmVyKCkucGFyZW50KCktPmZpbmROZXh0TGF5ZXIocGFyZW50TGF5ZXIsICZyZW5k ZXJlcigpKSA6IG51bGxwdHI7Ci0gICAgICAgIHBhcmVudExheWVyLT5hZGRDaGlsZCh0aGlzLCBi ZWZvcmVDaGlsZCk7CisgICAgICAgIHBhcmVudExheWVyLT5hZGRDaGlsZCgqdGhpcywgYmVmb3Jl Q2hpbGQpOwogICAgIH0KIAogICAgIC8vIFJlbW92ZSBhbGwgZGVzY2VuZGFudCBsYXllcnMgZnJv bSB0aGUgaGllcmFyY2h5IGFuZCBhZGQgdGhlbSB0byB0aGUgbmV3IHBvc2l0aW9uLgpAQCAtNTAx LDIwICs0OTksMjAgQEAgdm9pZCBSZW5kZXJMYXllcjo6cmVtb3ZlT25seVRoaXNMYXllcigpCiAg ICAgLy8gUmVtb3ZlIHRoZSBjaGlsZCByZWZsZWN0aW9uIGxheWVyIGJlZm9yZSBtb3Zpbmcgb3Ro ZXIgY2hpbGQgbGF5ZXJzLgogICAgIC8vIFRoZSByZWZsZWN0aW9uIGxheWVyIHNob3VsZCBub3Qg YmUgbW92ZWQgdG8gdGhlIHBhcmVudC4KICAgICBpZiAocmVmbGVjdGlvbigpKQotICAgICAgICBy ZW1vdmVDaGlsZChyZWZsZWN0aW9uTGF5ZXIoKSk7CisgICAgICAgIHJlbW92ZUNoaWxkKCpyZWZs ZWN0aW9uTGF5ZXIoKSk7CiAKICAgICAvLyBOb3cgd2FsayBvdXIga2lkcyBhbmQgcmVhdHRhY2gg dGhlbSB0byBvdXIgcGFyZW50LgogICAgIFJlbmRlckxheWVyKiBjdXJyZW50ID0gbV9maXJzdDsK ICAgICB3aGlsZSAoY3VycmVudCkgewogICAgICAgICBSZW5kZXJMYXllciogbmV4dCA9IGN1cnJl bnQtPm5leHRTaWJsaW5nKCk7Ci0gICAgICAgIHJlbW92ZUNoaWxkKGN1cnJlbnQpOwotICAgICAg ICBtX3BhcmVudC0+YWRkQ2hpbGQoY3VycmVudCwgbmV4dFNpYik7CisgICAgICAgIHJlbW92ZUNo aWxkKCpjdXJyZW50KTsKKyAgICAgICAgbV9wYXJlbnQtPmFkZENoaWxkKCpjdXJyZW50LCBuZXh0 U2liKTsKICAgICAgICAgY3VycmVudC0+c2V0UmVwYWludFN0YXR1cyhOZWVkc0Z1bGxSZXBhaW50 KTsKICAgICAgICAgY3VycmVudCA9IG5leHQ7CiAgICAgfQogCiAgICAgLy8gUmVtb3ZlIHVzIGZy b20gdGhlIHBhcmVudC4KLSAgICBtX3BhcmVudC0+cmVtb3ZlQ2hpbGQodGhpcyk7CisgICAgbV9w YXJlbnQtPnJlbW92ZUNoaWxkKCp0aGlzKTsKICAgICByZW5kZXJlcigpLmRlc3Ryb3lMYXllcigp OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu aCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCmluZGV4IGIzOTdhZmVk ZDMxMWMyOGE0ZTMxN2MwMTUzNGMwODFkN2FlMThkMmEuLjc2MjFkMTE2YTc5ODRlNmM0YmVkZTFm NjkyZWZjNWE2OGI5NmRhMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5o CkBAIC0xNjIsOCArMTYyLDggQEAgcHVibGljOgogICAgICAgICByZXR1cm4gY3VycjsKICAgICB9 CiAKLSAgICB2b2lkIGFkZENoaWxkKFJlbmRlckxheWVyKiBuZXdDaGlsZCwgUmVuZGVyTGF5ZXIq IGJlZm9yZUNoaWxkID0gbnVsbHB0cik7Ci0gICAgUmVuZGVyTGF5ZXIqIHJlbW92ZUNoaWxkKFJl bmRlckxheWVyKik7CisgICAgdm9pZCBhZGRDaGlsZChSZW5kZXJMYXllciYgbmV3Q2hpbGQsIFJl bmRlckxheWVyKiBiZWZvcmVDaGlsZCA9IG51bGxwdHIpOworICAgIHZvaWQgcmVtb3ZlQ2hpbGQo UmVuZGVyTGF5ZXImKTsKIAogICAgIHZvaWQgaW5zZXJ0T25seVRoaXNMYXllcigpOwogICAgIHZv aWQgcmVtb3ZlT25seVRoaXNMYXllcigpOwo=