183493 2018-03-08 20:04:41 -0800 RenderTreeBuilder::splitAnonymousBoxesAroundChild should take multicolumn spanners into account. 2018-03-09 11:14:29 -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 zalan oldest_to_newest 1405047 0 zalan 2018-03-08 20:04:41 -0800 when using beforeChild. 1405048 1 zalan 2018-03-08 20:07:03 -0800 <rdar://problem/38030461> 1405052 2 335388 zalan 2018-03-08 20:26:07 -0800 Created attachment 335388 Patch 1405240 3 335388 commit-queue 2018-03-09 11:14:28 -0800 Comment on attachment 335388 Patch Clearing flags on attachment: 335388 Committed r229474: <https://trac.webkit.org/changeset/229474> 1405241 4 commit-queue 2018-03-09 11:14:29 -0800 All reviewed patches have been landed. Closing bug. 335388 2018-03-08 20:26:07 -0800 2018-03-09 11:14:28 -0800 Patch bug-183493-20180308202606.patch text/plain 11811 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5Mjg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTk2MjhjZWQyZTA0YzUw MTc5NzZmMWY2NTZlZjMyNDI4ZDJkNDIyZS4uY2Y3ZDhlMmRlZTg4YjdmMWY3NDFiNTFlMTZlODJi ODYxMWZhODdlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE4LTAzLTA4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuZGVyVHJlZUJ1aWxkZXI6 OnNwbGl0QW5vbnltb3VzQm94ZXNBcm91bmRDaGlsZCBzaG91bGQgdGFrZSBtdWx0aWNvbHVtbiBz cGFubmVycyBpbnRvIGFjY291bnQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODM0OTMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM4MDMwNDYxPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE11bHRpY29s dW1uIHNwYW5uZXJzIGFyZSB0YWtlbiBvdXQgb2YgdGhlaXIgb3JpZ2luYWwgcG9zaXRpb24gYW5k IHBsYWNlZCBuZXh0CisgICAgICAgIHRvIGEgUmVuZGVyTXVsdGlDb2x1bW5TZXQuIHNwbGl0QW5v bnltb3VzQm94ZXNBcm91bmRDaGlsZCBuZWVkcyB0byBrbm93IHRoZSBvcmlnaW5hbCBwYXJlbnQg KGluIHRoZSByZW5kZXIgdHJlZSBjb250ZXh0KS4KKworICAgICAgICBUZXN0OiBmYXN0L211bHRp Y29sL2FkanVzdC1iZWZvcmVDaGlsZC1mb3Itc3Bhbm5lci1jcmFzaC5odG1sCisKKyAgICAgICAg KiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6OnNwbGl0QW5vbnltb3VzQm94ZXNBcm91bmRDaGlsZCk6 CisgICAgICAgICogcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmg6CisgICAg ICAgICogcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyQmxvY2suY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6OkJsb2NrOjphdHRhY2hJZ25vcmluZ0Nv bnRpbnVhdGlvbik6CisgICAgICAgICogcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWls ZGVyTXVsdGlDb2x1bW4uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6 Ok11bHRpQ29sdW1uOjphZGp1c3RCZWZvcmVDaGlsZEZvck11bHRpQ29sdW1uU3Bhbm5lcklmTmVl ZGVkKToKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJNdWx0 aUNvbHVtbi5oOgorICAgICAgICAqIHJlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRl clJ1YnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6OlJ1Ynk6Om1v dmVDaGlsZHJlbkludGVybmFsKToKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVy VHJlZUJ1aWxkZXJUYWJsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRl cjo6VGFibGU6OmF0dGFjaCk6CisKIDIwMTgtMDMtMDUgIEFudHRpIEtvaXZpc3RvICA8YW50dGlA YXBwbGUuY29tPgogCiAgICAgICAgIERvbid0IGludmFsaWRhdGUgYWxsIGNoaWxkcmVuIHdoZW4g ZG9pbmcgaW5zZXJ0aW9uL2RlbGV0aW9uIGluIHByZXNlbmNlIG9mIGJhY2t3YXJkIHBvc2l0aW9u YWwgc2VsZWN0b3JzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRp bmcvUmVuZGVyVHJlZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0 aW5nL1JlbmRlclRyZWVCdWlsZGVyLmNwcAppbmRleCA5NmZjODJkOTc0NTdiODhkNmY1YTIyYWM1 OGEwNThkNzMzNTEyMWQxLi5iNzFiMDQ1N2Y3YTRmZjFjYjFjYzA2MzRhZjg3MDMyYWI1YmQwMGEz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJl ZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5k ZXJUcmVlQnVpbGRlci5jcHAKQEAgLTM3LDYgKzM3LDcgQEAKICNpbmNsdWRlICJSZW5kZXJMaW5l QnJlYWsuaCIKICNpbmNsdWRlICJSZW5kZXJNYXRoTUxGZW5jZWQuaCIKICNpbmNsdWRlICJSZW5k ZXJNZW51TGlzdC5oIgorI2luY2x1ZGUgIlJlbmRlck11bHRpQ29sdW1uRmxvdy5oIgogI2luY2x1 ZGUgIlJlbmRlclJ1YnkuaCIKICNpbmNsdWRlICJSZW5kZXJSdWJ5QmFzZS5oIgogI2luY2x1ZGUg IlJlbmRlclJ1YnlSdW4uaCIKQEAgLTU5OSw4ICs2MDAsMTAgQEAgdm9pZCBSZW5kZXJUcmVlQnVp bGRlcjo6bWFrZUNoaWxkcmVuTm9uSW5saW5lKFJlbmRlckJsb2NrJiBwYXJlbnQsIFJlbmRlck9i amVjdCoKICAgICBwYXJlbnQucmVwYWludCgpOwogfQogCi1SZW5kZXJPYmplY3QqIFJlbmRlclRy ZWVCdWlsZGVyOjpzcGxpdEFub255bW91c0JveGVzQXJvdW5kQ2hpbGQoUmVuZGVyQm94JiBwYXJl bnQsIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQpCitSZW5kZXJPYmplY3QqIFJlbmRlclRyZWVC dWlsZGVyOjpzcGxpdEFub255bW91c0JveGVzQXJvdW5kQ2hpbGQoUmVuZGVyQm94JiBwYXJlbnQs IFJlbmRlck9iamVjdCYgb3JpZ2luYWxCZWZvcmVDaGlsZCkKIHsKKyAgICAvLyBBZGp1c3QgYmVm b3JlQ2hpbGQgaWYgaXQgaXMgYSBjb2x1bW4gc3Bhbm5lciBhbmQgaGFzIGJlZW4gbW92ZWQgb3V0 IG9mIGl0cyBvcmlnaW5hbCBwb3NpdGlvbi4KKyAgICBhdXRvKiBiZWZvcmVDaGlsZCA9IFJlbmRl clRyZWVCdWlsZGVyOjpNdWx0aUNvbHVtbjo6YWRqdXN0QmVmb3JlQ2hpbGRGb3JNdWx0aUNvbHVt blNwYW5uZXJJZk5lZWRlZChvcmlnaW5hbEJlZm9yZUNoaWxkKTsKICAgICBib29sIGRpZFNwbGl0 UGFyZW50QW5vbnltb3VzQm94ZXMgPSBmYWxzZTsKIAogICAgIHdoaWxlIChiZWZvcmVDaGlsZC0+ cGFyZW50KCkgIT0gJnBhcmVudCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXIuaAppbmRleCA1ZmI4NmY3NjZiYmNkM2Q3ZjJm YjJkN2Q4OGQxMzIxMGMzYjQ0N2I2Li41NTlkYTk0MGIzNmU2NGRkM2E4YmM5YTVhY2FmZGVjZTJm ZmQ4ZjI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVu ZGVyVHJlZUJ1aWxkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcv UmVuZGVyVHJlZUJ1aWxkZXIuaApAQCAtODAsNyArODAsNyBAQCBwcml2YXRlOgogICAgIHZvaWQg bW92ZUFsbENoaWxkcmVuKFJlbmRlckJveE1vZGVsT2JqZWN0JiBmcm9tLCBSZW5kZXJCb3hNb2Rl bE9iamVjdCYgdG8sIE5vcm1hbGl6ZUFmdGVySW5zZXJ0aW9uKTsKICAgICB2b2lkIG1vdmVBbGxD aGlsZHJlbihSZW5kZXJCb3hNb2RlbE9iamVjdCYgZnJvbSwgUmVuZGVyQm94TW9kZWxPYmplY3Qm IHRvLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkLCBOb3JtYWxpemVBZnRlckluc2VydGlvbik7 CiAKLSAgICBSZW5kZXJPYmplY3QqIHNwbGl0QW5vbnltb3VzQm94ZXNBcm91bmRDaGlsZChSZW5k ZXJCb3gmIHBhcmVudCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCk7CisgICAgUmVuZGVyT2Jq ZWN0KiBzcGxpdEFub255bW91c0JveGVzQXJvdW5kQ2hpbGQoUmVuZGVyQm94JiBwYXJlbnQsIFJl bmRlck9iamVjdCYgb3JpZ2luYWxCZWZvcmVDaGlsZCk7CiAgICAgdm9pZCBtYWtlQ2hpbGRyZW5O b25JbmxpbmUoUmVuZGVyQmxvY2smIHBhcmVudCwgUmVuZGVyT2JqZWN0KiBpbnNlcnRpb25Qb2lu dCA9IG51bGxwdHIpOwogICAgIHZvaWQgcmVtb3ZlQW5vbnltb3VzV3JhcHBlcnNGb3JJbmxpbmVD aGlsZHJlbklmTmVlZGVkKFJlbmRlckVsZW1lbnQmIHBhcmVudCk7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlckJsb2NrLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlckJs b2NrLmNwcAppbmRleCAwYWUzOWE2Yzk3NDc1Y2VkOTE2ZjUzNzljNDBiNzMxN2I2ZGY0NjE4Li43 OTczMDdjY2FjYzkwOWNkOTBlNmRkYThlYzRhZDliNWE0Njg3MGU2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJCbG9jay5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVy QmxvY2suY3BwCkBAIC0xOTMsNyArMTkzLDcgQEAgdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6Qmxv Y2s6OmF0dGFjaElnbm9yaW5nQ29udGludWF0aW9uKFJlbmRlckJsb2NrJiBwYXJlbnQsIFIKICAg ICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIGJlZm9y ZUNoaWxkID0gbV9idWlsZGVyLnNwbGl0QW5vbnltb3VzQm94ZXNBcm91bmRDaGlsZChwYXJlbnQs IGJlZm9yZUNoaWxkKTsKKyAgICAgICAgICAgIGJlZm9yZUNoaWxkID0gbV9idWlsZGVyLnNwbGl0 QW5vbnltb3VzQm94ZXNBcm91bmRDaGlsZChwYXJlbnQsICpiZWZvcmVDaGlsZCk7CiAKICAgICAg ICAgICAgIFJFTEVBU0VfQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oYmVmb3JlQ2hp bGQtPnBhcmVudCgpID09ICZwYXJlbnQpOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJNdWx0aUNvbHVtbi5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJN dWx0aUNvbHVtbi5jcHAKaW5kZXggNzg4ZjNjNjlkODI5NmVkYjA2NWI1ZDYzYjI2YWUyNDBlMmJi MjFmYi4uNzQwYzY0YTUwY2MxZGVjNjU1OWQwMTJjNTkyMTExY2NkZWIzZmQ5YyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyTXVs dGlDb2x1bW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5k ZXJUcmVlQnVpbGRlck11bHRpQ29sdW1uLmNwcApAQCAtNDA3LDQgKzQwNywyMyBAQCB2b2lkIFJl bmRlclRyZWVCdWlsZGVyOjpNdWx0aUNvbHVtbjo6bXVsdGlDb2x1bW5SZWxhdGl2ZVdpbGxCZVJl bW92ZWQoUmVuZGVyTXVsdAogICAgIC8vIGNvbnRlbnQgaXMgYWRkZWQgYWdhaW4gbGF0ZXIuCiB9 CiAKK1JlbmRlck9iamVjdCogUmVuZGVyVHJlZUJ1aWxkZXI6Ok11bHRpQ29sdW1uOjphZGp1c3RC ZWZvcmVDaGlsZEZvck11bHRpQ29sdW1uU3Bhbm5lcklmTmVlZGVkKFJlbmRlck9iamVjdCYgYmVm b3JlQ2hpbGQpCit7CisgICAgaWYgKCFpczxSZW5kZXJCb3g+KGJlZm9yZUNoaWxkKSkKKyAgICAg ICAgcmV0dXJuICZiZWZvcmVDaGlsZDsKKworICAgIGF1dG8qIG5leHRTaWJsaW5nID0gYmVmb3Jl Q2hpbGQubmV4dFNpYmxpbmcoKTsKKyAgICBpZiAoIW5leHRTaWJsaW5nKQorICAgICAgICByZXR1 cm4gJmJlZm9yZUNoaWxkOworCisgICAgaWYgKCFpczxSZW5kZXJNdWx0aUNvbHVtblNldD4oKm5l eHRTaWJsaW5nKSkKKyAgICAgICAgcmV0dXJuICZiZWZvcmVDaGlsZDsKKworICAgIGF1dG8qIG11 bHRpQ29sdW1uRmxvdyA9IGRvd25jYXN0PFJlbmRlck11bHRpQ29sdW1uU2V0PigqbmV4dFNpYmxp bmcpLm11bHRpQ29sdW1uRmxvdygpOworICAgIGlmICghbXVsdGlDb2x1bW5GbG93KQorICAgICAg ICByZXR1cm4gJmJlZm9yZUNoaWxkOworCisgICAgcmV0dXJuIG11bHRpQ29sdW1uRmxvdy0+Zmlu ZENvbHVtblNwYW5uZXJQbGFjZWhvbGRlcihkb3duY2FzdDxSZW5kZXJCb3g+KCZiZWZvcmVDaGls ZCkpOworfQorCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRp bmcvUmVuZGVyVHJlZUJ1aWxkZXJNdWx0aUNvbHVtbi5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyTXVsdGlDb2x1bW4uaAppbmRleCBiMTQ4YmM2 M2Y5NzgwOWY2NTlhOGQ3MDg5MGJiZTIwMjBiMGZjODZlLi41NjIxNjM3YjAzNWE0YmJkZjc5OGYz MGM1YThiNGQ2NGZjNjZmMTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv dXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJNdWx0aUNvbHVtbi5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlck11bHRpQ29sdW1uLmgKQEAg LTQzLDYgKzQzLDcgQEAgcHVibGljOgogICAgIFJlbmRlck9iamVjdCogcmVzb2x2ZU1vdmVkQ2hp bGQoUmVuZGVyRnJhZ21lbnRlZEZsb3cmIGVuY2xvc2luZ0ZyYWdtZW50ZWRGbG93LCBSZW5kZXJP YmplY3QqIGJlZm9yZUNoaWxkKTsKICAgICB2b2lkIG11bHRpQ29sdW1uRGVzY2VuZGFudEluc2Vy dGVkKFJlbmRlck11bHRpQ29sdW1uRmxvdyYsIFJlbmRlck9iamVjdCYgbmV3RGVzY2VuZGFudCk7 CiAgICAgdm9pZCBtdWx0aUNvbHVtblJlbGF0aXZlV2lsbEJlUmVtb3ZlZChSZW5kZXJNdWx0aUNv bHVtbkZsb3cmLCBSZW5kZXJPYmplY3QmIHJlbGF0aXZlKTsKKyAgICBzdGF0aWMgUmVuZGVyT2Jq ZWN0KiBhZGp1c3RCZWZvcmVDaGlsZEZvck11bHRpQ29sdW1uU3Bhbm5lcklmTmVlZGVkKFJlbmRl ck9iamVjdCYgYmVmb3JlQ2hpbGQpOwogCiBwcml2YXRlOgogICAgIHZvaWQgY3JlYXRlRnJhZ21l bnRlZEZsb3coUmVuZGVyQmxvY2tGbG93Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJSdWJ5LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclJ1YnkuY3BwCmluZGV4IDUx ODVlMjRlOGE2ZjBkNTVmZTQxMTg2MzQxODAzNWEwNWJhNTgwMDguLjU3YzIxNzFlN2RiYTFkZTky MjU2YjM2ZTM1NzkyODA4MDM3Y2ViZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclJ1YnkuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclJ1YnkuY3BwCkBAIC0xODMs NyArMTgzLDcgQEAgdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6UnVieTo6bW92ZUNoaWxkcmVuSW50 ZXJuYWwoUmVuZGVyUnVieUJhc2UmIGZyb20sIFJlbmRlclIKICAgICAvLyBUaGlzIGZ1bmN0aW9u IHJlbW92ZXMgYWxsIGNoaWxkcmVuIHRoYXQgYXJlIGJlZm9yZSAoISkgYmVmb3JlQ2hpbGQKICAg ICAvLyBhbmQgYXBwZW5kcyB0aGVtIHRvIHRvQmFzZS4KICAgICBpZiAoYmVmb3JlQ2hpbGQgJiYg YmVmb3JlQ2hpbGQtPnBhcmVudCgpICE9ICZmcm9tKQotICAgICAgICBiZWZvcmVDaGlsZCA9IG1f YnVpbGRlci5zcGxpdEFub255bW91c0JveGVzQXJvdW5kQ2hpbGQoZnJvbSwgYmVmb3JlQ2hpbGQp OworICAgICAgICBiZWZvcmVDaGlsZCA9IG1fYnVpbGRlci5zcGxpdEFub255bW91c0JveGVzQXJv dW5kQ2hpbGQoZnJvbSwgKmJlZm9yZUNoaWxkKTsKIAogICAgIGlmIChmcm9tLmNoaWxkcmVuSW5s aW5lKCkpCiAgICAgICAgIG1vdmVJbmxpbmVDaGlsZHJlbihmcm9tLCB0bywgYmVmb3JlQ2hpbGQp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRy ZWVCdWlsZGVyVGFibGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1Jl bmRlclRyZWVCdWlsZGVyVGFibGUuY3BwCmluZGV4IGM2YWM4MDhjM2ViZWQxMDU4MTFjM2E0NGNj Y2U5YTJhYWFjM2Q3M2EuLjI2ODkyYmNiYjg3YzI5ZDY5ZDAyZGM0YWMyYTRjYjdhNjk4MjU0YTMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVl QnVpbGRlclRhYmxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcv UmVuZGVyVHJlZUJ1aWxkZXJUYWJsZS5jcHAKQEAgLTE2NCw3ICsxNjQsNyBAQCBSZW5kZXJFbGVt ZW50JiBSZW5kZXJUcmVlQnVpbGRlcjo6VGFibGU6OmZpbmRPckNyZWF0ZVBhcmVudEZvckNoaWxk KFJlbmRlclRhYmxlJgogdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6VGFibGU6OmF0dGFjaChSZW5k ZXJUYWJsZVJvdyYgcGFyZW50LCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBjaGlsZCwgUmVuZGVy T2JqZWN0KiBiZWZvcmVDaGlsZCkKIHsKICAgICBpZiAoYmVmb3JlQ2hpbGQgJiYgYmVmb3JlQ2hp bGQtPnBhcmVudCgpICE9ICZwYXJlbnQpCi0gICAgICAgIGJlZm9yZUNoaWxkID0gbV9idWlsZGVy LnNwbGl0QW5vbnltb3VzQm94ZXNBcm91bmRDaGlsZChwYXJlbnQsIGJlZm9yZUNoaWxkKTsKKyAg ICAgICAgYmVmb3JlQ2hpbGQgPSBtX2J1aWxkZXIuc3BsaXRBbm9ueW1vdXNCb3hlc0Fyb3VuZENo aWxkKHBhcmVudCwgKmJlZm9yZUNoaWxkKTsKIAogICAgIGF1dG8mIG5ld0NoaWxkID0gKmNoaWxk LmdldCgpOwogICAgIEFTU0VSVCghYmVmb3JlQ2hpbGQgfHwgaXM8UmVuZGVyVGFibGVDZWxsPigq YmVmb3JlQ2hpbGQpKTsKQEAgLTE3Nyw3ICsxNzcsNyBAQCB2b2lkIFJlbmRlclRyZWVCdWlsZGVy OjpUYWJsZTo6YXR0YWNoKFJlbmRlclRhYmxlUm93JiBwYXJlbnQsIFJlbmRlclB0cjxSZW5kZXJP Ygogdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6VGFibGU6OmF0dGFjaChSZW5kZXJUYWJsZVNlY3Rp b24mIHBhcmVudCwgUmVuZGVyUHRyPFJlbmRlck9iamVjdD4gY2hpbGQsIFJlbmRlck9iamVjdCog YmVmb3JlQ2hpbGQpCiB7CiAgICAgaWYgKGJlZm9yZUNoaWxkICYmIGJlZm9yZUNoaWxkLT5wYXJl bnQoKSAhPSAmcGFyZW50KQotICAgICAgICBiZWZvcmVDaGlsZCA9IG1fYnVpbGRlci5zcGxpdEFu b255bW91c0JveGVzQXJvdW5kQ2hpbGQocGFyZW50LCBiZWZvcmVDaGlsZCk7CisgICAgICAgIGJl Zm9yZUNoaWxkID0gbV9idWlsZGVyLnNwbGl0QW5vbnltb3VzQm94ZXNBcm91bmRDaGlsZChwYXJl bnQsICpiZWZvcmVDaGlsZCk7CiAKICAgICAvLyBGSVhNRTogY2hpbGQgc2hvdWxkIGFsd2F5cyBi ZSBhIFJlbmRlclRhYmxlUm93IGF0IHRoaXMgcG9pbnQuCiAgICAgaWYgKGlzPFJlbmRlclRhYmxl Um93PigqY2hpbGQuZ2V0KCkpKQpAQCAtMTg5LDcgKzE4OSw3IEBAIHZvaWQgUmVuZGVyVHJlZUJ1 aWxkZXI6OlRhYmxlOjphdHRhY2goUmVuZGVyVGFibGVTZWN0aW9uJiBwYXJlbnQsIFJlbmRlclB0 cjxSZW5kCiB2b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpUYWJsZTo6YXR0YWNoKFJlbmRlclRhYmxl JiBwYXJlbnQsIFJlbmRlclB0cjxSZW5kZXJPYmplY3Q+IGNoaWxkLCBSZW5kZXJPYmplY3QqIGJl Zm9yZUNoaWxkKQogewogICAgIGlmIChiZWZvcmVDaGlsZCAmJiBiZWZvcmVDaGlsZC0+cGFyZW50 KCkgIT0gJnBhcmVudCkKLSAgICAgICAgYmVmb3JlQ2hpbGQgPSBtX2J1aWxkZXIuc3BsaXRBbm9u eW1vdXNCb3hlc0Fyb3VuZENoaWxkKHBhcmVudCwgYmVmb3JlQ2hpbGQpOworICAgICAgICBiZWZv cmVDaGlsZCA9IG1fYnVpbGRlci5zcGxpdEFub255bW91c0JveGVzQXJvdW5kQ2hpbGQocGFyZW50 LCAqYmVmb3JlQ2hpbGQpOwogCiAgICAgYXV0byYgbmV3Q2hpbGQgPSAqY2hpbGQuZ2V0KCk7CiAg ICAgaWYgKGlzPFJlbmRlclRhYmxlU2VjdGlvbj4obmV3Q2hpbGQpKQpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDRjMTY1ZGI0 MGMzNjdlNTFhZjRjMmNiNmFlYzdmN2I5YjRkNmY2OWUuLmEzYzg3ZjFkZmVmNDEzNjgyN2RkNWUy OTU1ZWNkODZkM2NlMDU3ZDUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxOC0wMy0wOCAgWmFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFJlbmRlclRyZWVCdWlsZGVy OjpzcGxpdEFub255bW91c0JveGVzQXJvdW5kQ2hpbGQgc2hvdWxkIHRha2UgbXVsdGljb2x1bW4g c3Bhbm5lcnMgaW50byBhY2NvdW50LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTgzNDkzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zODAzMDQ2MT4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3Qv bXVsdGljb2wvYWRqdXN0LWJlZm9yZUNoaWxkLWZvci1zcGFubmVyLWNyYXNoLWV4cGVjdGVkLnR4 dDogQWRkZWQuCisgICAgICAgICogZmFzdC9tdWx0aWNvbC9hZGp1c3QtYmVmb3JlQ2hpbGQtZm9y LXNwYW5uZXItY3Jhc2guaHRtbDogQWRkZWQuCisKIDIwMTgtMDMtMDUgIEFsaSBKdW1hICA8YWp1 bWFAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvaHRtbC9zZW1hbnRpY3MvdGV4dC1sZXZlbC1zZW1hbnRpY3MvdGhlLWEtZWxlbWVudC9hLWRv d25sb2FkLWNsaWNrLTQwNC5odG1sIHRpbWVzIG91dCB3aXRoIGFzeW5jIHBvbGljeSBkZWxlZ2F0 ZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvYWRqdXN0LWJlZm9yZUNo aWxkLWZvci1zcGFubmVyLWNyYXNoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvbXVs dGljb2wvYWRqdXN0LWJlZm9yZUNoaWxkLWZvci1zcGFubmVyLWNyYXNoLWV4cGVjdGVkLnR4dApu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi5hZTJlMzUyNWVhNGQwMDQxMDI4MDdmODQzZmIxZDVlOWQ2YTViOTljCi0tLSAv ZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9hZGp1c3QtYmVmb3JlQ2hp bGQtZm9yLXNwYW5uZXItY3Jhc2gtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEgQEAKK1Bhc3MgaWYg bm8gY3Jhc2guCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL2FkanVzdC1i ZWZvcmVDaGlsZC1mb3Itc3Bhbm5lci1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0 aWNvbC9hZGp1c3QtYmVmb3JlQ2hpbGQtZm9yLXNwYW5uZXItY3Jhc2guaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li4yNTRlNDBmYWY5Nzk5MDI4MWZhNWI1NGIzYTc0MTA3NWQwNDE0M2I0Ci0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9hZGp1c3QtYmVmb3JlQ2hpbGQtZm9yLXNw YW5uZXItY3Jhc2guaHRtbApAQCAtMCwwICsxLDE2IEBACis8c3R5bGU+CisuY29udGFpbmVyIHsg Y29sdW1uLWNvdW50OiAyOyB9CisuaW5zZXJ0ZWQgeyBjb2x1bW4tc3BhbjogYWxsOyB9Cis8L3N0 eWxlPgorCis8ZGl2IGNsYXNzPWNvbnRhaW5lcj48dGFibGUgaWQ9dGFibGU+PC90YWJsZT48L2Rp dj4KK1Bhc3MgaWYgbm8gY3Jhc2guCis8c2NyaXB0PgoraWYgKHdpbmRvdy50ZXN0UnVubmVyKQor ICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworbGV0IGQgPSBkb2N1bWVudC5jcmVhdGVFbGVt ZW50KCJkaXYiKTsKK2QuY2xhc3NOYW1lID0gImluc2VydGVkIjsKK3RhYmxlLmFwcGVuZENoaWxk KGQpOworZG9jdW1lbnQuYm9keS5vZmZzZXRIZWlnaHQ7Cit0YWJsZS5jcmVhdGVDYXB0aW9uKCk7 Cis8L3NjcmlwdD4K