237189 2022-02-25 00:59:11 -0800 Treat empty intersection correctly in RenderLayer::getRectToExpose 2022-03-31 13:35:18 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=238567 https://bugs.webkit.org/show_bug.cgi?id=238033 InRadar P2 Normal --- 1 rbuis rbuis changseok esprehn+autocc ews-watchlist fred.wang glenn jonlee kondapallykalyan pdr simon.fraser webkit-bug-importer oldest_to_newest 1845939 0 rbuis 2022-02-25 00:59:11 -0800 Treat empty intersection correctly in RenderLayer::getRectToExpose. 1845940 1 453184 rbuis 2022-02-25 01:01:19 -0800 Created attachment 453184 Patch 1846004 2 453210 rbuis 2022-02-25 06:51:33 -0800 Created attachment 453210 Patch 1847764 3 ews-feeder 2022-03-02 23:32:26 -0800 Committed r290770 (248014@main): <https://commits.webkit.org/248014@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453210. 1847765 4 webkit-bug-importer 2022-03-02 23:33:16 -0800 <rdar://problem/89736117> 1856943 5 jonlee 2022-03-31 13:34:53 -0700 This caused the regression reported in bug 238033. 453184 2022-02-25 01:01:19 -0800 2022-02-25 06:51:28 -0800 Patch bug-237189-20220225090118.patch text/plain 6591 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNDU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDZmM2U4YjVhNDhhNTE1 ZGVmMmNlMWMxNjRkNWE4NjE0YzhjMTI1YS4uOTlkOTFiYmZhZjRhYWQ4MDEyZTZhNjk5OGMwMThh YWEwMjUyMjQ2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAyLTI1ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVHJlYXQgZW1wdHkgaW50ZXJzZWN0 aW9uIGNvcnJlY3RseSBpbiBSZW5kZXJMYXllcjo6Z2V0UmVjdFRvRXhwb3NlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzcxODkKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXSVAuCisKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6 OmdldFJlY3RUb0V4cG9zZSBjb25zdCk6CisKIDIwMjItMDItMjQgIEFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtJRkNdW0ludGVncmF0aW9uXSBFbmFibGUgbm9uLXBh Z2luYXRlZCB2ZXJ0aWNhbC1ybCB3cml0aW5nIG1vZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwCmluZGV4IDM3YTgyYjgyOWE1OGRhZmFhZmI3ZWQwMDRlZTMzZDU5Y2Vh YzRlNGQuLjE4ZTFiZDRiM2E5OGYzZWU0ZTlhZWJmZjI5ZjJkMjMwMGI3MDA5ZjkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMjY2NCwyNCArMjY2NCwyNiBA QCBMYXlvdXRSZWN0IFJlbmRlckxheWVyOjpnZXRSZWN0VG9FeHBvc2UoY29uc3QgTGF5b3V0UmVj dCYgdmlzaWJsZVJlY3QsIGNvbnN0IExheQogICAgIH0KIAogICAgIC8vIERldGVybWluZSB0aGUg YXBwcm9wcmlhdGUgWCBiZWhhdmlvci4KLSAgICBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yIHNj cm9sbFg7CisgICAgU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvciBzY3JvbGxYID0gYWxpZ25YLmdl dEhpZGRlbkJlaGF2aW9yKCk7CiAgICAgTGF5b3V0UmVjdCBleHBvc2VSZWN0WChleHBvc2VSZWN0 LngoKSwgdmlzaWJsZVJlY3QueSgpLCBleHBvc2VSZWN0LndpZHRoKCksIHZpc2libGVSZWN0Lmhl aWdodCgpKTsKLSAgICBMYXlvdXRVbml0IGludGVyc2VjdFdpZHRoID0gaW50ZXJzZWN0aW9uKHZp c2libGVSZWN0LCBleHBvc2VSZWN0WCkud2lkdGgoKTsKLSAgICBpZiAoaW50ZXJzZWN0V2lkdGgg PT0gZXhwb3NlUmVjdC53aWR0aCgpIHx8IChhbGlnblgubGVnYWN5SG9yaXpvbnRhbFZpc2liaWxp dHlUaHJlc2hvbGRFbmFibGVkKCkgJiYgaW50ZXJzZWN0V2lkdGggPj0gTUlOX0lOVEVSU0VDVF9G T1JfUkVWRUFMKSkgewotICAgICAgICAvLyBJZiB0aGUgcmVjdGFuZ2xlIGlzIGZ1bGx5IHZpc2li bGUsIHVzZSB0aGUgc3BlY2lmaWVkIHZpc2libGUgYmVoYXZpb3IuCi0gICAgICAgIC8vIElmIHRo ZSByZWN0YW5nbGUgaXMgcGFydGlhbGx5IHZpc2libGUsIGJ1dCBvdmVyIGEgY2VydGFpbiB0aHJl c2hvbGQsCi0gICAgICAgIC8vIHRoZW4gdHJlYXQgaXQgYXMgZnVsbHkgdmlzaWJsZSB0byBhdm9p ZCB1bm5lY2Vzc2FyeSBob3Jpem9udGFsIHNjcm9sbGluZwotICAgICAgICBzY3JvbGxYID0gYWxp Z25YLmdldFZpc2libGVCZWhhdmlvcigpOwotICAgIH0gZWxzZSBpZiAoaW50ZXJzZWN0V2lkdGgg PT0gdmlzaWJsZVJlY3Qud2lkdGgoKSkgewotICAgICAgICAvLyBJZiB0aGUgcmVjdCBpcyBiaWdn ZXIgdGhhbiB0aGUgdmlzaWJsZSBhcmVhLCBkb24ndCBib3RoZXIgdHJ5aW5nIHRvIGNlbnRlci4g T3RoZXIgYWxpZ25tZW50cyB3aWxsIHdvcmsuCi0gICAgICAgIHNjcm9sbFggPSBhbGlnblguZ2V0 VmlzaWJsZUJlaGF2aW9yKCk7Ci0gICAgICAgIGlmIChzY3JvbGxYID09IFNjcm9sbEFsaWdubWVu dDo6QmVoYXZpb3I6OkFsaWduQ2VudGVyKQotICAgICAgICAgICAgc2Nyb2xsWCA9IFNjcm9sbEFs aWdubWVudDo6QmVoYXZpb3I6Ok5vU2Nyb2xsOwotICAgIH0gZWxzZSBpZiAoaW50ZXJzZWN0V2lk dGggPiAwKQotICAgICAgICAvLyBJZiB0aGUgcmVjdGFuZ2xlIGlzIHBhcnRpYWxseSB2aXNpYmxl LCBidXQgbm90IGFib3ZlIHRoZSBtaW5pbXVtIHRocmVzaG9sZCwgdXNlIHRoZSBzcGVjaWZpZWQg cGFydGlhbCBiZWhhdmlvcgotICAgICAgICBzY3JvbGxYID0gYWxpZ25YLmdldFBhcnRpYWxCZWhh dmlvcigpOwotICAgIGVsc2UKLSAgICAgICAgc2Nyb2xsWCA9IGFsaWduWC5nZXRIaWRkZW5CZWhh dmlvcigpOworICAgIExheW91dFJlY3QgaW50ZXJzZWN0UmVjdCA9IGludGVyc2VjdGlvbih2aXNp YmxlUmVjdCwgZXhwb3NlUmVjdFgpOworICAgIGlmICghaW50ZXJzZWN0UmVjdC5pc0VtcHR5KCkp IHsKKyAgICAgICAgTGF5b3V0VW5pdCBpbnRlcnNlY3RXaWR0aCA9IGludGVyc2VjdFJlY3Qud2lk dGgoKTsKKyAgICAgICAgaWYgKGludGVyc2VjdFdpZHRoID09IGV4cG9zZVJlY3Qud2lkdGgoKSB8 fCAoYWxpZ25YLmxlZ2FjeUhvcml6b250YWxWaXNpYmlsaXR5VGhyZXNob2xkRW5hYmxlZCgpICYm IGludGVyc2VjdFdpZHRoID49IE1JTl9JTlRFUlNFQ1RfRk9SX1JFVkVBTCkpIHsKKyAgICAgICAg ICAgIC8vIElmIHRoZSByZWN0YW5nbGUgaXMgZnVsbHkgdmlzaWJsZSwgdXNlIHRoZSBzcGVjaWZp ZWQgdmlzaWJsZSBiZWhhdmlvci4KKyAgICAgICAgICAgIC8vIElmIHRoZSByZWN0YW5nbGUgaXMg cGFydGlhbGx5IHZpc2libGUsIGJ1dCBvdmVyIGEgY2VydGFpbiB0aHJlc2hvbGQsCisgICAgICAg ICAgICAvLyB0aGVuIHRyZWF0IGl0IGFzIGZ1bGx5IHZpc2libGUgdG8gYXZvaWQgdW5uZWNlc3Nh cnkgaG9yaXpvbnRhbCBzY3JvbGxpbmcKKyAgICAgICAgICAgIHNjcm9sbFggPSBhbGlnblguZ2V0 VmlzaWJsZUJlaGF2aW9yKCk7CisgICAgICAgIH0gZWxzZSBpZiAoaW50ZXJzZWN0V2lkdGggPT0g dmlzaWJsZVJlY3Qud2lkdGgoKSkgeworICAgICAgICAgICAgLy8gSWYgdGhlIHJlY3QgaXMgYmln Z2VyIHRoYW4gdGhlIHZpc2libGUgYXJlYSwgZG9uJ3QgYm90aGVyIHRyeWluZyB0byBjZW50ZXIu IE90aGVyIGFsaWdubWVudHMgd2lsbCB3b3JrLgorICAgICAgICAgICAgc2Nyb2xsWCA9IGFsaWdu WC5nZXRWaXNpYmxlQmVoYXZpb3IoKTsKKyAgICAgICAgICAgIGlmIChzY3JvbGxYID09IFNjcm9s bEFsaWdubWVudDo6QmVoYXZpb3I6OkFsaWduQ2VudGVyKQorICAgICAgICAgICAgICAgIHNjcm9s bFggPSBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yOjpOb1Njcm9sbDsKKyAgICAgICAgfSBlbHNl IGlmIChpbnRlcnNlY3RXaWR0aCA+IDApIHsKKyAgICAgICAgICAgIC8vIElmIHRoZSByZWN0YW5n bGUgaXMgcGFydGlhbGx5IHZpc2libGUsIGJ1dCBub3QgYWJvdmUgdGhlIG1pbmltdW0gdGhyZXNo b2xkLCB1c2UgdGhlIHNwZWNpZmllZCBwYXJ0aWFsIGJlaGF2aW9yCisgICAgICAgICAgICBzY3Jv bGxYID0gYWxpZ25YLmdldFBhcnRpYWxCZWhhdmlvcigpOworICAgICAgICB9CisgICAgfQogICAg IC8vIElmIHdlJ3JlIHRyeWluZyB0byBhbGlnbiB0byB0aGUgY2xvc2VzdCBlZGdlLCBhbmQgdGhl IGV4cG9zZVJlY3QgaXMgZnVydGhlciByaWdodAogICAgIC8vIHRoYW4gdGhlIHZpc2libGVSZWN0 LCBhbmQgbm90IGJpZ2dlciB0aGFuIHRoZSB2aXNpYmxlIGFyZWEsIHRoZW4gYWxpZ24gd2l0aCB0 aGUgcmlnaHQuCiAgICAgaWYgKHNjcm9sbFggPT0gU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvcjo6 QWxpZ25Ub0Nsb3Nlc3RFZGdlICYmIGV4cG9zZVJlY3QubWF4WCgpID4gdmlzaWJsZVJlY3QubWF4 WCgpICYmIGV4cG9zZVJlY3Qud2lkdGgoKSA8IHZpc2libGVSZWN0LndpZHRoKCkpCkBAIC0yNjk5 LDIyICsyNzAxLDI0IEBAIExheW91dFJlY3QgUmVuZGVyTGF5ZXI6OmdldFJlY3RUb0V4cG9zZShj b25zdCBMYXlvdXRSZWN0JiB2aXNpYmxlUmVjdCwgY29uc3QgTGF5CiAgICAgICAgIHggPSBleHBv c2VSZWN0LngoKTsKIAogICAgIC8vIERldGVybWluZSB0aGUgYXBwcm9wcmlhdGUgWSBiZWhhdmlv ci4KLSAgICBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yIHNjcm9sbFk7CisgICAgU2Nyb2xsQWxp Z25tZW50OjpCZWhhdmlvciBzY3JvbGxZID0gYWxpZ25ZLmdldEhpZGRlbkJlaGF2aW9yKCk7CiAg ICAgTGF5b3V0UmVjdCBleHBvc2VSZWN0WSh2aXNpYmxlUmVjdC54KCksIGV4cG9zZVJlY3QueSgp LCB2aXNpYmxlUmVjdC53aWR0aCgpLCBleHBvc2VSZWN0LmhlaWdodCgpKTsKLSAgICBMYXlvdXRV bml0IGludGVyc2VjdEhlaWdodCA9IGludGVyc2VjdGlvbih2aXNpYmxlUmVjdCwgZXhwb3NlUmVj dFkpLmhlaWdodCgpOwotICAgIGlmIChpbnRlcnNlY3RIZWlnaHQgPT0gZXhwb3NlUmVjdC5oZWln aHQoKSkKLSAgICAgICAgLy8gSWYgdGhlIHJlY3RhbmdsZSBpcyBmdWxseSB2aXNpYmxlLCB1c2Ug dGhlIHNwZWNpZmllZCB2aXNpYmxlIGJlaGF2aW9yLgotICAgICAgICBzY3JvbGxZID0gYWxpZ25Z LmdldFZpc2libGVCZWhhdmlvcigpOwotICAgIGVsc2UgaWYgKGludGVyc2VjdEhlaWdodCA9PSB2 aXNpYmxlUmVjdC5oZWlnaHQoKSkgewotICAgICAgICAvLyBJZiB0aGUgcmVjdCBpcyBiaWdnZXIg dGhhbiB0aGUgdmlzaWJsZSBhcmVhLCBkb24ndCBib3RoZXIgdHJ5aW5nIHRvIGNlbnRlci4gT3Ro ZXIgYWxpZ25tZW50cyB3aWxsIHdvcmsuCi0gICAgICAgIHNjcm9sbFkgPSBhbGlnblkuZ2V0Vmlz aWJsZUJlaGF2aW9yKCk7Ci0gICAgICAgIGlmIChzY3JvbGxZID09IFNjcm9sbEFsaWdubWVudDo6 QmVoYXZpb3I6OkFsaWduQ2VudGVyKQotICAgICAgICAgICAgc2Nyb2xsWSA9IFNjcm9sbEFsaWdu bWVudDo6QmVoYXZpb3I6Ok5vU2Nyb2xsOwotICAgIH0gZWxzZSBpZiAoaW50ZXJzZWN0SGVpZ2h0 ID4gMCkKLSAgICAgICAgLy8gSWYgdGhlIHJlY3RhbmdsZSBpcyBwYXJ0aWFsbHkgdmlzaWJsZSwg dXNlIHRoZSBzcGVjaWZpZWQgcGFydGlhbCBiZWhhdmlvcgotICAgICAgICBzY3JvbGxZID0gYWxp Z25ZLmdldFBhcnRpYWxCZWhhdmlvcigpOwotICAgIGVsc2UKLSAgICAgICAgc2Nyb2xsWSA9IGFs aWduWS5nZXRIaWRkZW5CZWhhdmlvcigpOworICAgIGludGVyc2VjdFJlY3QgPSBpbnRlcnNlY3Rp b24odmlzaWJsZVJlY3QsIGV4cG9zZVJlY3RZKTsKKyAgICBpZiAoIWludGVyc2VjdFJlY3QuaXNF bXB0eSgpKSB7CisgICAgICAgIExheW91dFVuaXQgaW50ZXJzZWN0SGVpZ2h0ID0gaW50ZXJzZWN0 UmVjdC5oZWlnaHQoKTsKKyAgICAgICAgaWYgKGludGVyc2VjdEhlaWdodCA9PSBleHBvc2VSZWN0 LmhlaWdodCgpKSB7CisgICAgICAgICAgICAvLyBJZiB0aGUgcmVjdGFuZ2xlIGlzIGZ1bGx5IHZp c2libGUsIHVzZSB0aGUgc3BlY2lmaWVkIHZpc2libGUgYmVoYXZpb3IuCisgICAgICAgICAgICBz Y3JvbGxZID0gYWxpZ25ZLmdldFZpc2libGVCZWhhdmlvcigpOworICAgICAgICB9IGVsc2UgaWYg KGludGVyc2VjdEhlaWdodCA9PSB2aXNpYmxlUmVjdC5oZWlnaHQoKSkgeworICAgICAgICAgICAg Ly8gSWYgdGhlIHJlY3QgaXMgYmlnZ2VyIHRoYW4gdGhlIHZpc2libGUgYXJlYSwgZG9uJ3QgYm90 aGVyIHRyeWluZyB0byBjZW50ZXIuIE90aGVyIGFsaWdubWVudHMgd2lsbCB3b3JrLgorICAgICAg ICAgICAgc2Nyb2xsWSA9IGFsaWduWS5nZXRWaXNpYmxlQmVoYXZpb3IoKTsKKyAgICAgICAgICAg IGlmIChzY3JvbGxZID09IFNjcm9sbEFsaWdubWVudDo6QmVoYXZpb3I6OkFsaWduQ2VudGVyKQor ICAgICAgICAgICAgICAgIHNjcm9sbFkgPSBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yOjpOb1Nj cm9sbDsKKyAgICAgICAgfSBlbHNlIGlmIChpbnRlcnNlY3RIZWlnaHQgPiAwKSB7CisgICAgICAg ICAgICAvLyBJZiB0aGUgcmVjdGFuZ2xlIGlzIHBhcnRpYWxseSB2aXNpYmxlLCB1c2UgdGhlIHNw ZWNpZmllZCBwYXJ0aWFsIGJlaGF2aW9yCisgICAgICAgICAgICBzY3JvbGxZID0gYWxpZ25ZLmdl dFBhcnRpYWxCZWhhdmlvcigpOworICAgICAgICB9CisgICAgfQogICAgIC8vIElmIHdlJ3JlIHRy eWluZyB0byBhbGlnbiB0byB0aGUgY2xvc2VzdCBlZGdlLCBhbmQgdGhlIGV4cG9zZVJlY3QgaXMg ZnVydGhlciBkb3duCiAgICAgLy8gdGhhbiB0aGUgdmlzaWJsZVJlY3QsIGFuZCBub3QgYmlnZ2Vy IHRoYW4gdGhlIHZpc2libGUgYXJlYSwgdGhlbiBhbGlnbiB3aXRoIHRoZSBib3R0b20uCiAgICAg aWYgKHNjcm9sbFkgPT0gU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvcjo6QWxpZ25Ub0Nsb3Nlc3RF ZGdlICYmIGV4cG9zZVJlY3QubWF4WSgpID4gdmlzaWJsZVJlY3QubWF4WSgpICYmIGV4cG9zZVJl Y3QuaGVpZ2h0KCkgPCB2aXNpYmxlUmVjdC5oZWlnaHQoKSkK 453210 2022-02-25 06:51:33 -0800 2022-03-02 23:32:28 -0800 Patch bug-237189-20220225145131.patch text/plain 8477 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNTA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjM5ZGZmMTNhZGI1Mzc4 YjVkYTY1NWQwNmNhMjExNmY5ZTE5MDgwMy4uYWM0MzkxOGQ5NGVmMzQxZWJhNTA5YmJkMzk5ZThh YjAzOWI4NDkxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIyLTAyLTI1ICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgVHJlYXQgZW1wdHkgaW50ZXJzZWN0 aW9uIGNvcnJlY3RseSBpbiBSZW5kZXJMYXllcjo6Z2V0UmVjdFRvRXhwb3NlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzcxODkKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY2FzZSB3aGVyZSB0aGUg dGFyZ2V0IHJlY3QgdG8gcmV2ZWFsIGhhZCB6ZXJvIGhlaWdodCBhbmQgd2FzIG91dHNpZGUgb2Yg dGhlIHZpc2libGUgcmVjdCwgdGhlCisgICAgICAgIGNsYXNzaWZpY2F0aW9uIHdhcyB3cm9uZ2x5 IHRoYXQgdGhlIHRhcmdldCB3YXMgdmlzaWJsZSwgZml4IHRoaXMgdG8gY2xhc3NpZnkgYXMgaGlk ZGVuIGluc3RlYWQuCisKKyAgICAgICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGVudC12aXNpYmlsaXR5L2NvbnRlbnQtdmlzaWJpbGl0 eS0wNTAuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpnZXRSZWN0VG9FeHBvc2UgY29uc3QpOgorCiAyMDIy LTAyLTI1ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBb R1RLXVtXUEVdIFVuY291cGxlIGxpYmdibSwgbGliZHJtIGRlcGVuZGVuY2llcyBmcm9tIEFOR0xF IGZ1bmN0aW9uYWxpdHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmlu ZGV4IDM3YTgyYjgyOWE1OGRhZmFhZmI3ZWQwMDRlZTMzZDU5Y2VhYzRlNGQuLjE4ZTFiZDRiM2E5 OGYzZWU0ZTlhZWJmZjI5ZjJkMjMwMGI3MDA5ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmNwcApAQCAtMjY2NCwyNCArMjY2NCwyNiBAQCBMYXlvdXRSZWN0IFJlbmRl ckxheWVyOjpnZXRSZWN0VG9FeHBvc2UoY29uc3QgTGF5b3V0UmVjdCYgdmlzaWJsZVJlY3QsIGNv bnN0IExheQogICAgIH0KIAogICAgIC8vIERldGVybWluZSB0aGUgYXBwcm9wcmlhdGUgWCBiZWhh dmlvci4KLSAgICBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yIHNjcm9sbFg7CisgICAgU2Nyb2xs QWxpZ25tZW50OjpCZWhhdmlvciBzY3JvbGxYID0gYWxpZ25YLmdldEhpZGRlbkJlaGF2aW9yKCk7 CiAgICAgTGF5b3V0UmVjdCBleHBvc2VSZWN0WChleHBvc2VSZWN0LngoKSwgdmlzaWJsZVJlY3Qu eSgpLCBleHBvc2VSZWN0LndpZHRoKCksIHZpc2libGVSZWN0LmhlaWdodCgpKTsKLSAgICBMYXlv dXRVbml0IGludGVyc2VjdFdpZHRoID0gaW50ZXJzZWN0aW9uKHZpc2libGVSZWN0LCBleHBvc2VS ZWN0WCkud2lkdGgoKTsKLSAgICBpZiAoaW50ZXJzZWN0V2lkdGggPT0gZXhwb3NlUmVjdC53aWR0 aCgpIHx8IChhbGlnblgubGVnYWN5SG9yaXpvbnRhbFZpc2liaWxpdHlUaHJlc2hvbGRFbmFibGVk KCkgJiYgaW50ZXJzZWN0V2lkdGggPj0gTUlOX0lOVEVSU0VDVF9GT1JfUkVWRUFMKSkgewotICAg ICAgICAvLyBJZiB0aGUgcmVjdGFuZ2xlIGlzIGZ1bGx5IHZpc2libGUsIHVzZSB0aGUgc3BlY2lm aWVkIHZpc2libGUgYmVoYXZpb3IuCi0gICAgICAgIC8vIElmIHRoZSByZWN0YW5nbGUgaXMgcGFy dGlhbGx5IHZpc2libGUsIGJ1dCBvdmVyIGEgY2VydGFpbiB0aHJlc2hvbGQsCi0gICAgICAgIC8v IHRoZW4gdHJlYXQgaXQgYXMgZnVsbHkgdmlzaWJsZSB0byBhdm9pZCB1bm5lY2Vzc2FyeSBob3Jp em9udGFsIHNjcm9sbGluZwotICAgICAgICBzY3JvbGxYID0gYWxpZ25YLmdldFZpc2libGVCZWhh dmlvcigpOwotICAgIH0gZWxzZSBpZiAoaW50ZXJzZWN0V2lkdGggPT0gdmlzaWJsZVJlY3Qud2lk dGgoKSkgewotICAgICAgICAvLyBJZiB0aGUgcmVjdCBpcyBiaWdnZXIgdGhhbiB0aGUgdmlzaWJs ZSBhcmVhLCBkb24ndCBib3RoZXIgdHJ5aW5nIHRvIGNlbnRlci4gT3RoZXIgYWxpZ25tZW50cyB3 aWxsIHdvcmsuCi0gICAgICAgIHNjcm9sbFggPSBhbGlnblguZ2V0VmlzaWJsZUJlaGF2aW9yKCk7 Ci0gICAgICAgIGlmIChzY3JvbGxYID09IFNjcm9sbEFsaWdubWVudDo6QmVoYXZpb3I6OkFsaWdu Q2VudGVyKQotICAgICAgICAgICAgc2Nyb2xsWCA9IFNjcm9sbEFsaWdubWVudDo6QmVoYXZpb3I6 Ok5vU2Nyb2xsOwotICAgIH0gZWxzZSBpZiAoaW50ZXJzZWN0V2lkdGggPiAwKQotICAgICAgICAv LyBJZiB0aGUgcmVjdGFuZ2xlIGlzIHBhcnRpYWxseSB2aXNpYmxlLCBidXQgbm90IGFib3ZlIHRo ZSBtaW5pbXVtIHRocmVzaG9sZCwgdXNlIHRoZSBzcGVjaWZpZWQgcGFydGlhbCBiZWhhdmlvcgot ICAgICAgICBzY3JvbGxYID0gYWxpZ25YLmdldFBhcnRpYWxCZWhhdmlvcigpOwotICAgIGVsc2UK LSAgICAgICAgc2Nyb2xsWCA9IGFsaWduWC5nZXRIaWRkZW5CZWhhdmlvcigpOworICAgIExheW91 dFJlY3QgaW50ZXJzZWN0UmVjdCA9IGludGVyc2VjdGlvbih2aXNpYmxlUmVjdCwgZXhwb3NlUmVj dFgpOworICAgIGlmICghaW50ZXJzZWN0UmVjdC5pc0VtcHR5KCkpIHsKKyAgICAgICAgTGF5b3V0 VW5pdCBpbnRlcnNlY3RXaWR0aCA9IGludGVyc2VjdFJlY3Qud2lkdGgoKTsKKyAgICAgICAgaWYg KGludGVyc2VjdFdpZHRoID09IGV4cG9zZVJlY3Qud2lkdGgoKSB8fCAoYWxpZ25YLmxlZ2FjeUhv cml6b250YWxWaXNpYmlsaXR5VGhyZXNob2xkRW5hYmxlZCgpICYmIGludGVyc2VjdFdpZHRoID49 IE1JTl9JTlRFUlNFQ1RfRk9SX1JFVkVBTCkpIHsKKyAgICAgICAgICAgIC8vIElmIHRoZSByZWN0 YW5nbGUgaXMgZnVsbHkgdmlzaWJsZSwgdXNlIHRoZSBzcGVjaWZpZWQgdmlzaWJsZSBiZWhhdmlv ci4KKyAgICAgICAgICAgIC8vIElmIHRoZSByZWN0YW5nbGUgaXMgcGFydGlhbGx5IHZpc2libGUs IGJ1dCBvdmVyIGEgY2VydGFpbiB0aHJlc2hvbGQsCisgICAgICAgICAgICAvLyB0aGVuIHRyZWF0 IGl0IGFzIGZ1bGx5IHZpc2libGUgdG8gYXZvaWQgdW5uZWNlc3NhcnkgaG9yaXpvbnRhbCBzY3Jv bGxpbmcKKyAgICAgICAgICAgIHNjcm9sbFggPSBhbGlnblguZ2V0VmlzaWJsZUJlaGF2aW9yKCk7 CisgICAgICAgIH0gZWxzZSBpZiAoaW50ZXJzZWN0V2lkdGggPT0gdmlzaWJsZVJlY3Qud2lkdGgo KSkgeworICAgICAgICAgICAgLy8gSWYgdGhlIHJlY3QgaXMgYmlnZ2VyIHRoYW4gdGhlIHZpc2li bGUgYXJlYSwgZG9uJ3QgYm90aGVyIHRyeWluZyB0byBjZW50ZXIuIE90aGVyIGFsaWdubWVudHMg d2lsbCB3b3JrLgorICAgICAgICAgICAgc2Nyb2xsWCA9IGFsaWduWC5nZXRWaXNpYmxlQmVoYXZp b3IoKTsKKyAgICAgICAgICAgIGlmIChzY3JvbGxYID09IFNjcm9sbEFsaWdubWVudDo6QmVoYXZp b3I6OkFsaWduQ2VudGVyKQorICAgICAgICAgICAgICAgIHNjcm9sbFggPSBTY3JvbGxBbGlnbm1l bnQ6OkJlaGF2aW9yOjpOb1Njcm9sbDsKKyAgICAgICAgfSBlbHNlIGlmIChpbnRlcnNlY3RXaWR0 aCA+IDApIHsKKyAgICAgICAgICAgIC8vIElmIHRoZSByZWN0YW5nbGUgaXMgcGFydGlhbGx5IHZp c2libGUsIGJ1dCBub3QgYWJvdmUgdGhlIG1pbmltdW0gdGhyZXNob2xkLCB1c2UgdGhlIHNwZWNp ZmllZCBwYXJ0aWFsIGJlaGF2aW9yCisgICAgICAgICAgICBzY3JvbGxYID0gYWxpZ25YLmdldFBh cnRpYWxCZWhhdmlvcigpOworICAgICAgICB9CisgICAgfQogICAgIC8vIElmIHdlJ3JlIHRyeWlu ZyB0byBhbGlnbiB0byB0aGUgY2xvc2VzdCBlZGdlLCBhbmQgdGhlIGV4cG9zZVJlY3QgaXMgZnVy dGhlciByaWdodAogICAgIC8vIHRoYW4gdGhlIHZpc2libGVSZWN0LCBhbmQgbm90IGJpZ2dlciB0 aGFuIHRoZSB2aXNpYmxlIGFyZWEsIHRoZW4gYWxpZ24gd2l0aCB0aGUgcmlnaHQuCiAgICAgaWYg KHNjcm9sbFggPT0gU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvcjo6QWxpZ25Ub0Nsb3Nlc3RFZGdl ICYmIGV4cG9zZVJlY3QubWF4WCgpID4gdmlzaWJsZVJlY3QubWF4WCgpICYmIGV4cG9zZVJlY3Qu d2lkdGgoKSA8IHZpc2libGVSZWN0LndpZHRoKCkpCkBAIC0yNjk5LDIyICsyNzAxLDI0IEBAIExh eW91dFJlY3QgUmVuZGVyTGF5ZXI6OmdldFJlY3RUb0V4cG9zZShjb25zdCBMYXlvdXRSZWN0JiB2 aXNpYmxlUmVjdCwgY29uc3QgTGF5CiAgICAgICAgIHggPSBleHBvc2VSZWN0LngoKTsKIAogICAg IC8vIERldGVybWluZSB0aGUgYXBwcm9wcmlhdGUgWSBiZWhhdmlvci4KLSAgICBTY3JvbGxBbGln bm1lbnQ6OkJlaGF2aW9yIHNjcm9sbFk7CisgICAgU2Nyb2xsQWxpZ25tZW50OjpCZWhhdmlvciBz Y3JvbGxZID0gYWxpZ25ZLmdldEhpZGRlbkJlaGF2aW9yKCk7CiAgICAgTGF5b3V0UmVjdCBleHBv c2VSZWN0WSh2aXNpYmxlUmVjdC54KCksIGV4cG9zZVJlY3QueSgpLCB2aXNpYmxlUmVjdC53aWR0 aCgpLCBleHBvc2VSZWN0LmhlaWdodCgpKTsKLSAgICBMYXlvdXRVbml0IGludGVyc2VjdEhlaWdo dCA9IGludGVyc2VjdGlvbih2aXNpYmxlUmVjdCwgZXhwb3NlUmVjdFkpLmhlaWdodCgpOwotICAg IGlmIChpbnRlcnNlY3RIZWlnaHQgPT0gZXhwb3NlUmVjdC5oZWlnaHQoKSkKLSAgICAgICAgLy8g SWYgdGhlIHJlY3RhbmdsZSBpcyBmdWxseSB2aXNpYmxlLCB1c2UgdGhlIHNwZWNpZmllZCB2aXNp YmxlIGJlaGF2aW9yLgotICAgICAgICBzY3JvbGxZID0gYWxpZ25ZLmdldFZpc2libGVCZWhhdmlv cigpOwotICAgIGVsc2UgaWYgKGludGVyc2VjdEhlaWdodCA9PSB2aXNpYmxlUmVjdC5oZWlnaHQo KSkgewotICAgICAgICAvLyBJZiB0aGUgcmVjdCBpcyBiaWdnZXIgdGhhbiB0aGUgdmlzaWJsZSBh cmVhLCBkb24ndCBib3RoZXIgdHJ5aW5nIHRvIGNlbnRlci4gT3RoZXIgYWxpZ25tZW50cyB3aWxs IHdvcmsuCi0gICAgICAgIHNjcm9sbFkgPSBhbGlnblkuZ2V0VmlzaWJsZUJlaGF2aW9yKCk7Ci0g ICAgICAgIGlmIChzY3JvbGxZID09IFNjcm9sbEFsaWdubWVudDo6QmVoYXZpb3I6OkFsaWduQ2Vu dGVyKQotICAgICAgICAgICAgc2Nyb2xsWSA9IFNjcm9sbEFsaWdubWVudDo6QmVoYXZpb3I6Ok5v U2Nyb2xsOwotICAgIH0gZWxzZSBpZiAoaW50ZXJzZWN0SGVpZ2h0ID4gMCkKLSAgICAgICAgLy8g SWYgdGhlIHJlY3RhbmdsZSBpcyBwYXJ0aWFsbHkgdmlzaWJsZSwgdXNlIHRoZSBzcGVjaWZpZWQg cGFydGlhbCBiZWhhdmlvcgotICAgICAgICBzY3JvbGxZID0gYWxpZ25ZLmdldFBhcnRpYWxCZWhh dmlvcigpOwotICAgIGVsc2UKLSAgICAgICAgc2Nyb2xsWSA9IGFsaWduWS5nZXRIaWRkZW5CZWhh dmlvcigpOworICAgIGludGVyc2VjdFJlY3QgPSBpbnRlcnNlY3Rpb24odmlzaWJsZVJlY3QsIGV4 cG9zZVJlY3RZKTsKKyAgICBpZiAoIWludGVyc2VjdFJlY3QuaXNFbXB0eSgpKSB7CisgICAgICAg IExheW91dFVuaXQgaW50ZXJzZWN0SGVpZ2h0ID0gaW50ZXJzZWN0UmVjdC5oZWlnaHQoKTsKKyAg ICAgICAgaWYgKGludGVyc2VjdEhlaWdodCA9PSBleHBvc2VSZWN0LmhlaWdodCgpKSB7CisgICAg ICAgICAgICAvLyBJZiB0aGUgcmVjdGFuZ2xlIGlzIGZ1bGx5IHZpc2libGUsIHVzZSB0aGUgc3Bl Y2lmaWVkIHZpc2libGUgYmVoYXZpb3IuCisgICAgICAgICAgICBzY3JvbGxZID0gYWxpZ25ZLmdl dFZpc2libGVCZWhhdmlvcigpOworICAgICAgICB9IGVsc2UgaWYgKGludGVyc2VjdEhlaWdodCA9 PSB2aXNpYmxlUmVjdC5oZWlnaHQoKSkgeworICAgICAgICAgICAgLy8gSWYgdGhlIHJlY3QgaXMg YmlnZ2VyIHRoYW4gdGhlIHZpc2libGUgYXJlYSwgZG9uJ3QgYm90aGVyIHRyeWluZyB0byBjZW50 ZXIuIE90aGVyIGFsaWdubWVudHMgd2lsbCB3b3JrLgorICAgICAgICAgICAgc2Nyb2xsWSA9IGFs aWduWS5nZXRWaXNpYmxlQmVoYXZpb3IoKTsKKyAgICAgICAgICAgIGlmIChzY3JvbGxZID09IFNj cm9sbEFsaWdubWVudDo6QmVoYXZpb3I6OkFsaWduQ2VudGVyKQorICAgICAgICAgICAgICAgIHNj cm9sbFkgPSBTY3JvbGxBbGlnbm1lbnQ6OkJlaGF2aW9yOjpOb1Njcm9sbDsKKyAgICAgICAgfSBl bHNlIGlmIChpbnRlcnNlY3RIZWlnaHQgPiAwKSB7CisgICAgICAgICAgICAvLyBJZiB0aGUgcmVj dGFuZ2xlIGlzIHBhcnRpYWxseSB2aXNpYmxlLCB1c2UgdGhlIHNwZWNpZmllZCBwYXJ0aWFsIGJl aGF2aW9yCisgICAgICAgICAgICBzY3JvbGxZID0gYWxpZ25ZLmdldFBhcnRpYWxCZWhhdmlvcigp OworICAgICAgICB9CisgICAgfQogICAgIC8vIElmIHdlJ3JlIHRyeWluZyB0byBhbGlnbiB0byB0 aGUgY2xvc2VzdCBlZGdlLCBhbmQgdGhlIGV4cG9zZVJlY3QgaXMgZnVydGhlciBkb3duCiAgICAg Ly8gdGhhbiB0aGUgdmlzaWJsZVJlY3QsIGFuZCBub3QgYmlnZ2VyIHRoYW4gdGhlIHZpc2libGUg YXJlYSwgdGhlbiBhbGlnbiB3aXRoIHRoZSBib3R0b20uCiAgICAgaWYgKHNjcm9sbFkgPT0gU2Ny b2xsQWxpZ25tZW50OjpCZWhhdmlvcjo6QWxpZ25Ub0Nsb3Nlc3RFZGdlICYmIGV4cG9zZVJlY3Qu bWF4WSgpID4gdmlzaWJsZVJlY3QubWF4WSgpICYmIGV4cG9zZVJlY3QuaGVpZ2h0KCkgPCB2aXNp YmxlUmVjdC5oZWlnaHQoKSkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IGZmYTA2 MzRlZjQxZjE3YzJkNDE5NDM3NjYzM2ZlZTliMmY5NTRhNWYuLmE0NDZhMjQyNmQ4NGVhMTkxMmU0 YmQyZDM4M2Y0MzY3MDhiMjI1MGYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAt MSwzICsxLDEyIEBACisyMDIyLTAyLTI1ICBSb2IgQnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisK KyAgICAgICAgVHJlYXQgZW1wdHkgaW50ZXJzZWN0aW9uIGNvcnJlY3RseSBpbiBSZW5kZXJMYXll cjo6Z2V0UmVjdFRvRXhwb3NlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMzcxODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29udGVudC12 aXNpYmlsaXR5L2NvbnRlbnQtdmlzaWJpbGl0eS0wNTAtZXhwZWN0ZWQudHh0OgorCiAyMDIyLTAy LTI0ICBPcmlvbCBCcnVmYXUgIDxvYnJ1ZmF1QGlnYWxpYS5jb20+CiAKICAgICAgICAgW2Nzcy1j YXNjYWRlXSBTdXBwb3J0ICdyZXZlcnQnIGluIEBrZXlmcmFtZXMKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWluL2Nv bnRlbnQtdmlzaWJpbGl0eS9jb250ZW50LXZpc2liaWxpdHktMDUwLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1jb250YWlu L2NvbnRlbnQtdmlzaWJpbGl0eS9jb250ZW50LXZpc2liaWxpdHktMDUwLWV4cGVjdGVkLnR4dApp bmRleCBlZTBiNGU1NDNlZjU3NzE3NWQ1YzhmZWZhM2VhMjM2MjE2ZTEyODBiLi40MDMwODVhOWQx YjZkMmVhODczMzRjMWZkOWNjNmZjYzQxNzNjNWEwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p bXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3MtY29udGFpbi9jb250ZW50LXZp c2liaWxpdHkvY29udGVudC12aXNpYmlsaXR5LTA1MC1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWNvbnRhaW4vY29u dGVudC12aXNpYmlsaXR5L2NvbnRlbnQtdmlzaWJpbGl0eS0wNTAtZXhwZWN0ZWQudHh0CkBAIC0x LDMgKzEsMyBAQAogCi1GQUlMIFVzaW5nIHRhYmluZGV4IHRvIGZvY3VzIGFuIG5ld2x5IGNvbnN0 cnVjdGVkIGVsZW1lbnQgaW4gYW4gYXV0byBzdWJ0cmVlIGZvY3VzZXMgZWxlbWVudCBhc3NlcnRf Z3JlYXRlcl90aGFuOiBleHBlY3RlZCBhIG51bWJlciBncmVhdGVyIHRoYW4gNTAwIGJ1dCBnb3Qg MAorUEFTUyBVc2luZyB0YWJpbmRleCB0byBmb2N1cyBhbiBuZXdseSBjb25zdHJ1Y3RlZCBlbGVt ZW50IGluIGFuIGF1dG8gc3VidHJlZSBmb2N1c2VzIGVsZW1lbnQKIAo=