224482 2021-04-13 05:36:29 -0700 Make SVGElement::getBoundingBox retrieve bbox from RenderObject 2021-04-14 11:16:48 -0700 1 1 1 Unclassified WebKit SVG Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis cdumez cmarcelo dino esprehn+autocc ews-watchlist fmalita gyuyoung.kim kangil.han pdr sabouhallawa schenney sergio webkit-bug-importer zalan zimmermann oldest_to_newest 1749659 0 rbuis 2021-04-13 05:36:29 -0700 Make SVGElement::getBoundingBox retrieve bbox from RenderObject. 1749660 1 425865 rbuis 2021-04-13 05:37:57 -0700 Created attachment 425865 Patch 1749662 2 425867 rbuis 2021-04-13 06:07:03 -0700 Created attachment 425867 Patch 1749686 3 425873 rbuis 2021-04-13 08:23:35 -0700 Created attachment 425873 Patch 1749833 4 zalan 2021-04-13 13:25:25 -0700 Wouldn't this return incorrect rect for SVGPathElement? 1749840 5 rbuis 2021-04-13 13:39:09 -0700 (In reply to zalan from comment #4) > Wouldn't this return incorrect rect for SVGPathElement? I do not think so, an SVGPathElement is a SVGGraphicsElement too. There should be no change in behaviour. 1749893 6 zalan 2021-04-13 15:22:54 -0700 The difference is 1. path().boundingRect() (SVGPathElement::getBBox -> RenderSVGPath::path().boundingRect()) vs. 2. some cached path().boundingRect() value (through RenderSVGPath::objectBoundingBox() which returns m_fillBoundingBox which is populated at updateShapeFromElement by calling calculateObjectBoundingBox (which is indeed path().boundingRect()), but I think it should be fine. 1749903 7 zalan 2021-04-13 15:40:27 -0700 ResizeObservation::computeObservedSize (and some of the other call sites) are also "change in functionality" but let's consider them progressions. 1750018 8 rbuis 2021-04-13 23:52:14 -0700 (In reply to zalan from comment #7) > ResizeObservation::computeObservedSize (and some of the other call sites) > are also "change in functionality" but let's consider them progressions. Ah sorry, I missed this and the Path specific code, I thought there was only SVGLocatable::getBBox. Thanks for analysing and given it turned out green, the change should be safe. 1750019 9 ews-feeder 2021-04-14 00:00:05 -0700 Committed r275935 (236497@main): <https://commits.webkit.org/236497@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425873. 1750020 10 webkit-bug-importer 2021-04-14 00:01:17 -0700 <rdar://problem/76631485> 1750238 11 zalan 2021-04-14 11:16:48 -0700 (In reply to Rob Buis from comment #8) > (In reply to zalan from comment #7) > > ResizeObservation::computeObservedSize (and some of the other call sites) > > are also "change in functionality" but let's consider them progressions. > > Ah sorry, I missed this and the Path specific code, I thought there was only > SVGLocatable::getBBox. Thanks for analysing and given it turned out green, > the change should be safe. Thanks for fixing it. 425865 2021-04-13 05:37:57 -0700 2021-04-13 06:17:49 -0700 Patch bug-224482-20210413143756.patch text/plain 3284 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1ODgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmQ5MjhkODhhMWQ0ZTMz MDE3ODdlZjU2MjI4OTBmMjcyMzFlNWNkZC4uMDhmZjNhNmFiMzc4ZTJmZWU0M2NmZGQxM2I2ODhi ZGZiMWNlOTNiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA0LTEzICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTWFrZSBTVkdFbGVtZW50OjpnZXRC b3VuZGluZ0JveCByZXRyaWV2ZSBiYm94IGZyb20gUmVuZGVyT2JqZWN0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ0ODIKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIFNWR0VsZW1lbnQ6OmdldEJv dW5kaW5nQm94IHJldHJpZXZlIGJib3ggZnJvbSBSZW5kZXJPYmplY3QuCisKKyAgICAgICAgKiBk b20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjphYnNvbHV0ZUV2ZW50 Qm91bmRzKToKKyAgICAgICAgKiBzdmcvU1ZHRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTVkdFbGVtZW50OjpnZXRCb3VuZGluZ0JveCk6CisgICAgICAgICogc3ZnL1NWR0VsZW1lbnQu aDoKKwogMjAyMS0wNC0xMyAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW0dUS11bV1BFXSBBdmlmIGRlY29kZXIgYnVpbGQgYnJva2VuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20v RWxlbWVudC5jcHAKaW5kZXggYzZlYjE0NjgwNmJhMjUzOTRmYzI1OGRiODFkMzhjNDhhYWJiMTEw YS4uNTJiN2RmMWMzYjFlNWY4YWM5ZjI5NGJlODk2NDQ4MDZlNDA1NTBjZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9F bGVtZW50LmNwcApAQCAtMTUxMyw3ICsxNTEzLDcgQEAgTGF5b3V0UmVjdCBFbGVtZW50OjphYnNv bHV0ZUV2ZW50Qm91bmRzKGJvb2wmIGJvdW5kc0luY2x1ZGVBbGxEZXNjZW5kYW50RWxlbWVudHMK ICAgICAgICAgLy8gR2V0IHRoZSBib3VuZGluZyByZWN0YW5nbGUgZnJvbSB0aGUgU1ZHIG1vZGVs LgogICAgICAgICBTVkdFbGVtZW50JiBzdmdFbGVtZW50ID0gZG93bmNhc3Q8U1ZHRWxlbWVudD4o KnRoaXMpOwogICAgICAgICBGbG9hdFJlY3QgbG9jYWxSZWN0OwotICAgICAgICBpZiAoc3ZnRWxl bWVudC5nZXRCb3VuZGluZ0JveChsb2NhbFJlY3QsIFNWR0xvY2F0YWJsZTo6RGlzYWxsb3dTdHls ZVVwZGF0ZSkpCisgICAgICAgIGlmIChzdmdFbGVtZW50LmdldEJvdW5kaW5nQm94KGxvY2FsUmVj dCkpCiAgICAgICAgICAgICByZXN1bHQgPSBMYXlvdXRSZWN0KHJlbmRlcmVyKCktPmxvY2FsVG9B YnNvbHV0ZVF1YWQobG9jYWxSZWN0LCBVc2VUcmFuc2Zvcm1zLCAmaW5jbHVkZXNGaXhlZFBvc2l0 aW9uRWxlbWVudHMpLmJvdW5kaW5nQm94KCkpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIGF1dG8q IHJlbmRlcmVyID0gdGhpcy0+cmVuZGVyZXIoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3N2Zy9TVkdFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcApp bmRleCA0NGI0OWEyOGYxZGM0MTBkYzgxMzNjZTg4ODNhNTliY2EzZTk3ZjNjLi4xNmY1MzVjMDQ1 Y2VmNWNjOTZiMWVlZmQ5OGFiZWZmNzM5NTNkYWViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9zdmcvU1ZHRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQu Y3BwCkBAIC0yOTMsMTIgKzI5MywxMyBAQCBjb25zdCBIYXNoU2V0PFNWR0VsZW1lbnQqPiYgU1ZH RWxlbWVudDo6aW5zdGFuY2VzKCkgY29uc3QKICAgICByZXR1cm4gbV9zdmdSYXJlRGF0YS0+aW5z dGFuY2VzKCk7CiB9CiAKLWJvb2wgU1ZHRWxlbWVudDo6Z2V0Qm91bmRpbmdCb3goRmxvYXRSZWN0 JiByZWN0LCBTVkdMb2NhdGFibGU6OlN0eWxlVXBkYXRlU3RyYXRlZ3kgc3R5bGVVcGRhdGVTdHJh dGVneSkKK2Jvb2wgU1ZHRWxlbWVudDo6Z2V0Qm91bmRpbmdCb3goRmxvYXRSZWN0JiByZWN0KQog ewotICAgIC8vIEZJWE1FOiBzaG91bGQgcmV0cmlldmUgdGhlIHZhbHVlIGZyb20gdGhlIGFzc29j aWF0ZWQgUmVuZGVyT2JqZWN0LgogICAgIGlmIChpczxTVkdHcmFwaGljc0VsZW1lbnQ+KCp0aGlz KSkgewotICAgICAgICByZWN0ID0gZG93bmNhc3Q8U1ZHR3JhcGhpY3NFbGVtZW50PigqdGhpcyku Z2V0QkJveChzdHlsZVVwZGF0ZVN0cmF0ZWd5KTsKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAg ICAgIGlmIChhdXRvIHJlbmRlcmVyID0gdGhpcy0+cmVuZGVyZXIoKSkgeworICAgICAgICAgICAg cmVjdCA9IHJlbmRlcmVyLT5vYmplY3RCb3VuZGluZ0JveCgpOworICAgICAgICAgICAgcmV0dXJu IHRydWU7CisgICAgICAgIH0KICAgICB9CiAgICAgcmV0dXJuIGZhbHNlOwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9T VkdFbGVtZW50LmgKaW5kZXggNjg0MTA1OTZmNDI2MDVhZjVkMzUzYjAzZjAwNTNiNzc1YmQ5NWJm MC4uMGIzODhjZjZlZmI1NjM1ZTI1ZjkxZTc4NzU1NTYxMDljZGQzMTJhZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcv U1ZHRWxlbWVudC5oCkBAIC05MSw3ICs5MSw3IEBAIHB1YmxpYzoKICAgICAvLyBUaGUgaW5zdGFu Y2VzIG9mIGFuIGVsZW1lbnQgYXJlIGNsb25lcyBtYWRlIGluIHNoYWRvdyB0cmVlcyB0byBpbXBs ZW1lbnQgPHVzZT4uCiAgICAgY29uc3QgSGFzaFNldDxTVkdFbGVtZW50Kj4mIGluc3RhbmNlcygp IGNvbnN0OwogCi0gICAgYm9vbCBnZXRCb3VuZGluZ0JveChGbG9hdFJlY3QmLCBTVkdMb2NhdGFi bGU6OlN0eWxlVXBkYXRlU3RyYXRlZ3kgPSBTVkdMb2NhdGFibGU6OkFsbG93U3R5bGVVcGRhdGUp OworICAgIGJvb2wgZ2V0Qm91bmRpbmdCb3goRmxvYXRSZWN0Jik7CiAKICAgICBTVkdFbGVtZW50 KiBjb3JyZXNwb25kaW5nRWxlbWVudCgpIGNvbnN0OwogICAgIFJlZlB0cjxTVkdVc2VFbGVtZW50 PiBjb3JyZXNwb25kaW5nVXNlRWxlbWVudCgpIGNvbnN0Owo= 425867 2021-04-13 06:07:03 -0700 2021-04-13 08:23:29 -0700 Patch bug-224482-20210413150701.patch text/plain 3849 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1ODgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmQ5MjhkODhhMWQ0ZTMz MDE3ODdlZjU2MjI4OTBmMjcyMzFlNWNkZC4uMDhmZjNhNmFiMzc4ZTJmZWU0M2NmZGQxM2I2ODhi ZGZiMWNlOTNiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA0LTEzICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTWFrZSBTVkdFbGVtZW50OjpnZXRC b3VuZGluZ0JveCByZXRyaWV2ZSBiYm94IGZyb20gUmVuZGVyT2JqZWN0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ0ODIKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIFNWR0VsZW1lbnQ6OmdldEJv dW5kaW5nQm94IHJldHJpZXZlIGJib3ggZnJvbSBSZW5kZXJPYmplY3QuCisKKyAgICAgICAgKiBk b20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjphYnNvbHV0ZUV2ZW50 Qm91bmRzKToKKyAgICAgICAgKiBzdmcvU1ZHRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTVkdFbGVtZW50OjpnZXRCb3VuZGluZ0JveCk6CisgICAgICAgICogc3ZnL1NWR0VsZW1lbnQu aDoKKwogMjAyMS0wNC0xMyAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW0dUS11bV1BFXSBBdmlmIGRlY29kZXIgYnVpbGQgYnJva2VuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20v RWxlbWVudC5jcHAKaW5kZXggYzZlYjE0NjgwNmJhMjUzOTRmYzI1OGRiODFkMzhjNDhhYWJiMTEw YS4uYzVhYTA2MjNjYjdmZGRlNTM5MTUzNjliYWUzNzg1MzU2MmM2ZWY0YyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9F bGVtZW50LmNwcApAQCAtMTUxMyw3ICsxNTEzLDcgQEAgTGF5b3V0UmVjdCBFbGVtZW50OjphYnNv bHV0ZUV2ZW50Qm91bmRzKGJvb2wmIGJvdW5kc0luY2x1ZGVBbGxEZXNjZW5kYW50RWxlbWVudHMK ICAgICAgICAgLy8gR2V0IHRoZSBib3VuZGluZyByZWN0YW5nbGUgZnJvbSB0aGUgU1ZHIG1vZGVs LgogICAgICAgICBTVkdFbGVtZW50JiBzdmdFbGVtZW50ID0gZG93bmNhc3Q8U1ZHRWxlbWVudD4o KnRoaXMpOwogICAgICAgICBGbG9hdFJlY3QgbG9jYWxSZWN0OwotICAgICAgICBpZiAoc3ZnRWxl bWVudC5nZXRCb3VuZGluZ0JveChsb2NhbFJlY3QsIFNWR0xvY2F0YWJsZTo6RGlzYWxsb3dTdHls ZVVwZGF0ZSkpCisgICAgICAgIGlmIChzdmdFbGVtZW50LmdldEJvdW5kaW5nQm94KGxvY2FsUmVj dCkpCiAgICAgICAgICAgICByZXN1bHQgPSBMYXlvdXRSZWN0KHJlbmRlcmVyKCktPmxvY2FsVG9B YnNvbHV0ZVF1YWQobG9jYWxSZWN0LCBVc2VUcmFuc2Zvcm1zLCAmaW5jbHVkZXNGaXhlZFBvc2l0 aW9uRWxlbWVudHMpLmJvdW5kaW5nQm94KCkpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIGF1dG8q IHJlbmRlcmVyID0gdGhpcy0+cmVuZGVyZXIoKTsKQEAgLTE2NTEsNyArMTY1MSw3IEBAIE9wdGlv bmFsPHN0ZDo6cGFpcjxSZW5kZXJPYmplY3QqLCBGbG9hdFJlY3Q+PiBFbGVtZW50Ojpib3VuZGlu Z0Fic29sdXRlUmVjdFdpdGhvCiAgICAgICAgIC8vIEdldCB0aGUgYm91bmRpbmcgcmVjdGFuZ2xl IGZyb20gdGhlIFNWRyBtb2RlbC4KICAgICAgICAgU1ZHRWxlbWVudCYgc3ZnRWxlbWVudCA9IGRv d25jYXN0PFNWR0VsZW1lbnQ+KCp0aGlzKTsKICAgICAgICAgRmxvYXRSZWN0IGxvY2FsUmVjdDsK LSAgICAgICAgaWYgKHN2Z0VsZW1lbnQuZ2V0Qm91bmRpbmdCb3gobG9jYWxSZWN0LCBTVkdMb2Nh dGFibGU6OkRpc2FsbG93U3R5bGVVcGRhdGUpKQorICAgICAgICBpZiAoc3ZnRWxlbWVudC5nZXRC b3VuZGluZ0JveChsb2NhbFJlY3QpKQogICAgICAgICAgICAgcXVhZHMuYXBwZW5kKHJlbmRlcmVy LT5sb2NhbFRvQWJzb2x1dGVRdWFkKGxvY2FsUmVjdCkpOwogICAgIH0gZWxzZSBpZiAoYXV0byBw YWlyID0gbGlzdEJveEVsZW1lbnRCb3VuZGluZ0JveCgqdGhpcykpIHsKICAgICAgICAgcmVuZGVy ZXIgPSBwYWlyLnZhbHVlKCkuZmlyc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcv U1ZHRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5jcHAKaW5kZXgg NDRiNDlhMjhmMWRjNDEwZGM4MTMzY2U4ODgzYTU5YmNhM2U5N2YzYy4uMTZmNTM1YzA0NWNlZjVj Yzk2YjFlZWZkOThhYmVmZjczOTUzZGFlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3Zn L1NWR0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcApA QCAtMjkzLDEyICsyOTMsMTMgQEAgY29uc3QgSGFzaFNldDxTVkdFbGVtZW50Kj4mIFNWR0VsZW1l bnQ6Omluc3RhbmNlcygpIGNvbnN0CiAgICAgcmV0dXJuIG1fc3ZnUmFyZURhdGEtPmluc3RhbmNl cygpOwogfQogCi1ib29sIFNWR0VsZW1lbnQ6OmdldEJvdW5kaW5nQm94KEZsb2F0UmVjdCYgcmVj dCwgU1ZHTG9jYXRhYmxlOjpTdHlsZVVwZGF0ZVN0cmF0ZWd5IHN0eWxlVXBkYXRlU3RyYXRlZ3kp Citib29sIFNWR0VsZW1lbnQ6OmdldEJvdW5kaW5nQm94KEZsb2F0UmVjdCYgcmVjdCkKIHsKLSAg ICAvLyBGSVhNRTogc2hvdWxkIHJldHJpZXZlIHRoZSB2YWx1ZSBmcm9tIHRoZSBhc3NvY2lhdGVk IFJlbmRlck9iamVjdC4KICAgICBpZiAoaXM8U1ZHR3JhcGhpY3NFbGVtZW50PigqdGhpcykpIHsK LSAgICAgICAgcmVjdCA9IGRvd25jYXN0PFNWR0dyYXBoaWNzRWxlbWVudD4oKnRoaXMpLmdldEJC b3goc3R5bGVVcGRhdGVTdHJhdGVneSk7Ci0gICAgICAgIHJldHVybiB0cnVlOworICAgICAgICBp ZiAoYXV0byByZW5kZXJlciA9IHRoaXMtPnJlbmRlcmVyKCkpIHsKKyAgICAgICAgICAgIHJlY3Qg PSByZW5kZXJlci0+b2JqZWN0Qm91bmRpbmdCb3goKTsKKyAgICAgICAgICAgIHJldHVybiB0cnVl OworICAgICAgICB9CiAgICAgfQogICAgIHJldHVybiBmYWxzZTsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxl bWVudC5oCmluZGV4IDY4NDEwNTk2ZjQyNjA1YWY1ZDM1M2IwM2YwMDUzYjc3NWJkOTViZjAuLjBi Mzg4Y2Y2ZWZiNTYzNWUyNWY5MWU3ODc1NTU2MTA5Y2RkMzEyYWYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0Vs ZW1lbnQuaApAQCAtOTEsNyArOTEsNyBAQCBwdWJsaWM6CiAgICAgLy8gVGhlIGluc3RhbmNlcyBv ZiBhbiBlbGVtZW50IGFyZSBjbG9uZXMgbWFkZSBpbiBzaGFkb3cgdHJlZXMgdG8gaW1wbGVtZW50 IDx1c2U+LgogICAgIGNvbnN0IEhhc2hTZXQ8U1ZHRWxlbWVudCo+JiBpbnN0YW5jZXMoKSBjb25z dDsKIAotICAgIGJvb2wgZ2V0Qm91bmRpbmdCb3goRmxvYXRSZWN0JiwgU1ZHTG9jYXRhYmxlOjpT dHlsZVVwZGF0ZVN0cmF0ZWd5ID0gU1ZHTG9jYXRhYmxlOjpBbGxvd1N0eWxlVXBkYXRlKTsKKyAg ICBib29sIGdldEJvdW5kaW5nQm94KEZsb2F0UmVjdCYpOwogCiAgICAgU1ZHRWxlbWVudCogY29y cmVzcG9uZGluZ0VsZW1lbnQoKSBjb25zdDsKICAgICBSZWZQdHI8U1ZHVXNlRWxlbWVudD4gY29y cmVzcG9uZGluZ1VzZUVsZW1lbnQoKSBjb25zdDsK 425873 2021-04-13 08:23:35 -0700 2021-04-14 00:00:07 -0700 Patch bug-224482-20210413172334.patch text/plain 6164 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1ODgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmQ5MjhkODhhMWQ0ZTMz MDE3ODdlZjU2MjI4OTBmMjcyMzFlNWNkZC4uZjY0M2NhNGU2ODY4ODhiM2VhZmMyNzgwMjI2ZTcx YjYxNDEyYTc1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA0LTEzICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgTWFrZSBTVkdFbGVtZW50OjpnZXRC b3VuZGluZ0JveCByZXRyaWV2ZSBiYm94IGZyb20gUmVuZGVyT2JqZWN0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjQ0ODIKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIFNWR0VsZW1lbnQ6OmdldEJv dW5kaW5nQm94IHJldHJpZXZlIGJib3ggZnJvbSBSZW5kZXJPYmplY3QuCisgICAgICAgIEFsc28g bWFrZSBpdCBjb25zdCBhbmQgcmV0dXJuIGFuIE9wdGlvbmFsLgorCisgICAgICAgICogZG9tL0Vs ZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6Ym91bmRzSW5Sb290Vmlld1Nw YWNlKToKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OmFic29sdXRlRXZlbnRCb3VuZHMpOgor ICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6Ym91bmRpbmdBYnNvbHV0ZVJlY3RXaXRob3V0TGF5 b3V0KToKKyAgICAgICAgKiBwYWdlL1Jlc2l6ZU9ic2VydmF0aW9uLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlc2l6ZU9ic2VydmF0aW9uOjpjb21wdXRlT2JzZXJ2ZWRTaXplIGNvbnN0KToKKyAg ICAgICAgKiBzdmcvU1ZHRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTVkdFbGVtZW50 OjpnZXRCb3VuZGluZ0JveCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTVkdFbGVtZW50Ojpn ZXRCb3VuZGluZ0JveCk6IERlbGV0ZWQuCisgICAgICAgICogc3ZnL1NWR0VsZW1lbnQuaDoKKwog MjAyMS0wNC0xMyAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0dUS11bV1BFXSBBdmlmIGRlY29kZXIgYnVpbGQgYnJva2VuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVu dC5jcHAKaW5kZXggYzZlYjE0NjgwNmJhMjUzOTRmYzI1OGRiODFkMzhjNDhhYWJiMTEwYS4uYjU4 NjJiOWIzMDhjYzBiOGIxY2IwNDkzMjlkM2ZhYmRjZjIwNTM5NSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50 LmNwcApAQCAtMTQ1MSw5ICsxNDUxLDggQEAgSW50UmVjdCBFbGVtZW50Ojpib3VuZHNJblJvb3RW aWV3U3BhY2UoKQogICAgIGlmIChpc1NWR0VsZW1lbnQoKSAmJiByZW5kZXJlcigpKSB7CiAgICAg ICAgIC8vIEdldCB0aGUgYm91bmRpbmcgcmVjdGFuZ2xlIGZyb20gdGhlIFNWRyBtb2RlbC4KICAg ICAgICAgU1ZHRWxlbWVudCYgc3ZnRWxlbWVudCA9IGRvd25jYXN0PFNWR0VsZW1lbnQ+KCp0aGlz KTsKLSAgICAgICAgRmxvYXRSZWN0IGxvY2FsUmVjdDsKLSAgICAgICAgaWYgKHN2Z0VsZW1lbnQu Z2V0Qm91bmRpbmdCb3gobG9jYWxSZWN0KSkKLSAgICAgICAgICAgIHF1YWRzLmFwcGVuZChyZW5k ZXJlcigpLT5sb2NhbFRvQWJzb2x1dGVRdWFkKGxvY2FsUmVjdCkpOworICAgICAgICBpZiAoYXV0 byBsb2NhbFJlY3QgPSBzdmdFbGVtZW50LmdldEJvdW5kaW5nQm94KCkpCisgICAgICAgICAgICBx dWFkcy5hcHBlbmQocmVuZGVyZXIoKS0+bG9jYWxUb0Fic29sdXRlUXVhZCgqbG9jYWxSZWN0KSk7 CiAgICAgfSBlbHNlIHsKICAgICAgICAgLy8gR2V0IHRoZSBib3VuZGluZyByZWN0YW5nbGUgZnJv bSB0aGUgYm94IG1vZGVsLgogICAgICAgICBpZiAocmVuZGVyQm94TW9kZWxPYmplY3QoKSkKQEAg LTE1MTIsOSArMTUxMSw4IEBAIExheW91dFJlY3QgRWxlbWVudDo6YWJzb2x1dGVFdmVudEJvdW5k cyhib29sJiBib3VuZHNJbmNsdWRlQWxsRGVzY2VuZGFudEVsZW1lbnRzCiAgICAgaWYgKGlzU1ZH RWxlbWVudCgpKSB7CiAgICAgICAgIC8vIEdldCB0aGUgYm91bmRpbmcgcmVjdGFuZ2xlIGZyb20g dGhlIFNWRyBtb2RlbC4KICAgICAgICAgU1ZHRWxlbWVudCYgc3ZnRWxlbWVudCA9IGRvd25jYXN0 PFNWR0VsZW1lbnQ+KCp0aGlzKTsKLSAgICAgICAgRmxvYXRSZWN0IGxvY2FsUmVjdDsKLSAgICAg ICAgaWYgKHN2Z0VsZW1lbnQuZ2V0Qm91bmRpbmdCb3gobG9jYWxSZWN0LCBTVkdMb2NhdGFibGU6 OkRpc2FsbG93U3R5bGVVcGRhdGUpKQotICAgICAgICAgICAgcmVzdWx0ID0gTGF5b3V0UmVjdChy ZW5kZXJlcigpLT5sb2NhbFRvQWJzb2x1dGVRdWFkKGxvY2FsUmVjdCwgVXNlVHJhbnNmb3Jtcywg JmluY2x1ZGVzRml4ZWRQb3NpdGlvbkVsZW1lbnRzKS5ib3VuZGluZ0JveCgpKTsKKyAgICAgICAg aWYgKGF1dG8gbG9jYWxSZWN0ID0gc3ZnRWxlbWVudC5nZXRCb3VuZGluZ0JveCgpKQorICAgICAg ICAgICAgcmVzdWx0ID0gTGF5b3V0UmVjdChyZW5kZXJlcigpLT5sb2NhbFRvQWJzb2x1dGVRdWFk KCpsb2NhbFJlY3QsIFVzZVRyYW5zZm9ybXMsICZpbmNsdWRlc0ZpeGVkUG9zaXRpb25FbGVtZW50 cykuYm91bmRpbmdCb3goKSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgYXV0byogcmVuZGVyZXIg PSB0aGlzLT5yZW5kZXJlcigpOwogICAgICAgICBpZiAoaXM8UmVuZGVyQm94PihyZW5kZXJlcikp IHsKQEAgLTE2NTAsOSArMTY0OCw4IEBAIE9wdGlvbmFsPHN0ZDo6cGFpcjxSZW5kZXJPYmplY3Qq LCBGbG9hdFJlY3Q+PiBFbGVtZW50Ojpib3VuZGluZ0Fic29sdXRlUmVjdFdpdGhvCiAgICAgaWYg KGlzU1ZHRWxlbWVudCgpICYmIHJlbmRlcmVyICYmICFyZW5kZXJlci0+aXNTVkdSb290KCkpIHsK ICAgICAgICAgLy8gR2V0IHRoZSBib3VuZGluZyByZWN0YW5nbGUgZnJvbSB0aGUgU1ZHIG1vZGVs LgogICAgICAgICBTVkdFbGVtZW50JiBzdmdFbGVtZW50ID0gZG93bmNhc3Q8U1ZHRWxlbWVudD4o KnRoaXMpOwotICAgICAgICBGbG9hdFJlY3QgbG9jYWxSZWN0OwotICAgICAgICBpZiAoc3ZnRWxl bWVudC5nZXRCb3VuZGluZ0JveChsb2NhbFJlY3QsIFNWR0xvY2F0YWJsZTo6RGlzYWxsb3dTdHls ZVVwZGF0ZSkpCi0gICAgICAgICAgICBxdWFkcy5hcHBlbmQocmVuZGVyZXItPmxvY2FsVG9BYnNv bHV0ZVF1YWQobG9jYWxSZWN0KSk7CisgICAgICAgIGlmIChhdXRvIGxvY2FsUmVjdCA9IHN2Z0Vs ZW1lbnQuZ2V0Qm91bmRpbmdCb3goKSkKKyAgICAgICAgICAgIHF1YWRzLmFwcGVuZChyZW5kZXJl ci0+bG9jYWxUb0Fic29sdXRlUXVhZCgqbG9jYWxSZWN0KSk7CiAgICAgfSBlbHNlIGlmIChhdXRv IHBhaXIgPSBsaXN0Qm94RWxlbWVudEJvdW5kaW5nQm94KCp0aGlzKSkgewogICAgICAgICByZW5k ZXJlciA9IHBhaXIudmFsdWUoKS5maXJzdDsKICAgICAgICAgcXVhZHMuYXBwZW5kKHJlbmRlcmVy LT5sb2NhbFRvQWJzb2x1dGVRdWFkKEZsb2F0UXVhZCB7IHBhaXIudmFsdWUoKS5zZWNvbmQgfSkp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9SZXNpemVPYnNlcnZhdGlvbi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Jlc2l6ZU9ic2VydmF0aW9uLmNwcAppbmRleCAxNTJjNmJi NDYwOTc0OWZmOTA1ZmNkNTA3M2YxMDAxMzUwYWQ2MTFkLi43YzFhOTIzMDcyY2RjMDAyZjFlOGVl OWEwNjM1ZjdhNjM3M2Q3OTJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Jlc2l6 ZU9ic2VydmF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Jlc2l6ZU9ic2VydmF0 aW9uLmNwcApAQCAtNTYsOSArNTYsOCBAQCB2b2lkIFJlc2l6ZU9ic2VydmF0aW9uOjp1cGRhdGVP YnNlcnZhdGlvblNpemUoY29uc3QgTGF5b3V0U2l6ZSYgc2l6ZSkKIExheW91dFNpemUgUmVzaXpl T2JzZXJ2YXRpb246OmNvbXB1dGVPYnNlcnZlZFNpemUoKSBjb25zdAogewogICAgIGlmIChtX3Rh cmdldC0+aXNTVkdFbGVtZW50KCkpIHsKLSAgICAgICAgRmxvYXRSZWN0IHN2Z1JlY3Q7Ci0gICAg ICAgIGlmIChkb3duY2FzdDxTVkdFbGVtZW50PigqbV90YXJnZXQpLmdldEJvdW5kaW5nQm94KHN2 Z1JlY3QpKQotICAgICAgICAgICAgcmV0dXJuIExheW91dFNpemUoc3ZnUmVjdC53aWR0aCgpLCBz dmdSZWN0LmhlaWdodCgpKTsKKyAgICAgICAgaWYgKGF1dG8gc3ZnUmVjdCA9IGRvd25jYXN0PFNW R0VsZW1lbnQ+KCptX3RhcmdldCkuZ2V0Qm91bmRpbmdCb3goKSkKKyAgICAgICAgICAgIHJldHVy biBMYXlvdXRTaXplKHN2Z1JlY3QtPndpZHRoKCksIHN2Z1JlY3QtPmhlaWdodCgpKTsKICAgICB9 CiAgICAgYXV0byogYm94ID0gbV90YXJnZXQtPnJlbmRlckJveCgpOwogICAgIGlmIChib3gpIHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcAppbmRleCA0NGI0OWEyOGYxZGM0MTBkYzgxMzNjZTg4 ODNhNTliY2EzZTk3ZjNjLi42NzRlYzdiMmI4M2MxNTdmNDAxYzE1OGZiYThjOGNjYjg5MjgyYTk3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuY3BwCkBAIC0yOTMsMTQgKzI5MywxMyBAQCBjb25z dCBIYXNoU2V0PFNWR0VsZW1lbnQqPiYgU1ZHRWxlbWVudDo6aW5zdGFuY2VzKCkgY29uc3QKICAg ICByZXR1cm4gbV9zdmdSYXJlRGF0YS0+aW5zdGFuY2VzKCk7CiB9CiAKLWJvb2wgU1ZHRWxlbWVu dDo6Z2V0Qm91bmRpbmdCb3goRmxvYXRSZWN0JiByZWN0LCBTVkdMb2NhdGFibGU6OlN0eWxlVXBk YXRlU3RyYXRlZ3kgc3R5bGVVcGRhdGVTdHJhdGVneSkKK09wdGlvbmFsPEZsb2F0UmVjdD4gU1ZH RWxlbWVudDo6Z2V0Qm91bmRpbmdCb3goKSBjb25zdAogewotICAgIC8vIEZJWE1FOiBzaG91bGQg cmV0cmlldmUgdGhlIHZhbHVlIGZyb20gdGhlIGFzc29jaWF0ZWQgUmVuZGVyT2JqZWN0LgogICAg IGlmIChpczxTVkdHcmFwaGljc0VsZW1lbnQ+KCp0aGlzKSkgewotICAgICAgICByZWN0ID0gZG93 bmNhc3Q8U1ZHR3JhcGhpY3NFbGVtZW50PigqdGhpcykuZ2V0QkJveChzdHlsZVVwZGF0ZVN0cmF0 ZWd5KTsKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGlmIChhdXRvIHJlbmRlcmVyID0g dGhpcy0+cmVuZGVyZXIoKSkKKyAgICAgICAgICAgIHJldHVybiByZW5kZXJlci0+b2JqZWN0Qm91 bmRpbmdCb3goKTsKICAgICB9Ci0gICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBXVEY6Om51 bGxvcHQ7CiB9CiAKIFNWR0VsZW1lbnQqIFNWR0VsZW1lbnQ6OmNvcnJlc3BvbmRpbmdFbGVtZW50 KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmggYi9T b3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5oCmluZGV4IDY4NDEwNTk2ZjQyNjA1YWY1ZDM1 M2IwM2YwMDUzYjc3NWJkOTViZjAuLmE2YTQ2OTJlZWI3MjVhZjBhYWY4MjE3MmI4MDY0MmJiOGNi NTQxYzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmgKKysrIGIv U291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuaApAQCAtOTEsNyArOTEsNyBAQCBwdWJsaWM6 CiAgICAgLy8gVGhlIGluc3RhbmNlcyBvZiBhbiBlbGVtZW50IGFyZSBjbG9uZXMgbWFkZSBpbiBz aGFkb3cgdHJlZXMgdG8gaW1wbGVtZW50IDx1c2U+LgogICAgIGNvbnN0IEhhc2hTZXQ8U1ZHRWxl bWVudCo+JiBpbnN0YW5jZXMoKSBjb25zdDsKIAotICAgIGJvb2wgZ2V0Qm91bmRpbmdCb3goRmxv YXRSZWN0JiwgU1ZHTG9jYXRhYmxlOjpTdHlsZVVwZGF0ZVN0cmF0ZWd5ID0gU1ZHTG9jYXRhYmxl OjpBbGxvd1N0eWxlVXBkYXRlKTsKKyAgICBPcHRpb25hbDxGbG9hdFJlY3Q+IGdldEJvdW5kaW5n Qm94KCkgY29uc3Q7CiAKICAgICBTVkdFbGVtZW50KiBjb3JyZXNwb25kaW5nRWxlbWVudCgpIGNv bnN0OwogICAgIFJlZlB0cjxTVkdVc2VFbGVtZW50PiBjb3JyZXNwb25kaW5nVXNlRWxlbWVudCgp IGNvbnN0Owo=