197077 2019-04-18 15:44:25 -0700 Introduce the concept of "opportunistic" stacking contexts 2019-04-22 13:00:28 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1528630 0 simon.fraser 2019-04-18 15:44:25 -0700 Introduce the concept of "opportunistic" stacking contexts 1528632 1 367766 simon.fraser 2019-04-18 15:48:10 -0700 Created attachment 367766 Patch 1528636 2 zalan 2019-04-18 15:51:58 -0700 (In reply to Simon Fraser (smfr) from comment #0) > Introduce the concept of "opportunistic" stacking contexts How about facultative? I somehow think it's more descriptive! 1529344 3 simon.fraser 2019-04-22 12:59:52 -0700 https://trac.webkit.org/changeset/244509/webkit 1529345 4 webkit-bug-importer 2019-04-22 13:00:28 -0700 <rdar://problem/50104080> 367766 2019-04-18 15:48:10 -0700 2019-04-22 11:18:36 -0700 Patch bug-197077-20190418154809.patch text/plain 13024 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0NDM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTA0YWZhM2VlMTgyNTk3 NjA2OGFjMDEyZDFkNGRlOWMwNjkxZmZhMC4uYTMxOGI2MGY1ZjkwMGNiMjlmYjlkZDJhNjhjNDE1 ODFmZGQ1NDRlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDE5LTA0LTE4ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIEludHJvZHVjZSB0 aGUgY29uY2VwdCBvZiAib3Bwb3J0dW5pc3RpYyIgc3RhY2tpbmcgY29udGV4dHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NzA3NworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJyaW5nIGJhY2sgYSB2YXJp YW50IG9mIHNvbWUgY29kZSByZW1vdmVkIGluIHIyMzY0MjQsIHdoaWNoIGFsbG93cyBhIFJlbmRl ckxheWVyCisgICAgICAgIHRvIGJlIHN0YWNraW5nIGNvbnRleHQgZm9yIHBhaW50aW5nLCB3aXRo b3V0IGFjdHVhbGx5IGJlaW5nIG9uIGluIHRlcm1zIG9mIENTUy4KKyAgICAgICAgCisgICAgICAg IEludGVybmFsbHksIFJlbmRlckxheWVyIHdpbGwgY2FsbCBzZXRJc09wcG9ydHVuaXN0aWNTdGFj a2luZ0NvbnRleHQoKSB0byBtYWtlIGEgbGF5ZXIKKyAgICAgICAgaW50byBhIHN0YWNraW5nIGNv bnRleHQgZm9yIHBhaW50aW5nLiBFeHRlcm5hbCBjYWxsZXJzIGRlYWwgd2l0aCBpc1N0YWNraW5n Q29udGV4dCgpCisgICAgICAgIG9yIGlzQ1NTU3RhY2tpbmdDb250ZXh0KCkuCisKKyAgICAgICAg U2FkbHkgd2UgY2FuJ3QgbWFrZSBtX2ZvcmNlZFN0YWNraW5nQ29udGV4dCAoc2V0IG9uIG1lZGlh IGVsZW1lbnQgbGF5ZXJzKSB0cmlnZ2VyIGEKKyAgICAgICAgbm9uLUNTUyBzdGFja2luZyBjb250 ZXh0OyBtZWRpYSBjb250cm9scyB1c2UgbWl4LWJsZW5kLW1vZGUsIGFuZCByZWx5IG9uIHRoZSBm YWtlLXN0YWNraW5nCisgICAgICAgIG1lZGlhIGxheWVyIHRvIGJlIHRoZSAiaXNvbGF0ZUJsZW5k aW5nIiBhbmNlc3Rvci4KKworICAgICAgICBObyBjb2RlIHVzZXMgdGhpcyB5ZXQuCisKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXI6OlJlbmRlckxheWVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzaG91 bGRCZUNTU1N0YWNraW5nQ29udGV4dCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllcjo6aXNTdGFja2luZ0NvbnRleHRDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckxheWVyOjpzZXRJc09wcG9ydHVuaXN0aWNTdGFja2luZ0NvbnRleHQpOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyTGF5ZXI6OnNldElzQ1NTU3RhY2tpbmdDb250ZXh0KToKKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckxheWVyOjp1cGRhdGVBbmNlc3RvckNoYWluSGFzQmxlbmRpbmdEZXNjZW5k YW50cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6ZGlydHlBbmNlc3RvckNoYWlu SGFzQmxlbmRpbmdEZXNjZW5kYW50cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6 YmVnaW5UcmFuc3BhcmVuY3lMYXllcnMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6 OmNhbGN1bGF0ZUNsaXBSZWN0cyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpvdXRwdXRQYWlu dE9yZGVyVHJlZUxlZ2VuZCk6CisgICAgICAgIChXZWJDb3JlOjpvdXRwdXRQYWludE9yZGVyVHJl ZVJlY3Vyc2l2ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c2hvdWxkQmVTdGFj a2luZ0NvbnRleHQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5 ZXI6OnNldElzU3RhY2tpbmdDb250ZXh0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXIuaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6Y29tcG9zaXRpbmdPcGFj aXR5IGNvbnN0KToKKwogMjAxOS0wNC0xOCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIFJlZ3Jlc3Npb24gKHIyNDQyOTEpOiBCcm9rZW4gQVBJIFRlc3QgQXV0b0xh eW91dFJlbmRlcmluZ1Byb2dyZXNzUmVsYXRpdmVPcmRlcmluZwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggMzE2NDVhZWZlYTBkZDY5YWI0ODM0ODFiN2FiY2Q4 NDhmZmEyYjY1Mi4uNGViNzAxZjIzMjgxYmU0M2I3YWQ1NmZlZjYzODlmZjUyZjZlZjlkZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0yNzEsNiArMjcxLDcg QEAgdm9pZCBtYWtlTWF0cml4UmVuZGVyYWJsZShUcmFuc2Zvcm1hdGlvbk1hdHJpeCYgbWF0cml4 LCBib29sIGhhczNEUmVuZGVyaW5nKQogUmVuZGVyTGF5ZXI6OlJlbmRlckxheWVyKFJlbmRlckxh eWVyTW9kZWxPYmplY3QmIHJlbmRlcmVyTGF5ZXJNb2RlbE9iamVjdCkKICAgICA6IG1faXNSZW5k ZXJWaWV3TGF5ZXIocmVuZGVyZXJMYXllck1vZGVsT2JqZWN0LmlzUmVuZGVyVmlldygpKQogICAg ICwgbV9mb3JjZWRTdGFja2luZ0NvbnRleHQocmVuZGVyZXJMYXllck1vZGVsT2JqZWN0LmlzTWVk aWEoKSkKKyAgICAsIG1faXNPcHBvcnR1bmlzdGljU3RhY2tpbmdDb250ZXh0KGZhbHNlKQogICAg ICwgbV96T3JkZXJMaXN0c0RpcnR5KGZhbHNlKQogICAgICwgbV9ub3JtYWxGbG93TGlzdERpcnR5 KHRydWUpCiAgICAgLCBtX2hhZE5lZ2F0aXZlWk9yZGVyTGlzdChmYWxzZSkKQEAgLTMxNyw3ICsz MTgsNyBAQCBSZW5kZXJMYXllcjo6UmVuZGVyTGF5ZXIoUmVuZGVyTGF5ZXJNb2RlbE9iamVjdCYg cmVuZGVyZXJMYXllck1vZGVsT2JqZWN0KQogICAgICwgbV9yZW5kZXJlcihyZW5kZXJlckxheWVy TW9kZWxPYmplY3QpCiB7CiAgICAgc2V0SXNOb3JtYWxGbG93T25seShzaG91bGRCZU5vcm1hbEZs b3dPbmx5KCkpOwotICAgIHNldElzU3RhY2tpbmdDb250ZXh0KHNob3VsZEJlU3RhY2tpbmdDb250 ZXh0KCkpOworICAgIHNldElzQ1NTU3RhY2tpbmdDb250ZXh0KHNob3VsZEJlQ1NTU3RhY2tpbmdD b250ZXh0KCkpOwogCiAgICAgbV9pc1NlbGZQYWludGluZ0xheWVyID0gc2hvdWxkQmVTZWxmUGFp bnRpbmdMYXllcigpOwogCkBAIC01NjAsOSArNTYxLDkgQEAgYm9vbCBSZW5kZXJMYXllcjo6c2hv dWxkQmVOb3JtYWxGbG93T25seSgpIGNvbnN0CiAgICAgICAgIHx8IHJlbmRlcmVyKCkuaXNJbkZs b3dSZW5kZXJGcmFnbWVudGVkRmxvdygpOwogfQogCi1ib29sIFJlbmRlckxheWVyOjpzaG91bGRC ZVN0YWNraW5nQ29udGV4dCgpIGNvbnN0Citib29sIFJlbmRlckxheWVyOjpzaG91bGRCZUNTU1N0 YWNraW5nQ29udGV4dCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuICFyZW5kZXJlcigpLnN0eWxlKCku aGFzQXV0b1pJbmRleCgpIHx8IGlzUmVuZGVyVmlld0xheWVyKCkgfHwgaXNGb3JjZWRTdGFja2lu Z0NvbnRleHQoKTsKKyAgICByZXR1cm4gIXJlbmRlcmVyKCkuc3R5bGUoKS5oYXNBdXRvWkluZGV4 KCkgfHwgaXNSZW5kZXJWaWV3TGF5ZXIoKTsKIH0KIAogYm9vbCBSZW5kZXJMYXllcjo6c2V0SXNO b3JtYWxGbG93T25seShib29sIGlzTm9ybWFsRmxvd09ubHkpCkBAIC01NzgsMTkgKzU3OSwzNCBA QCBib29sIFJlbmRlckxheWVyOjpzZXRJc05vcm1hbEZsb3dPbmx5KGJvb2wgaXNOb3JtYWxGbG93 T25seSkKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBSZW5kZXJMYXllcjo6c2V0SXNTdGFj a2luZ0NvbnRleHQoYm9vbCBpc1N0YWNraW5nQ29udGV4dCkKK3ZvaWQgUmVuZGVyTGF5ZXI6Omlz U3RhY2tpbmdDb250ZXh0Q2hhbmdlZCgpCiB7Ci0gICAgaWYgKGlzU3RhY2tpbmdDb250ZXh0ID09 IG1faXNTdGFja2luZ0NvbnRleHQpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAKLSAgICBt X2lzU3RhY2tpbmdDb250ZXh0ID0gaXNTdGFja2luZ0NvbnRleHQ7Ci0KICAgICBkaXJ0eVN0YWNr aW5nQ29udGV4dFpPcmRlckxpc3RzKCk7Ci0gICAgaWYgKGlzU3RhY2tpbmdDb250ZXh0KQorICAg IGlmIChpc1N0YWNraW5nQ29udGV4dCgpKQogICAgICAgICBkaXJ0eVpPcmRlckxpc3RzKCk7CiAg ICAgZWxzZQogICAgICAgICBjbGVhclpPcmRlckxpc3RzKCk7Cit9CisKK2Jvb2wgUmVuZGVyTGF5 ZXI6OnNldElzT3Bwb3J0dW5pc3RpY1N0YWNraW5nQ29udGV4dChib29sIGlzU3RhY2tpbmcpCit7 CisgICAgYm9vbCB3YXNTdGFja2luZyA9IGlzU3RhY2tpbmdDb250ZXh0KCk7CisgICAgbV9pc09w cG9ydHVuaXN0aWNTdGFja2luZ0NvbnRleHQgPSBpc1N0YWNraW5nOworICAgIGlmICh3YXNTdGFj a2luZyA9PSBpc1N0YWNraW5nQ29udGV4dCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAg ICBpc1N0YWNraW5nQ29udGV4dENoYW5nZWQoKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKworYm9v bCBSZW5kZXJMYXllcjo6c2V0SXNDU1NTdGFja2luZ0NvbnRleHQoYm9vbCBpc0NTU1N0YWNraW5n Q29udGV4dCkKK3sKKyAgICBib29sIHdhc1N0YWNraW5nID0gaXNTdGFja2luZ0NvbnRleHQoKTsK KyAgICBtX2lzQ1NTU3RhY2tpbmdDb250ZXh0ID0gaXNDU1NTdGFja2luZ0NvbnRleHQ7CisgICAg aWYgKHdhc1N0YWNraW5nID09IGlzU3RhY2tpbmdDb250ZXh0KCkpCisgICAgICAgIHJldHVybiBm YWxzZTsKIAorICAgIGlzU3RhY2tpbmdDb250ZXh0Q2hhbmdlZCgpOwogICAgIHJldHVybiB0cnVl OwogfQogCkBAIC0xMTM1LDcgKzExNTEsNyBAQCB2b2lkIFJlbmRlckxheWVyOjp1cGRhdGVBbmNl c3RvckNoYWluSGFzQmxlbmRpbmdEZXNjZW5kYW50cygpCiAKICAgICAgICAgbGF5ZXItPnVwZGF0 ZVNlbGZQYWludGluZ0xheWVyKCk7CiAKLSAgICAgICAgaWYgKGxheWVyLT5pc1N0YWNraW5nQ29u dGV4dCgpKQorICAgICAgICBpZiAobGF5ZXItPmlzQ1NTU3RhY2tpbmdDb250ZXh0KCkpCiAgICAg ICAgICAgICBicmVhazsKICAgICB9CiB9CkBAIC0xMTQ4LDcgKzExNjQsNyBAQCB2b2lkIFJlbmRl ckxheWVyOjpkaXJ0eUFuY2VzdG9yQ2hhaW5IYXNCbGVuZGluZ0Rlc2NlbmRhbnRzKCkKICAgICAg ICAgCiAgICAgICAgIGxheWVyLT5tX2hhc05vdElzb2xhdGVkQmxlbmRpbmdEZXNjZW5kYW50c1N0 YXR1c0RpcnR5ID0gdHJ1ZTsKIAotICAgICAgICBpZiAobGF5ZXItPmlzU3RhY2tpbmdDb250ZXh0 KCkpCisgICAgICAgIGlmIChsYXllci0+aXNDU1NTdGFja2luZ0NvbnRleHQoKSkKICAgICAgICAg ICAgIGJyZWFrOwogICAgIH0KIH0KQEAgLTE5NzksNyArMTk5NSw3IEBAIHZvaWQgUmVuZGVyTGF5 ZXI6OmJlZ2luVHJhbnNwYXJlbmN5TGF5ZXJzKEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29u c3QgTGF5ZXJQCiAgICAgICAgIGFuY2VzdG9yLT5iZWdpblRyYW5zcGFyZW5jeUxheWVycyhjb250 ZXh0LCBwYWludGluZ0luZm8sIGRpcnR5UmVjdCk7CiAgICAgCiAgICAgaWYgKHBhaW50c1dpdGhU cmFuc3BhcmVuY3kocGFpbnRpbmdJbmZvLnBhaW50QmVoYXZpb3IpKSB7Ci0gICAgICAgIEFTU0VS VChpc1N0YWNraW5nQ29udGV4dCgpKTsKKyAgICAgICAgQVNTRVJUKGlzQ1NTU3RhY2tpbmdDb250 ZXh0KCkpOwogICAgICAgICBtX3VzZWRUcmFuc3BhcmVuY3kgPSB0cnVlOwogICAgICAgICBjb250 ZXh0LnNhdmUoKTsKICAgICAgICAgTGF5b3V0UmVjdCBhZGp1c3RlZENsaXBSZWN0ID0gcGFpbnRp bmdFeHRlbnQoKnRoaXMsIHBhaW50aW5nSW5mby5yb290TGF5ZXIsIGRpcnR5UmVjdCwgcGFpbnRp bmdJbmZvLnBhaW50QmVoYXZpb3IpOwpAQCAtNjM2NCwxMCArNjM4MCwxMCBAQCB2b2lkIFJlbmRl ckxheWVyOjpzdHlsZUNoYW5nZWQoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlbmRlclN0 eWxlKiBvbGRTdHlsZQogewogICAgIHNldElzTm9ybWFsRmxvd09ubHkoc2hvdWxkQmVOb3JtYWxG bG93T25seSgpKTsKIAotICAgIGlmIChzZXRJc1N0YWNraW5nQ29udGV4dChzaG91bGRCZVN0YWNr aW5nQ29udGV4dCgpKSkgeworICAgIGlmIChzZXRJc0NTU1N0YWNraW5nQ29udGV4dChzaG91bGRC ZUNTU1N0YWNraW5nQ29udGV4dCgpKSkgewogI2lmIEVOQUJMRShDU1NfQ09NUE9TSVRJTkcpCiAg ICAgICAgIGlmIChwYXJlbnQoKSkgewotICAgICAgICAgICAgaWYgKGlzU3RhY2tpbmdDb250ZXh0 KCkpIHsKKyAgICAgICAgICAgIGlmIChpc0NTU1N0YWNraW5nQ29udGV4dCgpKSB7CiAgICAgICAg ICAgICAgICAgaWYgKCFoYXNOb3RJc29sYXRlZEJsZW5kaW5nRGVzY2VuZGFudHNTdGF0dXNEaXJ0 eSgpICYmIGhhc05vdElzb2xhdGVkQmxlbmRpbmdEZXNjZW5kYW50cygpKQogICAgICAgICAgICAg ICAgICAgICBwYXJlbnQoKS0+ZGlydHlBbmNlc3RvckNoYWluSGFzQmxlbmRpbmdEZXNjZW5kYW50 cygpOwogICAgICAgICAgICAgfSBlbHNlIHsKQEAgLTY3NTUsNyArNjc3MSw3IEBAIHZvaWQgc2hv d0xheWVyVHJlZShjb25zdCBXZWJDb3JlOjpSZW5kZXJPYmplY3QqIHJlbmRlcmVyKQogc3RhdGlj IHZvaWQgb3V0cHV0UGFpbnRPcmRlclRyZWVMZWdlbmQoVGV4dFN0cmVhbSYgc3RyZWFtKQogewog ICAgIHN0cmVhbS5uZXh0TGluZSgpOwotICAgIHN0cmVhbSA8PCAiKFMpdGFja2luZyBDb250ZXh0 LCAoTilvcm1hbCBmbG93IG9ubHksIChPKXZlcmZsb3cgY2xpcCwgKEEpbHBoYSAob3BhY2l0eSBv ciBtYXNrKSwgaGFzIChCKWxlbmQgbW9kZSwgKEkpc29sYXRlcyBibGVuZGluZywgKFQpcmFuc2Zv cm0taXNoLCAoRilpbHRlciwgRmkoWCllZCBwb3NpdGlvbiwgKEMpb21wb3NpdGVkLCAoYylvbXBv c2l0ZWQgZGVzY2VuZGFudCwgKHMpc2Nyb2xsaW5nIGFuY2VzdG9yXG4iCisgICAgc3RyZWFtIDw8 ICIoUyl0YWNraW5nIENvbnRleHQvKEYpb3JjZWQgU0MvTyhQKXBvcnR1bmlzdGljIFNDLCAoTilv cm1hbCBmbG93IG9ubHksIChPKXZlcmZsb3cgY2xpcCwgKEEpbHBoYSAob3BhY2l0eSBvciBtYXNr KSwgaGFzIChCKWxlbmQgbW9kZSwgKEkpc29sYXRlcyBibGVuZGluZywgKFQpcmFuc2Zvcm0taXNo LCAoRilpbHRlciwgRmkoWCllZCBwb3NpdGlvbiwgKEMpb21wb3NpdGVkLCAoYylvbXBvc2l0ZWQg ZGVzY2VuZGFudCwgKHMpc2Nyb2xsaW5nIGFuY2VzdG9yXG4iCiAgICAgICAgICJEaXJ0eSAoeikt bGlzdHMsIERpcnR5IChuKW9ybWFsIGZsb3cgbGlzdHNcbiIKICAgICAgICAgIlRyYXZlcnNhbCBu ZWVkczogcmVxdWlyZW1lbnRzICh0KXJhdmVyc2FsIG9uIGRlc2NlbmRhbnRzLCAoYilhY2tpbmcg b3IgaGllcmFyY2h5IHRyYXZlcnNhbCBvbiBkZXNjZW5kYW50cywgKHIpZXF1aXJlbWVudHMgdHJh dmVyc2FsIG9uIGFsbCBkZXNjZW5kYW50cywgcmVxdWlyZW1lbnRzIHRyYXZlcnNhbCBvbiBhbGwg KHMpdWJzZXF1ZW50IGxheWVycywgKGgpaWVyYXJjaHkgdHJhdmVyc2FsIG9uIGFsbCBkZXNjZW5k YW50cywgdXBkYXRlIG9mIHBhaW50IChvKXJkZXIgY2hpbGRyZW5cbiIKICAgICAgICAgIlVwZGF0 ZSBuZWVkczogICAgcG9zdC0obClheW91dCByZXF1aXJlbWVudHMsIChnKWVvbWV0cnksIChrKWlk cyBnZW9tZXRyeSwgKGMpb25maWcsIGxheWVyIGNvbm5lKHgpaW9uLCAocyljcm9sbGluZyB0cmVl XG4iOwpAQCAtNjc3MSw3ICs2Nzg3LDcgQEAgc3RhdGljIHZvaWQgb3V0cHV0SWRlbnQoVGV4dFN0 cmVhbSYgc3RyZWFtLCB1bnNpZ25lZCBkZXB0aCkKIAogc3RhdGljIHZvaWQgb3V0cHV0UGFpbnRP cmRlclRyZWVSZWN1cnNpdmUoVGV4dFN0cmVhbSYgc3RyZWFtLCBjb25zdCBXZWJDb3JlOjpSZW5k ZXJMYXllciYgbGF5ZXIsIGNvbnN0IGNoYXIqIHByZWZpeCwgdW5zaWduZWQgZGVwdGggPSAwKQog ewotICAgIHN0cmVhbSA8PCAobGF5ZXIuaXNTdGFja2luZ0NvbnRleHQoKSA/ICJTIiA6ICItIik7 CisgICAgc3RyZWFtIDw8IChsYXllci5pc0NTU1N0YWNraW5nQ29udGV4dCgpID8gIlMiIDogKGxh eWVyLmlzRm9yY2VkU3RhY2tpbmdDb250ZXh0KCkgPyAiRiIgOiAobGF5ZXIuaXNPcHBvcnR1bmlz dGljU3RhY2tpbmdDb250ZXh0KCkgPyAiUCIgOiAiLSIpKSk7CiAgICAgc3RyZWFtIDw8IChsYXll ci5pc05vcm1hbEZsb3dPbmx5KCkgPyAiTiIgOiAiLSIpOwogICAgIHN0cmVhbSA8PCAobGF5ZXIu cmVuZGVyZXIoKS5oYXNPdmVyZmxvd0NsaXAoKSA/ICJPIiA6ICItIik7CiAgICAgc3RyZWFtIDw8 IChsYXllci5pc1RyYW5zcGFyZW50KCkgPyAiQSIgOiAiLSIpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXIuaAppbmRleCA5MDc0OGZiNjZjOWM2MWNhNGQ1MzBhYTBkOTgzOWJiOWQ2 ZmQ1YTkwLi43YWFkMTk2MTQ3M2VmMjVjMWVhZTA4MTE1YjFhMjcyYjdiMjY4MmZjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtMTY2LDcgKzE2NiwxNSBAQCBwdWJs aWM6CiAgICAgdm9pZCByZW1vdmVPbmx5VGhpc0xheWVyKCk7CiAKICAgICBib29sIGlzTm9ybWFs Rmxvd09ubHkoKSBjb25zdCB7IHJldHVybiBtX2lzTm9ybWFsRmxvd09ubHk7IH0KLSAgICBib29s IGlzU3RhY2tpbmdDb250ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9pc1N0YWNraW5nQ29udGV4dDsg fQorCisgICAgLy8gaXNTdGFja2luZ0NvbnRleHQgaXMgdHJ1ZSBmb3IgbGF5ZXJzIHRoYXQgd2Un dmUgZGV0ZXJtaW5lZCBzaG91bGQgYmUgc3RhY2tpbmcgY29udGV4dHMgZm9yIHBhaW50aW5nLgor ICAgIC8vIE5vdCBhbGwgc3RhY2tpbmcgY29udGV4dHMgYXJlIENTUyBzdGFja2luZyBjb250ZXh0 cy4KKyAgICBib29sIGlzU3RhY2tpbmdDb250ZXh0KCkgY29uc3QgeyByZXR1cm4gaXNDU1NTdGFj a2luZ0NvbnRleHQoKSB8fCBtX2lzT3Bwb3J0dW5pc3RpY1N0YWNraW5nQ29udGV4dDsgfQorCisg ICAgLy8gaXNDU1NTdGFja2luZ0NvbnRleHQgaXMgdHJ1ZSBmb3IgbGF5ZXJzIHRoYXQgYXJlIHN0 YWNraW5nIGNvbnRleHRzIGZyb20gYSBDU1MgcGVyc3BlY3RpdmUuCisgICAgLy8gaXNDU1NTdGFj a2luZ0NvbnRleHQoKSA9PiBpc1N0YWNraW5nQ29udGV4dCgpLgorICAgIC8vIEZJWE1FOiBtX2Zv cmNlZFN0YWNraW5nQ29udGV4dCBzaG91bGQgYWZmZWN0IGlzU3RhY2tpbmdDb250ZXh0KCksIG5v dCBpc0NTU1N0YWNraW5nQ29udGV4dCgpLCBidXQgZG9pbmcgc28gYnJlYWtzIG1lZGlhIGNvbnRy b2wgbWl4LWJsZW5kLW1vZGUuCisgICAgYm9vbCBpc0NTU1N0YWNraW5nQ29udGV4dCgpIGNvbnN0 IHsgcmV0dXJuIG1faXNDU1NTdGFja2luZ0NvbnRleHQgfHwgbV9mb3JjZWRTdGFja2luZ0NvbnRl eHQ7IH0KIAogICAgIC8vIEdldHMgdGhlIGVuY2xvc2luZyBzdGFja2luZyBjb250ZXh0IGZvciB0 aGlzIGxheWVyLCBleGNsdWRpbmcgdGhpcyBsYXllciBpdHNlbGYuCiAgICAgUmVuZGVyTGF5ZXIq IHN0YWNraW5nQ29udGV4dCgpIGNvbnN0OwpAQCAtNTAwLDYgKzUwOCw3IEBAIHB1YmxpYzoKIAog ICAgIGJvb2wgaXNSZW5kZXJWaWV3TGF5ZXIoKSBjb25zdCB7IHJldHVybiBtX2lzUmVuZGVyVmll d0xheWVyOyB9CiAgICAgYm9vbCBpc0ZvcmNlZFN0YWNraW5nQ29udGV4dCgpIGNvbnN0IHsgcmV0 dXJuIG1fZm9yY2VkU3RhY2tpbmdDb250ZXh0OyB9CisgICAgYm9vbCBpc09wcG9ydHVuaXN0aWNT dGFja2luZ0NvbnRleHQoKSBjb25zdCB7IHJldHVybiBtX2lzT3Bwb3J0dW5pc3RpY1N0YWNraW5n Q29udGV4dDsgfQogCiAgICAgUmVuZGVyTGF5ZXJDb21wb3NpdG9yJiBjb21wb3NpdG9yKCkgY29u c3Q7CiAgICAgCkBAIC03ODEsMTQgKzc5MCwxNCBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYXNCbGVu ZE1vZGUoKSBjb25zdCB7IHJldHVybiByZW5kZXJlcigpLmhhc0JsZW5kTW9kZSgpOyB9CiAgICAg QmxlbmRNb2RlIGJsZW5kTW9kZSgpIGNvbnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PEJsZW5kTW9k ZT4obV9ibGVuZE1vZGUpOyB9CiAKLSAgICBib29sIGlzb2xhdGVzQ29tcG9zaXRlZEJsZW5kaW5n KCkgY29uc3QgeyByZXR1cm4gbV9oYXNOb3RJc29sYXRlZENvbXBvc2l0ZWRCbGVuZGluZ0Rlc2Nl bmRhbnRzICYmIGlzU3RhY2tpbmdDb250ZXh0KCk7IH0KKyAgICBib29sIGlzb2xhdGVzQ29tcG9z aXRlZEJsZW5kaW5nKCkgY29uc3QgeyByZXR1cm4gbV9oYXNOb3RJc29sYXRlZENvbXBvc2l0ZWRC bGVuZGluZ0Rlc2NlbmRhbnRzICYmIGlzQ1NTU3RhY2tpbmdDb250ZXh0KCk7IH0KICAgICBib29s IGhhc05vdElzb2xhdGVkQ29tcG9zaXRlZEJsZW5kaW5nRGVzY2VuZGFudHMoKSBjb25zdCB7IHJl dHVybiBtX2hhc05vdElzb2xhdGVkQ29tcG9zaXRlZEJsZW5kaW5nRGVzY2VuZGFudHM7IH0KICAg ICB2b2lkIHNldEhhc05vdElzb2xhdGVkQ29tcG9zaXRlZEJsZW5kaW5nRGVzY2VuZGFudHMoYm9v bCBoYXNOb3RJc29sYXRlZENvbXBvc2l0ZWRCbGVuZGluZ0Rlc2NlbmRhbnRzKQogICAgIHsKICAg ICAgICAgbV9oYXNOb3RJc29sYXRlZENvbXBvc2l0ZWRCbGVuZGluZ0Rlc2NlbmRhbnRzID0gaGFz Tm90SXNvbGF0ZWRDb21wb3NpdGVkQmxlbmRpbmdEZXNjZW5kYW50czsKICAgICB9CiAKLSAgICBi b29sIGlzb2xhdGVzQmxlbmRpbmcoKSBjb25zdCB7IHJldHVybiBoYXNOb3RJc29sYXRlZEJsZW5k aW5nRGVzY2VuZGFudHMoKSAmJiBpc1N0YWNraW5nQ29udGV4dCgpOyB9CisgICAgYm9vbCBpc29s YXRlc0JsZW5kaW5nKCkgY29uc3QgeyByZXR1cm4gaGFzTm90SXNvbGF0ZWRCbGVuZGluZ0Rlc2Nl bmRhbnRzKCkgJiYgaXNDU1NTdGFja2luZ0NvbnRleHQoKTsgfQogICAgIAogICAgIC8vIEZJWE1F OiBXZSBzaG91bGQgQVNTRVJUKCFtX2hhc05vdElzb2xhdGVkQmxlbmRpbmdEZXNjZW5kYW50c1N0 YXR1c0RpcnR5KTsgaGVyZSBidXQgd2UgaGl0IHRoZSBzYW1lIGJ1Z3MgYXMgdmlzaWJsZSBjb250 ZW50IGFib3ZlLgogICAgIGJvb2wgaGFzTm90SXNvbGF0ZWRCbGVuZGluZ0Rlc2NlbmRhbnRzKCkg Y29uc3QgeyByZXR1cm4gbV9oYXNOb3RJc29sYXRlZEJsZW5kaW5nRGVzY2VuZGFudHM7IH0KQEAg LTg4MiwxMSArODkxLDE1IEBAIHByaXZhdGU6CiAgICAgdm9pZCBkaXJ0eVBhaW50T3JkZXJMaXN0 c09uQ2hpbGRDaGFuZ2UoUmVuZGVyTGF5ZXImKTsKIAogICAgIGJvb2wgc2hvdWxkQmVOb3JtYWxG bG93T25seSgpIGNvbnN0OwotICAgIGJvb2wgc2hvdWxkQmVTdGFja2luZ0NvbnRleHQoKSBjb25z dDsKLSAgICAKKyAgICBib29sIHNob3VsZEJlQ1NTU3RhY2tpbmdDb250ZXh0KCkgY29uc3Q7CisK ICAgICAvLyBSZXR1cm4gdHJ1ZSBpZiBjaGFuZ2VkLgogICAgIGJvb2wgc2V0SXNOb3JtYWxGbG93 T25seShib29sKTsKLSAgICBib29sIHNldElzU3RhY2tpbmdDb250ZXh0KGJvb2wpOworCisgICAg Ym9vbCBzZXRJc09wcG9ydHVuaXN0aWNTdGFja2luZ0NvbnRleHQoYm9vbCk7CisgICAgYm9vbCBz ZXRJc0NTU1N0YWNraW5nQ29udGV4dChib29sKTsKKyAgICAKKyAgICB2b2lkIGlzU3RhY2tpbmdD b250ZXh0Q2hhbmdlZCgpOwogCiAgICAgYm9vbCBpc0RpcnR5U3RhY2tpbmdDb250ZXh0KCkgY29u c3QgeyByZXR1cm4gbV96T3JkZXJMaXN0c0RpcnR5ICYmIGlzU3RhY2tpbmdDb250ZXh0KCk7IH0K IApAQCAtMTE2OSw3ICsxMTgyLDggQEAgcHJpdmF0ZToKICAgICBjb25zdCBib29sIG1fZm9yY2Vk U3RhY2tpbmdDb250ZXh0IDogMTsKIAogICAgIGJvb2wgbV9pc05vcm1hbEZsb3dPbmx5IDogMTsK LSAgICBib29sIG1faXNTdGFja2luZ0NvbnRleHQgOiAxOworICAgIGJvb2wgbV9pc0NTU1N0YWNr aW5nQ29udGV4dCA6IDE7CisgICAgYm9vbCBtX2lzT3Bwb3J0dW5pc3RpY1N0YWNraW5nQ29udGV4 dCA6IDE7CiAKICAgICBib29sIG1fek9yZGVyTGlzdHNEaXJ0eSA6IDE7CiAgICAgYm9vbCBtX25v cm1hbEZsb3dMaXN0RGlydHk6IDE7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckJhY2tpbmcuY3BwCmluZGV4IDEwYmI2NGViOWMzNDA5NzQ3NzEzNDE0NjcxMWE0MGQ0 ZDYyM2FjYzEuLmIzODQzMzllYmI4ZTY2YTk2YWNmOWQ1ZDYxY2E3NDg3NzZkMmM1YjAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCkBAIC0x ODk3LDcgKzE4OTcsNyBAQCBmbG9hdCBSZW5kZXJMYXllckJhY2tpbmc6OmNvbXBvc2l0aW5nT3Bh Y2l0eShmbG9hdCByZW5kZXJlck9wYWNpdHkpIGNvbnN0CiAgICAgZm9yIChhdXRvKiBjdXJyID0g bV9vd25pbmdMYXllci5wYXJlbnQoKTsgY3VycjsgY3VyciA9IGN1cnItPnBhcmVudCgpKSB7CiAg ICAgICAgIC8vIFdlIG9ubHkgY2FyZSBhYm91dCBwYXJlbnRzIHRoYXQgYXJlIHN0YWNraW5nIGNv bnRleHRzLgogICAgICAgICAvLyBSZWNhbGwgdGhhdCBvcGFjaXR5IGNyZWF0ZXMgc3RhY2tpbmcg Y29udGV4dC4KLSAgICAgICAgaWYgKCFjdXJyLT5pc1N0YWNraW5nQ29udGV4dCgpKQorICAgICAg ICBpZiAoIWN1cnItPmlzQ1NTU3RhY2tpbmdDb250ZXh0KCkpCiAgICAgICAgICAgICBjb250aW51 ZTsKICAgICAgICAgCiAgICAgICAgIC8vIElmIHdlIGZvdW5kIGEgY29tcG9zaXRpbmcgbGF5ZXIs IHdlIHdhbnQgdG8gY29tcHV0ZSBvcGFjaXR5Cg==