218952 2020-11-14 20:33:31 -0800 Minor RenderStyle boxShadow cleanup 2020-11-15 17:16:30 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser bfulgham changseok esprehn+autocc ews-watchlist glenn kondapallykalyan pdr sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1707564 0 simon.fraser 2020-11-14 20:33:31 -0800 Minor RenderStyle boxShadow cleanup 1707565 1 414152 simon.fraser 2020-11-14 20:34:46 -0800 Created attachment 414152 Patch 1707674 2 ews-feeder 2020-11-15 17:15:32 -0800 Committed r269835: <https://trac.webkit.org/changeset/269835> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414152. 1707675 3 webkit-bug-importer 2020-11-15 17:16:30 -0800 <rdar://problem/71422356> 414152 2020-11-14 20:34:46 -0800 2020-11-15 17:15:32 -0800 Patch bug-218952-20201114203445.patch text/plain 10440 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5ODIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTBlNzE4M2Q4NjM3YzQx NDA2ZmFlNjMzYjEyYWU5ZTNlMTA1OGYzNi4uOTM2NDZjZmI2NTM1NWRlYzViYWY3ZjI5Yjk3ZWQ4 ODg2Yzk2ZDgzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTExLTE0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1pbm9yIFJlbmRl clN0eWxlIGJveFNoYWRvdyBjbGVhbnVwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTg5NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBSZW5hbWUgZ2V0Qm94U2hhZG93RXh0ZW50KCkgdG8gYm94U2hhZG93 RXh0ZW50KCkgYW5kIGhhdmUgaXQgcmV0dXJuIGEgTGF5b3V0Qm94RXh0ZW50LgorCisgICAgICAg IE1ha2Ugc2hhZG93LXJlbGF0ZWQgZnVuY3Rpb25zIHN0YXRpYyB0aGF0IGNhbiBiZSwgYW5kIHBy aXZhdGUgdGhhdCBjYW4gYmUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6YXBwbHlWaXN1YWxFZmZlY3RPdmVyZmxvdyBj b25zdCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyRWxlbWVudDo6cmVwYWludEFmdGVyTGF5b3V0SWZOZWVkZWQpOgorICAg ICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJTdHlsZTo6c2hhZG93RXh0ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0 eWxlOjpzaGFkb3dJbnNldEV4dGVudCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6 Z2V0U2hhZG93SG9yaXpvbnRhbEV4dGVudCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHls ZTo6Z2V0U2hhZG93VmVydGljYWxFeHRlbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5 bGU6OmdldFNoYWRvd0V4dGVudCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpS ZW5kZXJTdHlsZTo6Z2V0U2hhZG93SW5zZXRFeHRlbnQgY29uc3QpOiBEZWxldGVkLgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmdldFNoYWRvd0hvcml6b250YWxFeHRlbnQgY29uc3Qp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmdldFNoYWRvd1ZlcnRp Y2FsRXh0ZW50IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvc3R5bGUvUmVu ZGVyU3R5bGUuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpib3hTaGFkb3dFeHRl bnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6OmJveFNoYWRvd0luc2V0 RXh0ZW50IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclN0eWxlOjpnZXRCb3hTaGFk b3dFeHRlbnQgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU3R5bGU6 OmdldEJveFNoYWRvd0luc2V0RXh0ZW50IGNvbnN0KTogRGVsZXRlZC4KKwogMjAyMC0xMS0xNCAg U2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDIERp c3BsYXldIEltcGxlbWVudCBwcm9wYWdhdGlvbiBiYWNrZ3JvdW5kIHN0eWxlIGZyb20gYm9keSB0 byByb290CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCmluZGV4IDExMjY1MDQ4 MGY2YWU4ZmFmMjZhN2JmZDk4NGQ3NTEyNmRhODUwODAuLmE4NTc4ZDFkZmJmNTgwYTZiODAzNjQw NGFlMWNkYzBlZGIwZDRmMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3Bw CkBAIC00NjEzLDIyICs0NjEzLDE4IEBAIExheW91dFJlY3QgUmVuZGVyQm94OjphcHBseVZpc3Vh bEVmZmVjdE92ZXJmbG93KGNvbnN0IExheW91dFJlY3QmIGJvcmRlckJveCkgY29uCiAgICAgCiAg ICAgLy8gQ29tcHV0ZSBib3gtc2hhZG93IG92ZXJmbG93IGZpcnN0LgogICAgIGlmIChzdHlsZSgp LmJveFNoYWRvdygpKSB7Ci0gICAgICAgIExheW91dFVuaXQgc2hhZG93TGVmdDsKLSAgICAgICAg TGF5b3V0VW5pdCBzaGFkb3dSaWdodDsKLSAgICAgICAgTGF5b3V0VW5pdCBzaGFkb3dUb3A7Ci0g ICAgICAgIExheW91dFVuaXQgc2hhZG93Qm90dG9tOwotICAgICAgICBzdHlsZSgpLmdldEJveFNo YWRvd0V4dGVudChzaGFkb3dUb3AsIHNoYWRvd1JpZ2h0LCBzaGFkb3dCb3R0b20sIHNoYWRvd0xl ZnQpOworICAgICAgICBhdXRvIHNoYWRvd0V4dGVudCA9IHN0eWxlKCkuYm94U2hhZG93RXh0ZW50 KCk7CiAKICAgICAgICAgLy8gSW4gZmxpcHBlZCBibG9ja3Mgd3JpdGluZyBtb2RlcyBzdWNoIGFz IHZlcnRpY2FsLXJsLCB0aGUgcGh5c2ljYWwgcmlnaHQgc2hhZG93IHZhbHVlIGlzIGFjdHVhbGx5 IGF0IHRoZSBsb3dlciB4LWNvb3JkaW5hdGUuCi0gICAgICAgIG92ZXJmbG93TWluWCA9IGJvcmRl ckJveC54KCkgKyAoKCFpc0ZsaXBwZWQgfHwgaXNIb3Jpem9udGFsKSA/IHNoYWRvd0xlZnQgOiAt c2hhZG93UmlnaHQpOwotICAgICAgICBvdmVyZmxvd01heFggPSBib3JkZXJCb3gubWF4WCgpICsg KCghaXNGbGlwcGVkIHx8IGlzSG9yaXpvbnRhbCkgPyBzaGFkb3dSaWdodCA6IC1zaGFkb3dMZWZ0 KTsKLSAgICAgICAgb3ZlcmZsb3dNaW5ZID0gYm9yZGVyQm94LnkoKSArICgoIWlzRmxpcHBlZCB8 fCAhaXNIb3Jpem9udGFsKSA/IHNoYWRvd1RvcCA6IC1zaGFkb3dCb3R0b20pOwotICAgICAgICBv dmVyZmxvd01heFkgPSBib3JkZXJCb3gubWF4WSgpICsgKCghaXNGbGlwcGVkIHx8ICFpc0hvcml6 b250YWwpID8gc2hhZG93Qm90dG9tIDogLXNoYWRvd1RvcCk7CisgICAgICAgIG92ZXJmbG93TWlu WCA9IGJvcmRlckJveC54KCkgKyAoKCFpc0ZsaXBwZWQgfHwgaXNIb3Jpem9udGFsKSA/IHNoYWRv d0V4dGVudC5sZWZ0KCkgOiAtc2hhZG93RXh0ZW50LnJpZ2h0KCkpOworICAgICAgICBvdmVyZmxv d01heFggPSBib3JkZXJCb3gubWF4WCgpICsgKCghaXNGbGlwcGVkIHx8IGlzSG9yaXpvbnRhbCkg PyBzaGFkb3dFeHRlbnQucmlnaHQoKSA6IC1zaGFkb3dFeHRlbnQubGVmdCgpKTsKKyAgICAgICAg b3ZlcmZsb3dNaW5ZID0gYm9yZGVyQm94LnkoKSArICgoIWlzRmxpcHBlZCB8fCAhaXNIb3Jpem9u dGFsKSA/IHNoYWRvd0V4dGVudC50b3AoKSA6IC1zaGFkb3dFeHRlbnQuYm90dG9tKCkpOworICAg ICAgICBvdmVyZmxvd01heFkgPSBib3JkZXJCb3gubWF4WSgpICsgKCghaXNGbGlwcGVkIHx8ICFp c0hvcml6b250YWwpID8gc2hhZG93RXh0ZW50LmJvdHRvbSgpIDogLXNoYWRvd0V4dGVudC50b3Ao KSk7CiAgICAgfQogCiAgICAgLy8gTm93IGNvbXB1dGUgYm9yZGVyLWltYWdlLW91dHNldCBvdmVy Zmxvdy4KICAgICBpZiAoc3R5bGUoKS5oYXNCb3JkZXJJbWFnZU91dHNldHMoKSkgewotICAgICAg ICBMYXlvdXRCb3hFeHRlbnQgYm9yZGVyT3V0c2V0cyA9IHN0eWxlKCkuYm9yZGVySW1hZ2VPdXRz ZXRzKCk7CisgICAgICAgIGF1dG8gYm9yZGVyT3V0c2V0cyA9IHN0eWxlKCkuYm9yZGVySW1hZ2VP dXRzZXRzKCk7CiAgICAgICAgIAogICAgICAgICAvLyBJbiBmbGlwcGVkIGJsb2NrcyB3cml0aW5n IG1vZGVzLCB0aGUgcGh5c2ljYWwgc2lkZXMgYXJlIGludmVydGVkLiBGb3IgZXhhbXBsZSBpbiB2 ZXJ0aWNhbC1ybCwgdGhlIHJpZ2h0CiAgICAgICAgIC8vIGJvcmRlciBpcyBhdCB0aGUgbG93ZXIg eCBjb29yZGluYXRlIHZhbHVlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1l bnQuY3BwCmluZGV4IDQ2M2MxNDJiMWI0ZmViZjQ0ZTcyOGViMzI0YzVkZGQ3YjZhMjkxYTMuLjU0 NDdkNjk4YmJkNTZiZTFjYzQ1OTAzMDc3NmVjYmJjNzNlNzE5NTMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5jcHAKQEAgLTEyMzQsNyArMTIzNCw3IEBAIGJvb2wg UmVuZGVyRWxlbWVudDo6cmVwYWludEFmdGVyTGF5b3V0SWZOZWVkZWQoY29uc3QgUmVuZGVyTGF5 ZXJNb2RlbE9iamVjdCogcmVwCiAgICAgLy8gdHdvIHJlY3RhbmdsZXMgKGJ1dCB0eXBpY2FsbHkg b25seSBvbmUpLgogICAgIGNvbnN0IFJlbmRlclN0eWxlJiBvdXRsaW5lU3R5bGUgPSBvdXRsaW5l U3R5bGVGb3JSZXBhaW50KCk7CiAgICAgTGF5b3V0VW5pdCBvdXRsaW5lV2lkdGggeyBvdXRsaW5l U3R5bGUub3V0bGluZVNpemUoKSB9OwotICAgIExheW91dEJveEV4dGVudCBpbnNldFNoYWRvd0V4 dGVudCA9IHN0eWxlKCkuZ2V0Qm94U2hhZG93SW5zZXRFeHRlbnQoKTsKKyAgICBhdXRvIGluc2V0 U2hhZG93RXh0ZW50ID0gc3R5bGUoKS5ib3hTaGFkb3dJbnNldEV4dGVudCgpOwogICAgIExheW91 dFVuaXQgd2lkdGggPSBhYnNvbHV0ZVZhbHVlKG5ld091dGxpbmVCb3gud2lkdGgoKSAtIG9sZE91 dGxpbmVCb3gud2lkdGgoKSk7CiAgICAgaWYgKHdpZHRoKSB7CiAgICAgICAgIExheW91dFVuaXQg c2hhZG93TGVmdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9S ZW5kZXJTdHlsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGUuY3BwCmluZGV4IDMxMzBmMTgxOTNiYmQyZWJkN2IwNGNiMzc1OTVjMzJiY2U0ZmY1NjYuLmUw OWNkMzFjMDQxODIwMDZlNWNkOGYyNjI0YzQ4NzVhYzY5NWM3MDAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNwcApAQCAtMTkxOSwxMiArMTkxOSwx MiBAQCB2b2lkIFJlbmRlclN0eWxlOjpzZXRGb250SXRhbGljKE9wdGlvbmFsPEZvbnRTZWxlY3Rp b25WYWx1ZT4gdmFsdWUpCiAgICAgZm9udENhc2NhZGUoKS51cGRhdGUoY3VycmVudEZvbnRTZWxl Y3Rvcik7CiB9CiAKLXZvaWQgUmVuZGVyU3R5bGU6OmdldFNoYWRvd0V4dGVudChjb25zdCBTaGFk b3dEYXRhKiBzaGFkb3csIExheW91dFVuaXQmIHRvcCwgTGF5b3V0VW5pdCYgcmlnaHQsIExheW91 dFVuaXQmIGJvdHRvbSwgTGF5b3V0VW5pdCYgbGVmdCkgY29uc3QKK0xheW91dEJveEV4dGVudCBS ZW5kZXJTdHlsZTo6c2hhZG93RXh0ZW50KGNvbnN0IFNoYWRvd0RhdGEqIHNoYWRvdykKIHsKLSAg ICB0b3AgPSAwOwotICAgIHJpZ2h0ID0gMDsKLSAgICBib3R0b20gPSAwOwotICAgIGxlZnQgPSAw OworICAgIExheW91dFVuaXQgdG9wOworICAgIExheW91dFVuaXQgcmlnaHQ7CisgICAgTGF5b3V0 VW5pdCBib3R0b207CisgICAgTGF5b3V0VW5pdCBsZWZ0OwogCiAgICAgZm9yICggOyBzaGFkb3c7 IHNoYWRvdyA9IHNoYWRvdy0+bmV4dCgpKSB7CiAgICAgICAgIGlmIChzaGFkb3ctPnN0eWxlKCkg PT0gU2hhZG93U3R5bGU6Okluc2V0KQpAQCAtMTkzNiw5ICsxOTM2LDExIEBAIHZvaWQgUmVuZGVy U3R5bGU6OmdldFNoYWRvd0V4dGVudChjb25zdCBTaGFkb3dEYXRhKiBzaGFkb3csIExheW91dFVu aXQmIHRvcCwgTGF5CiAgICAgICAgIGJvdHRvbSA9IHN0ZDo6bWF4PExheW91dFVuaXQ+KGJvdHRv bSwgc2hhZG93LT55KCkgKyBleHRlbnRBbmRTcHJlYWQpOwogICAgICAgICBsZWZ0ID0gc3RkOjpt aW48TGF5b3V0VW5pdD4obGVmdCwgc2hhZG93LT54KCkgLSBleHRlbnRBbmRTcHJlYWQpOwogICAg IH0KKyAgICAKKyAgICByZXR1cm4geyB0b3AsIHJpZ2h0LCBib3R0b20sIGxlZnQgfTsKIH0KIAot TGF5b3V0Qm94RXh0ZW50IFJlbmRlclN0eWxlOjpnZXRTaGFkb3dJbnNldEV4dGVudChjb25zdCBT aGFkb3dEYXRhKiBzaGFkb3cpIGNvbnN0CitMYXlvdXRCb3hFeHRlbnQgUmVuZGVyU3R5bGU6OnNo YWRvd0luc2V0RXh0ZW50KGNvbnN0IFNoYWRvd0RhdGEqIHNoYWRvdykKIHsKICAgICBMYXlvdXRV bml0IHRvcDsKICAgICBMYXlvdXRVbml0IHJpZ2h0OwpAQCAtMTk1NiwxMCArMTk1OCwxMCBAQCBM YXlvdXRCb3hFeHRlbnQgUmVuZGVyU3R5bGU6OmdldFNoYWRvd0luc2V0RXh0ZW50KGNvbnN0IFNo YWRvd0RhdGEqIHNoYWRvdykgY29ucwogICAgICAgICBsZWZ0ID0gc3RkOjptYXg8TGF5b3V0VW5p dD4obGVmdCwgc2hhZG93LT54KCkgKyBleHRlbnRBbmRTcHJlYWQpOwogICAgIH0KIAotICAgIHJl dHVybiBMYXlvdXRCb3hFeHRlbnQoV1RGTW92ZSh0b3ApLCBXVEZNb3ZlKHJpZ2h0KSwgV1RGTW92 ZShib3R0b20pLCBXVEZNb3ZlKGxlZnQpKTsKKyAgICByZXR1cm4geyB0b3AsIHJpZ2h0LCBib3R0 b20sIGxlZnQgfTsKIH0KIAotdm9pZCBSZW5kZXJTdHlsZTo6Z2V0U2hhZG93SG9yaXpvbnRhbEV4 dGVudChjb25zdCBTaGFkb3dEYXRhKiBzaGFkb3csIExheW91dFVuaXQgJmxlZnQsIExheW91dFVu aXQgJnJpZ2h0KSBjb25zdAordm9pZCBSZW5kZXJTdHlsZTo6Z2V0U2hhZG93SG9yaXpvbnRhbEV4 dGVudChjb25zdCBTaGFkb3dEYXRhKiBzaGFkb3csIExheW91dFVuaXQgJmxlZnQsIExheW91dFVu aXQgJnJpZ2h0KQogewogICAgIGxlZnQgPSAwOwogICAgIHJpZ2h0ID0gMDsKQEAgLTE5NzQsNyAr MTk3Niw3IEBAIHZvaWQgUmVuZGVyU3R5bGU6OmdldFNoYWRvd0hvcml6b250YWxFeHRlbnQoY29u c3QgU2hhZG93RGF0YSogc2hhZG93LCBMYXlvdXRVbml0CiAgICAgfQogfQogCi12b2lkIFJlbmRl clN0eWxlOjpnZXRTaGFkb3dWZXJ0aWNhbEV4dGVudChjb25zdCBTaGFkb3dEYXRhKiBzaGFkb3cs IExheW91dFVuaXQgJnRvcCwgTGF5b3V0VW5pdCAmYm90dG9tKSBjb25zdAordm9pZCBSZW5kZXJT dHlsZTo6Z2V0U2hhZG93VmVydGljYWxFeHRlbnQoY29uc3QgU2hhZG93RGF0YSogc2hhZG93LCBM YXlvdXRVbml0ICZ0b3AsIExheW91dFVuaXQgJmJvdHRvbSkKIHsKICAgICB0b3AgPSAwOwogICAg IGJvdHRvbSA9IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUv UmVuZGVyU3R5bGUuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHls ZS5oCmluZGV4IDlkODM1YzZkZjE4ZDhlYThmZjk4NzYxMGQxZTcwN2YwNzgzNDc1MmQuLmE1OWRj ZTg3MjA3YWJiMTU1ODA0ODg4NjUyMTEwOGM4OWNjYWViZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5oCkBAIC01NjMsOCArNTYzLDggQEAgcHVibGlj OgogICAgIGNvbnN0IEdyaWRQb3NpdGlvbiYgZ3JpZEl0ZW1Sb3dFbmQoKSBjb25zdCB7IHJldHVy biBtX3JhcmVOb25Jbmhlcml0ZWREYXRhLT5ncmlkSXRlbS0+Z3JpZFJvd0VuZDsgfQogCiAgICAg Y29uc3QgU2hhZG93RGF0YSogYm94U2hhZG93KCkgY29uc3QgeyByZXR1cm4gbV9yYXJlTm9uSW5o ZXJpdGVkRGF0YS0+Ym94U2hhZG93LmdldCgpOyB9Ci0gICAgdm9pZCBnZXRCb3hTaGFkb3dFeHRl bnQoTGF5b3V0VW5pdCYgdG9wLCBMYXlvdXRVbml0JiByaWdodCwgTGF5b3V0VW5pdCYgYm90dG9t LCBMYXlvdXRVbml0JiBsZWZ0KSBjb25zdCB7IGdldFNoYWRvd0V4dGVudChib3hTaGFkb3coKSwg dG9wLCByaWdodCwgYm90dG9tLCBsZWZ0KTsgfQotICAgIExheW91dEJveEV4dGVudCBnZXRCb3hT aGFkb3dJbnNldEV4dGVudCgpIGNvbnN0IHsgcmV0dXJuIGdldFNoYWRvd0luc2V0RXh0ZW50KGJv eFNoYWRvdygpKTsgfQorICAgIExheW91dEJveEV4dGVudCBib3hTaGFkb3dFeHRlbnQoKSBjb25z dCB7IHJldHVybiBzaGFkb3dFeHRlbnQoYm94U2hhZG93KCkpOyB9CisgICAgTGF5b3V0Qm94RXh0 ZW50IGJveFNoYWRvd0luc2V0RXh0ZW50KCkgY29uc3QgeyByZXR1cm4gc2hhZG93SW5zZXRFeHRl bnQoYm94U2hhZG93KCkpOyB9CiAgICAgdm9pZCBnZXRCb3hTaGFkb3dIb3Jpem9udGFsRXh0ZW50 KExheW91dFVuaXQmIGxlZnQsIExheW91dFVuaXQmIHJpZ2h0KSBjb25zdCB7IGdldFNoYWRvd0hv cml6b250YWxFeHRlbnQoYm94U2hhZG93KCksIGxlZnQsIHJpZ2h0KTsgfQogICAgIHZvaWQgZ2V0 Qm94U2hhZG93VmVydGljYWxFeHRlbnQoTGF5b3V0VW5pdCYgdG9wLCBMYXlvdXRVbml0JiBib3R0 b20pIGNvbnN0IHsgZ2V0U2hhZG93VmVydGljYWxFeHRlbnQoYm94U2hhZG93KCksIHRvcCwgYm90 dG9tKTsgfQogICAgIHZvaWQgZ2V0Qm94U2hhZG93SW5saW5lRGlyZWN0aW9uRXh0ZW50KExheW91 dFVuaXQmIGxvZ2ljYWxMZWZ0LCBMYXlvdXRVbml0JiBsb2dpY2FsUmlnaHQpIGNvbnN0IHsgZ2V0 U2hhZG93SW5saW5lRGlyZWN0aW9uRXh0ZW50KGJveFNoYWRvdygpLCBsb2dpY2FsTGVmdCwgbG9n aWNhbFJpZ2h0KTsgfQpAQCAtMTc3Nyw5ICsxNzc3LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0 VmlzaXRlZExpbmtDYXJldENvbG9yKGNvbnN0IENvbG9yJiB2KSB7IFNFVF9WQVIobV9yYXJlSW5o ZXJpdGVkRGF0YSwgdmlzaXRlZExpbmtDYXJldENvbG9yLCB2KTsgfQogCiAgICAgdm9pZCBpbmhl cml0VW5pY29kZUJpZGlGcm9tKGNvbnN0IFJlbmRlclN0eWxlKiBwYXJlbnQpIHsgbV9ub25Jbmhl cml0ZWRGbGFncy51bmljb2RlQmlkaSA9IHBhcmVudC0+bV9ub25Jbmhlcml0ZWRGbGFncy51bmlj b2RlQmlkaTsgfQotICAgIHZvaWQgZ2V0U2hhZG93RXh0ZW50KGNvbnN0IFNoYWRvd0RhdGEqLCBM YXlvdXRVbml0JiB0b3AsIExheW91dFVuaXQmIHJpZ2h0LCBMYXlvdXRVbml0JiBib3R0b20sIExh eW91dFVuaXQmIGxlZnQpIGNvbnN0OwotICAgIHZvaWQgZ2V0U2hhZG93SG9yaXpvbnRhbEV4dGVu dChjb25zdCBTaGFkb3dEYXRhKiwgTGF5b3V0VW5pdCYgbGVmdCwgTGF5b3V0VW5pdCYgcmlnaHQp IGNvbnN0OwotICAgIHZvaWQgZ2V0U2hhZG93VmVydGljYWxFeHRlbnQoY29uc3QgU2hhZG93RGF0 YSosIExheW91dFVuaXQmIHRvcCwgTGF5b3V0VW5pdCYgYm90dG9tKSBjb25zdDsKKwogICAgIHZv aWQgZ2V0U2hhZG93SW5saW5lRGlyZWN0aW9uRXh0ZW50KGNvbnN0IFNoYWRvd0RhdGEqLCBMYXlv dXRVbml0JiBsb2dpY2FsTGVmdCwgTGF5b3V0VW5pdCYgbG9naWNhbFJpZ2h0KSBjb25zdDsKICAg ICB2b2lkIGdldFNoYWRvd0Jsb2NrRGlyZWN0aW9uRXh0ZW50KGNvbnN0IFNoYWRvd0RhdGEqLCBM YXlvdXRVbml0JiBsb2dpY2FsVG9wLCBMYXlvdXRVbml0JiBsb2dpY2FsQm90dG9tKSBjb25zdDsK IApAQCAtMTkxMiwxNCArMTkxMCwxNyBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBzZXRDb250ZW50 KHN0ZDo6dW5pcXVlX3B0cjxDb250ZW50RGF0YT4sIGJvb2wgYWRkKTsKIAotICAgIExheW91dEJv eEV4dGVudCBnZXRTaGFkb3dJbnNldEV4dGVudChjb25zdCBTaGFkb3dEYXRhKikgY29uc3Q7Ci0K ICAgICBzdGF0aWMgYm9vbCBpc0Rpc3BsYXlSZXBsYWNlZFR5cGUoRGlzcGxheVR5cGUpOwogICAg IHN0YXRpYyBib29sIGlzRGlzcGxheUlubGluZVR5cGUoRGlzcGxheVR5cGUpOwogICAgIHN0YXRp YyBib29sIGlzRGlzcGxheUZsZXhpYmxlQm94KERpc3BsYXlUeXBlKTsKICAgICBzdGF0aWMgYm9v bCBpc0Rpc3BsYXlHcmlkQm94KERpc3BsYXlUeXBlKTsKICAgICBzdGF0aWMgYm9vbCBpc0Rpc3Bs YXlGbGV4aWJsZU9yR3JpZEJveChEaXNwbGF5VHlwZSk7CiAKKyAgICBzdGF0aWMgTGF5b3V0Qm94 RXh0ZW50IHNoYWRvd0V4dGVudChjb25zdCBTaGFkb3dEYXRhKik7CisgICAgc3RhdGljIExheW91 dEJveEV4dGVudCBzaGFkb3dJbnNldEV4dGVudChjb25zdCBTaGFkb3dEYXRhKik7CisgICAgc3Rh dGljIHZvaWQgZ2V0U2hhZG93SG9yaXpvbnRhbEV4dGVudChjb25zdCBTaGFkb3dEYXRhKiwgTGF5 b3V0VW5pdCYgbGVmdCwgTGF5b3V0VW5pdCYgcmlnaHQpOworICAgIHN0YXRpYyB2b2lkIGdldFNo YWRvd1ZlcnRpY2FsRXh0ZW50KGNvbnN0IFNoYWRvd0RhdGEqLCBMYXlvdXRVbml0JiB0b3AsIExh eW91dFVuaXQmIGJvdHRvbSk7CisKICAgICBDb2xvciBjb2xvclJlc29sdmluZ0N1cnJlbnRDb2xv cihDU1NQcm9wZXJ0eUlEIGNvbG9yUHJvcGVydHksIGJvb2wgdmlzaXRlZExpbmspIGNvbnN0Owog CiAgICAgYm9vbCBjaGFuZ2VBZmZlY3RzVmlzdWFsT3ZlcmZsb3coY29uc3QgUmVuZGVyU3R5bGUm KSBjb25zdDsK