229926 2021-09-05 17:47:05 -0700 In-page search results overlay broken if the result spans more than two elements 2021-09-07 19:22:13 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham darin simon.fraser thorton zalan oldest_to_newest 1790586 0 zalan 2021-09-05 17:47:05 -0700 <rdar://82741616> try this very simple case of "<span>left</span>middle<span>right</span>" we produce gaps between the selection rects (not always repro) 1790589 1 437371 zalan 2021-09-05 18:10:14 -0700 Created attachment 437371 Patch 1790593 2 437371 thorton 2021-09-05 19:08:28 -0700 Comment on attachment 437371 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437371&action=review > Source/WebCore/platform/graphics/PathUtilities.cpp:263 > + // FIXME: Replace it 2 dimensional sort. Grammar it 1790595 3 437374 zalan 2021-09-05 19:47:24 -0700 Created attachment 437374 [fast-cq]Patch 1790596 4 ews-feeder 2021-09-05 19:49:09 -0700 Committed r282052 (241352@main): <https://commits.webkit.org/241352@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437374. 1791069 5 437374 darin 2021-09-07 09:53:01 -0700 Comment on attachment 437374 [fast-cq]Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437374&action=review > Source/WebCore/platform/graphics/PathUtilities.cpp:269 > + // FIXME: Replace it with 2 dimensional sort. > + std::sort(sortedRects.begin(), sortedRects.end(), [](FloatRect a, FloatRect b) { > + return a.x() < b.x(); > + }); > + std::sort(sortedRects.begin(), sortedRects.end(), [](FloatRect a, FloatRect b) { > + return a.y() < b.y(); > + }); I’m not sure what a two-dimensional sort is exactly, but we easily do this with a single sort call so it’s more efficient than two sorts in a row. Here is one of the many ways to write that: std::sort(sortedRects.begin(), sortedRects.end(), [](FloatRect a, FloatRect b) { if (a.y() != b.y()) return a.y() < b.y(); if (a.x() != b.x()) return a,x() < b.x(); if (a.height() != b.height()) return a.height() < b.height(); return a.width() < b.width(); }); In the example above I also sorted based on the size, because if there is any chance that there are two rectangles that have the same x/y, it’s better to not have any randomness in the result. Another way to avoid that is to use std::stable_sort, but I think this is better. The lambda is irritatingly long, maybe there is a more efficient way to write it, but it will be faster than two sorts, and more predictable than just sorting by x/y and not width/height. I’m sure there are many other ways, and some with subtle differences like how they handle rectangles with NaN values in them. Maybe there’s a better idiom. Also wondering if const FloatRect& is more efficient or less than Float for the lambda arguments. Maybe we can even use auto&? 1791331 6 zalan 2021-09-07 19:22:13 -0700 (In reply to Darin Adler from comment #5) > Comment on attachment 437374 [details] > [fast-cq]Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=437374&action=review > > > Source/WebCore/platform/graphics/PathUtilities.cpp:269 > > + // FIXME: Replace it with 2 dimensional sort. > > + std::sort(sortedRects.begin(), sortedRects.end(), [](FloatRect a, FloatRect b) { > > + return a.x() < b.x(); > > + }); > > + std::sort(sortedRects.begin(), sortedRects.end(), [](FloatRect a, FloatRect b) { > > + return a.y() < b.y(); > > + }); > > I’m not sure what a two-dimensional sort is exactly, but we easily do this > with a single sort call so it’s more efficient than two sorts in a row. Here > is one of the many ways to write that: > > std::sort(sortedRects.begin(), sortedRects.end(), [](FloatRect a, > FloatRect b) { > if (a.y() != b.y()) > return a.y() < b.y(); > if (a.x() != b.x()) > return a,x() < b.x(); > if (a.height() != b.height()) > return a.height() < b.height(); > return a.width() < b.width(); > }); > > In the example above I also sorted based on the size, because if there is > any chance that there are two rectangles that have the same x/y, it’s better > to not have any randomness in the result. Another way to avoid that is to This is so much better! Thanks!!! 437371 2021-09-05 18:10:14 -0700 2021-09-05 19:47:21 -0700 Patch bug-229926-20210905181012.patch text/plain 6608 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxOTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWU1YTNlMWFjNWQ5Y2Zl YzJjZjMxY2NhZmU2MDBiZGQyMjg1MTAwYS4uNTQxZjY3NDZlMzc2ZjA4NThlNTJiNDY1MWY0ZGJi ZThkZmFlYzRlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA5LTA1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBJbi1wYWdlIHNlYXJjaCByZXN1 bHRzIG92ZXJsYXkgYnJva2VuIGlmIHRoZSByZXN1bHQgc3BhbnMgbW9yZSB0aGFuIHR3byBlbGVt ZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5 OTI2CisgICAgICAgIDxyZGFyOi8vODI3NDE2MTY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgcGF0aHNXaXRoU2hyaW5rV3JhcHBlZFJlY3RzIGZhaWxz IHRvIGZvcm0gYSBjbG9zZWQgcGF0aCBmb3IgYWRqb2luaW5nIHJlY3RzIHdoZW4gdGhleSBhcmUg aG9yaXpvbnRhbGx5IG91dC1vZi1vcmRlci4KKyAgICAgICAgZS5nLgorICAgICAgICAxOiAoNjAs MCkgKDMweDIwKQorICAgICAgICAyOiAgKDAsMCkgKDMweDIwKQorICAgICAgICAzOiAoMzAsMCkg KDMweDIwKQorICAgICAgICBMZXQncyBzb3J0IHRoZSByZWN0cyBob3Jpem9udGFsbHkgdG9vIChh cyB3ZSBhbHJlYWR5IGRvIHkgb3JkZXJpbmcgaW4gcG9seWdvbnNGb3JSZWN0KS4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL1BhdGhVdGlsaXRpZXMuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6cG9seWdvbnNGb3JSZWN0KToKKwogMjAyMS0wOS0wMyAgWW91ZW5uIEZhYmxldCAgPHlvdWVu bkBhcHBsZS5jb20+CiAKICAgICAgICAgU2lnbmFsaW5nIHN0YXRlIGNoZWNrIHdoZW4gYXBwbHlp bmcgYSBsb2NhbCBvciByZW1vdGUgZGVzY3JpcHRpb24gaXMgbm8gbG9uZ2VyIGFsaWduZWQgd2l0 aCB0aGUgV2ViUlRDIHNwZWMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL1BhdGhVdGlsaXRpZXMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvUGF0aFV0aWxpdGllcy5jcHAKaW5kZXggODkzYWQ4NDM3ODgwMWFlNWZlZThiNjk3NjNlYTU0 YmQwYjFmOTRhYi4uZGY4N2M3MjM2ZWI3ZDU3OTI5ZDNhNTllNTEwMTlmYWQyYTczZjZiMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aFV0aWxpdGllcy5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aFV0aWxpdGllcy5j cHAKQEAgLTI2MCw3ICsyNjAsMTMgQEAgc3RhdGljIEZsb2F0UG9pbnRHcmFwaDo6UG9seWdvbiBl ZGdlc0ZvclJlY3QoRmxvYXRSZWN0IHJlY3QsIEZsb2F0UG9pbnRHcmFwaCYgZ3IKIHN0YXRpYyBW ZWN0b3I8RmxvYXRQb2ludEdyYXBoOjpQb2x5Z29uPiBwb2x5Z29uc0ZvclJlY3QoY29uc3QgVmVj dG9yPEZsb2F0UmVjdD4mIHJlY3RzLCBGbG9hdFBvaW50R3JhcGgmIGdyYXBoKQogewogICAgIFZl Y3RvcjxGbG9hdFJlY3Q+IHNvcnRlZFJlY3RzID0gcmVjdHM7Ci0gICAgc3RkOjpzb3J0KHNvcnRl ZFJlY3RzLmJlZ2luKCksIHNvcnRlZFJlY3RzLmVuZCgpLCBbXShGbG9hdFJlY3QgYSwgRmxvYXRS ZWN0IGIpIHsgcmV0dXJuIGIueSgpID4gYS55KCk7IH0pOworICAgIC8vIEZJWE1FOiBSZXBsYWNl IGl0IDIgZGltZW5zaW9uYWwgc29ydC4KKyAgICBzdGQ6OnNvcnQoc29ydGVkUmVjdHMuYmVnaW4o KSwgc29ydGVkUmVjdHMuZW5kKCksIFtdKEZsb2F0UmVjdCBhLCBGbG9hdFJlY3QgYikgeworICAg ICAgICByZXR1cm4gYS54KCkgPCBiLngoKTsKKyAgICB9KTsKKyAgICBzdGQ6OnNvcnQoc29ydGVk UmVjdHMuYmVnaW4oKSwgc29ydGVkUmVjdHMuZW5kKCksIFtdKEZsb2F0UmVjdCBhLCBGbG9hdFJl Y3QgYikgeworICAgICAgICByZXR1cm4gYS55KCkgPCBiLnkoKTsKKyAgICB9KTsKIAogICAgIFZl Y3RvcjxGbG9hdFBvaW50R3JhcGg6OlBvbHlnb24+IHJlY3RQb2x5Z29uczsKICAgICByZWN0UG9s eWdvbnMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShzb3J0ZWRSZWN0cy5zaXplKCkpOwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IGM5ODdlYWIxZTlmNWI3ZmY2OTg4ZjM4MWEyNTZiNGM5N2MzZWU0ZjAuLjcwZTgxMjZiODcwMWRk OWJiN2Q3M2I3NGFiYzQwNzY1NTM4YWZiMjcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0w OS0wNSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgSW4tcGFnZSBz ZWFyY2ggcmVzdWx0cyBvdmVybGF5IGJyb2tlbiBpZiB0aGUgcmVzdWx0IHNwYW5zIG1vcmUgdGhh biB0d28gZWxlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyOTkyNgorICAgICAgICA8cmRhcjovLzgyNzQxNjE2PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9zaHJpbmstd3JhcC9yZWN0 LXNocmluay13cmFwLWV4cGVjdGVkLmh0bWw6CisgICAgICAgICogZmFzdC9zaHJpbmstd3JhcC9y ZWN0LXNocmluay13cmFwLmh0bWw6IEFkZCB0aGUgb3V0LW9mLW9yZGVyIHJlY3QgY2FzZS4KKwog MjAyMS0wOS0wMyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAg U2lnbmFsaW5nIHN0YXRlIGNoZWNrIHdoZW4gYXBwbHlpbmcgYSBsb2NhbCBvciByZW1vdGUgZGVz Y3JpcHRpb24gaXMgbm8gbG9uZ2VyIGFsaWduZWQgd2l0aCB0aGUgV2ViUlRDIHNwZWMKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hyaW5rLXdyYXAvcmVjdC1zaHJpbmstd3JhcC1leHBl Y3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zaHJpbmstd3JhcC9yZWN0LXNocmluay13cmFw LWV4cGVjdGVkLmh0bWwKaW5kZXggMjBhODY4MjUxMTdhY2Q3NjExMjM5ZDlmZGEyOWIyYzU3NWVj OGJhNy4uNWU5MzYyNDU0YWY0OTUwZTk0ZDI3Nzk2NWU4OGEyNjE0ZjI0NTIzOSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvZmFzdC9zaHJpbmstd3JhcC9yZWN0LXNocmluay13cmFwLWV4cGVjdGVk Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaHJpbmstd3JhcC9yZWN0LXNocmluay13cmFw LWV4cGVjdGVkLmh0bWwKQEAgLTIxMiw2ICsyMTIsMTggQEAgYm9keSB7CiAgICAgICAgIDxyZWN0 IHg9IjAiIHk9IjMwIiB3aWR0aD0iNTAiIGhlaWdodD0iMjAiIGZpbGw9InJnYmEoMCwgMCwgMCwg MC4yKSIgc3Ryb2tlPSJyZ2JhKDAsIDAsIDAsIDAuNSkiPjwvcmVjdD4KICAgICAgICAgPHBhdGgg ZD0iTSAzMCA3LjUgTCAzMCA3LjUgQyAzMCAzLjM1Nzg2IDMzLjM1NzkgNi42NjEwNmUtMTYgMzcu NSAwIEwgNDIuNSAwIEwgNDIuNSAwIEMgNDYuNjQyMSAyLjUzNjMzZS0xNiA1MCAzLjM1Nzg2IDUw IDcuNSBMIDUwIDEyLjUgTCA1MCAxNSBMIDUwIDE3LjUgTCA1MCAyMCBMIDUwIDI3LjUgTCA1MCAz MCBMIDUwIDMyLjUgTCA1MCAzNSBMIDUwIDQyLjUgTCA1MCA0Mi41IEMgNTAgNDYuNjQyMSA0Ni42 NDIxIDUwIDQyLjUgNTAgTCA4IDUwIEwgOCA1MCBDIDMuNTgxNzIgNTAgNS40MTA4M2UtMTYgNDYu NDE4MyAwIDQyIEwgMCAzNy41IEwgMCAzNy41IEMgNS4wNzI2NWUtMTYgMzMuMzU3OSAzLjM1Nzg2 IDMwIDcuNSAzMCBMIDcuNSAzMCBMIDcuNSAzMCBDIDExLjY0MjEgMzAgMTUgMjYuNjQyMSAxNSAy Mi41IEwgMTUgMjIuNSBMIDE1IDIyLjUgQyAxNSAxOC4zNTc5IDE4LjM1NzkgMTUgMjIuNSAxNSBM IDIyLjUgMTUgTCAyMi41IDE1IEMgMjYuNjQyMSAxNSAzMCAxMS42NDIxIDMwIDcuNSBaIiBmaWxs PSJub25lIiBzdHJva2U9ImJsdWUiIHN0cm9rZS13aWR0aD0iMyI+PC9wYXRoPgogICAgIDwvZz4K KyAgICA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSg1ODAsIDM0MCkiPgorICAgICAgICA8cmVjdCB4 PSIwIiB5PSIwIiB3aWR0aD0iMzAiIGhlaWdodD0iMjAiIGZpbGw9InJnYmEoMCwgMCwgMCwgMC4y KSIgc3Ryb2tlPSJyZ2JhKDAsIDAsIDAsIDAuNSkiPjwvcmVjdD4KKyAgICAgICAgPHJlY3QgeD0i MzAiIHk9IjAiIHdpZHRoPSIzMCIgaGVpZ2h0PSIyMCIgZmlsbD0icmdiYSgwLCAwLCAwLCAwLjIp IiBzdHJva2U9InJnYmEoMCwgMCwgMCwgMC41KSI+PC9yZWN0PgorICAgICAgICA8cmVjdCB4PSI2 MCIgeT0iMCIgd2lkdGg9IjMwIiBoZWlnaHQ9IjIwIiBmaWxsPSJyZ2JhKDAsIDAsIDAsIDAuMiki IHN0cm9rZT0icmdiYSgwLCAwLCAwLCAwLjUpIj48L3JlY3Q+CisgICAgICAgIDxwYXRoIGQ9Ik0g MCA4IEwgMCA4IEMgNS40MTA4M2UtMTYgMy41ODE3MiAzLjU4MTcyIDEuNTA1ODJlLTE1IDggMS43 NzYzNmUtMTUgTCAyMiAwIEwgMzAgMCBMIDUyIDAgTCA2MCAwIEwgODIgMCBMIDgyIDAgQyA4Ni40 MTgzIDIuNzA1NDJlLTE2IDkwIDMuNTgxNzIgOTAgOCBMIDkwIDEyIEwgOTAgMTIgQyA5MCAxNi40 MTgzIDg2LjQxODMgMjAgODIgMjAgTCA2OCAyMCBMIDYwIDIwIEwgMzggMjAgTCAzMCAyMCBMIDgg MjAgTCA4IDIwIEMgMy41ODE3MiAyMCA1LjQxMDgzZS0xNiAxNi40MTgzIDAgMTIgWiIgZmlsbD0i bm9uZSIgc3Ryb2tlPSJibHVlIiBzdHJva2Utd2lkdGg9IjMiPjwvcGF0aD4KKyAgICA8L2c+Cisg ICAgPGcgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNTgwLCAzODApIj4KKyAgICAgICAgPHJlY3QgeD0i MCIgeT0iMCIgd2lkdGg9IjMwIiBoZWlnaHQ9IjIwIiBmaWxsPSJyZ2JhKDAsIDAsIDAsIDAuMiki IHN0cm9rZT0icmdiYSgwLCAwLCAwLCAwLjUpIj48L3JlY3Q+CisgICAgICAgIDxyZWN0IHg9IjMw IiB5PSIwIiB3aWR0aD0iMzAiIGhlaWdodD0iMjAiIGZpbGw9InJnYmEoMCwgMCwgMCwgMC4yKSIg c3Ryb2tlPSJyZ2JhKDAsIDAsIDAsIDAuNSkiPjwvcmVjdD4KKyAgICAgICAgPHJlY3QgeD0iNjAi IHk9IjAiIHdpZHRoPSIzMCIgaGVpZ2h0PSIyMCIgZmlsbD0icmdiYSgwLCAwLCAwLCAwLjIpIiBz dHJva2U9InJnYmEoMCwgMCwgMCwgMC41KSI+PC9yZWN0PgorICAgICAgICA8cGF0aCBkPSJNIDAg OCBMIDAgOCBDIDUuNDEwODNlLTE2IDMuNTgxNzIgMy41ODE3MiAxLjUwNTgyZS0xNSA4IDEuNzc2 MzZlLTE1IEwgMjIgMCBMIDMwIDAgTCA1MiAwIEwgNjAgMCBMIDgyIDAgTCA4MiAwIEMgODYuNDE4 MyAyLjcwNTQyZS0xNiA5MCAzLjU4MTcyIDkwIDggTCA5MCAxMiBMIDkwIDEyIEMgOTAgMTYuNDE4 MyA4Ni40MTgzIDIwIDgyIDIwIEwgNjggMjAgTCA2MCAyMCBMIDM4IDIwIEwgMzAgMjAgTCA4IDIw IEwgOCAyMCBDIDMuNTgxNzIgMjAgNS40MTA4M2UtMTYgMTYuNDE4MyAwIDEyIFoiIGZpbGw9Im5v bmUiIHN0cm9rZT0iYmx1ZSIgc3Ryb2tlLXdpZHRoPSIzIj48L3BhdGg+CisgICAgPC9nPgogICAg IDxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKDU4MCwgMzAwKSI+CiAgICAgICAgIDxyZWN0IHg9IjAi IHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InJnYmEoMCwgMCwgMCwgMC4yKSIgc3Ry b2tlPSJyZ2JhKDAsIDAsIDAsIDAuNSkiPjwvcmVjdD4KICAgICAgICAgPHJlY3QgeD0iNCIgeT0i MCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0icmdiYSgwLCAwLCAwLCAwLjIpIiBzdHJva2U9 InJnYmEoMCwgMCwgMCwgMC41KSI+PC9yZWN0PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9zaHJpbmstd3JhcC9yZWN0LXNocmluay13cmFwLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3No cmluay13cmFwL3JlY3Qtc2hyaW5rLXdyYXAuaHRtbAppbmRleCA1Yzg4ZmNjYjkwNmY5M2NmYzhj MjFlOTNjNTllODBmYjFmMDY2N2Y2Li45MDY4Nzg1ODM4YTI2MDFmZTI2ZmZhOTgyYTE0YjRmMzNk YjZlZWQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3Nocmluay13cmFwL3JlY3Qtc2hy aW5rLXdyYXAuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Nocmluay13cmFwL3JlY3Qtc2hy aW5rLXdyYXAuaHRtbApAQCAtMjM0LDYgKzIzNCwxOCBAQCB3aW5kb3cub25sb2FkID0gZnVuY3Rp b24gKCkgewogICAgICAgICBbMTUsIDE1LCAzNSwgMjBdLAogICAgICAgICBbMCwgMzAsIDUwLCAy MF1dKTsKIAorICAgIC8vIE91dC1vZi1vcmRlciByZWN0czoKKworICAgIHRlc3RSZWN0cyhbNTgw LCAzNDBdLCBbCisgICAgICAgIFs2MCwgMCwgMzAsIDIwXSwKKyAgICAgICAgWzAsIDAsIDMwLCAy MF0sCisgICAgICAgIFszMCwgMCwgMzAsIDIwXV0pOworCisgICAgdGVzdFJlY3RzKFs1ODAsIDM4 MF0sIFsKKyAgICAgICAgWzMwLCAwLCAzMCwgMjBdLAorICAgICAgICBbNjAsIDAsIDMwLCAyMF0s CisgICAgICAgIFswLCAwLCAzMCwgMjBdXSk7CisKICAgICAvLyBNb3JlIHRoYW4gMjAgKG91ciBz aHJpbmt3cmFwcGluZyBsaW1pdCk6CiAKICAgICB0ZXN0UmVjdHMoWzU4MCwgMzAwXSwgWwo= 437374 2021-09-05 19:47:24 -0700 2021-09-05 19:49:10 -0700 [fast-cq]Patch bug-229926-20210905194723.patch text/plain 6605 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxOTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWU1YTNlMWFjNWQ5Y2Zl YzJjZjMxY2NhZmU2MDBiZGQyMjg1MTAwYS4uZmVjZGU3MjZmNDlmMDZkMTBkZjM5NGUxZmFlZjU2 ZTIwNjdlZTRhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA5LTA1ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBJbi1wYWdlIHNlYXJjaCByZXN1 bHRzIG92ZXJsYXkgYnJva2VuIGlmIHRoZSByZXN1bHQgc3BhbnMgbW9yZSB0aGFuIHR3byBlbGVt ZW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5 OTI2CisgICAgICAgIDxyZGFyOi8vODI3NDE2MTY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGlt IEhvcnRvbi4KKworICAgICAgICBwYXRoc1dpdGhTaHJpbmtXcmFwcGVkUmVjdHMgZmFpbHMgdG8g Zm9ybSBhIGNsb3NlZCBwYXRoIGZvciBhZGpvaW5pbmcgcmVjdHMgd2hlbiB0aGV5IGFyZSBob3Jp em9udGFsbHkgb3V0LW9mLW9yZGVyLgorICAgICAgICBlLmcuCisgICAgICAgIDE6ICg2MCwwKSAo MzB4MjApCisgICAgICAgIDI6ICAoMCwwKSAoMzB4MjApCisgICAgICAgIDM6ICgzMCwwKSAoMzB4 MjApCisgICAgICAgIExldCdzIHNvcnQgdGhlIHJlY3RzIGhvcml6b250YWxseSB0b28gKGFzIHdl IGFscmVhZHkgZG8geSBvcmRlcmluZyBpbiBwb2x5Z29uc0ZvclJlY3QpLgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvUGF0aFV0aWxpdGllcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpw b2x5Z29uc0ZvclJlY3QpOgorCiAyMDIxLTA5LTAzICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFw cGxlLmNvbT4KIAogICAgICAgICBTaWduYWxpbmcgc3RhdGUgY2hlY2sgd2hlbiBhcHBseWluZyBh IGxvY2FsIG9yIHJlbW90ZSBkZXNjcmlwdGlvbiBpcyBubyBsb25nZXIgYWxpZ25lZCB3aXRoIHRo ZSBXZWJSVEMgc3BlYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvUGF0aFV0aWxpdGllcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Q YXRoVXRpbGl0aWVzLmNwcAppbmRleCA4OTNhZDg0Mzc4ODAxYWU1ZmVlOGI2OTc2M2VhNTRiZDBi MWY5NGFiLi5iOTc5OWE0ZDEwNjFlZDIwYTFiNTBlZDUwNjg2NTFjNWZlYTQ2NmE0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QYXRoVXRpbGl0aWVzLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QYXRoVXRpbGl0aWVzLmNwcApA QCAtMjYwLDcgKzI2MCwxMyBAQCBzdGF0aWMgRmxvYXRQb2ludEdyYXBoOjpQb2x5Z29uIGVkZ2Vz Rm9yUmVjdChGbG9hdFJlY3QgcmVjdCwgRmxvYXRQb2ludEdyYXBoJiBncgogc3RhdGljIFZlY3Rv cjxGbG9hdFBvaW50R3JhcGg6OlBvbHlnb24+IHBvbHlnb25zRm9yUmVjdChjb25zdCBWZWN0b3I8 RmxvYXRSZWN0PiYgcmVjdHMsIEZsb2F0UG9pbnRHcmFwaCYgZ3JhcGgpCiB7CiAgICAgVmVjdG9y PEZsb2F0UmVjdD4gc29ydGVkUmVjdHMgPSByZWN0czsKLSAgICBzdGQ6OnNvcnQoc29ydGVkUmVj dHMuYmVnaW4oKSwgc29ydGVkUmVjdHMuZW5kKCksIFtdKEZsb2F0UmVjdCBhLCBGbG9hdFJlY3Qg YikgeyByZXR1cm4gYi55KCkgPiBhLnkoKTsgfSk7CisgICAgLy8gRklYTUU6IFJlcGxhY2UgaXQg d2l0aCAyIGRpbWVuc2lvbmFsIHNvcnQuCisgICAgc3RkOjpzb3J0KHNvcnRlZFJlY3RzLmJlZ2lu KCksIHNvcnRlZFJlY3RzLmVuZCgpLCBbXShGbG9hdFJlY3QgYSwgRmxvYXRSZWN0IGIpIHsKKyAg ICAgICAgcmV0dXJuIGEueCgpIDwgYi54KCk7CisgICAgfSk7CisgICAgc3RkOjpzb3J0KHNvcnRl ZFJlY3RzLmJlZ2luKCksIHNvcnRlZFJlY3RzLmVuZCgpLCBbXShGbG9hdFJlY3QgYSwgRmxvYXRS ZWN0IGIpIHsKKyAgICAgICAgcmV0dXJuIGEueSgpIDwgYi55KCk7CisgICAgfSk7CiAKICAgICBW ZWN0b3I8RmxvYXRQb2ludEdyYXBoOjpQb2x5Z29uPiByZWN0UG9seWdvbnM7CiAgICAgcmVjdFBv bHlnb25zLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkoc29ydGVkUmVjdHMuc2l6ZSgpKTsKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCBjOTg3ZWFiMWU5ZjViN2ZmNjk4OGYzODFhMjU2YjRjOTdjM2VlNGYwLi4zYjJkNWU3YWE2ZDYz YTViZWIyNjJhYmQ0YmU5ZTE5ZTU4M2JmMWY4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEt MDktMDUgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAgICAgIEluLXBhZ2Ug c2VhcmNoIHJlc3VsdHMgb3ZlcmxheSBicm9rZW4gaWYgdGhlIHJlc3VsdCBzcGFucyBtb3JlIHRo YW4gdHdvIGVsZW1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjk5MjYKKyAgICAgICAgPHJkYXI6Ly84Mjc0MTYxNj4KKworICAgICAgICBSZXZp ZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgICogZmFzdC9zaHJpbmstd3JhcC9yZWN0LXNo cmluay13cmFwLWV4cGVjdGVkLmh0bWw6CisgICAgICAgICogZmFzdC9zaHJpbmstd3JhcC9yZWN0 LXNocmluay13cmFwLmh0bWw6IEFkZCB0aGUgb3V0LW9mLW9yZGVyIHJlY3QgY2FzZS4KKwogMjAy MS0wOS0wMyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgU2ln bmFsaW5nIHN0YXRlIGNoZWNrIHdoZW4gYXBwbHlpbmcgYSBsb2NhbCBvciByZW1vdGUgZGVzY3Jp cHRpb24gaXMgbm8gbG9uZ2VyIGFsaWduZWQgd2l0aCB0aGUgV2ViUlRDIHNwZWMKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hyaW5rLXdyYXAvcmVjdC1zaHJpbmstd3JhcC1leHBlY3Rl ZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zaHJpbmstd3JhcC9yZWN0LXNocmluay13cmFwLWV4 cGVjdGVkLmh0bWwKaW5kZXggMjBhODY4MjUxMTdhY2Q3NjExMjM5ZDlmZGEyOWIyYzU3NWVjOGJh Ny4uNWU5MzYyNDU0YWY0OTUwZTk0ZDI3Nzk2NWU4OGEyNjE0ZjI0NTIzOSAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvZmFzdC9zaHJpbmstd3JhcC9yZWN0LXNocmluay13cmFwLWV4cGVjdGVkLmh0 bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaHJpbmstd3JhcC9yZWN0LXNocmluay13cmFwLWV4 cGVjdGVkLmh0bWwKQEAgLTIxMiw2ICsyMTIsMTggQEAgYm9keSB7CiAgICAgICAgIDxyZWN0IHg9 IjAiIHk9IjMwIiB3aWR0aD0iNTAiIGhlaWdodD0iMjAiIGZpbGw9InJnYmEoMCwgMCwgMCwgMC4y KSIgc3Ryb2tlPSJyZ2JhKDAsIDAsIDAsIDAuNSkiPjwvcmVjdD4KICAgICAgICAgPHBhdGggZD0i TSAzMCA3LjUgTCAzMCA3LjUgQyAzMCAzLjM1Nzg2IDMzLjM1NzkgNi42NjEwNmUtMTYgMzcuNSAw IEwgNDIuNSAwIEwgNDIuNSAwIEMgNDYuNjQyMSAyLjUzNjMzZS0xNiA1MCAzLjM1Nzg2IDUwIDcu NSBMIDUwIDEyLjUgTCA1MCAxNSBMIDUwIDE3LjUgTCA1MCAyMCBMIDUwIDI3LjUgTCA1MCAzMCBM IDUwIDMyLjUgTCA1MCAzNSBMIDUwIDQyLjUgTCA1MCA0Mi41IEMgNTAgNDYuNjQyMSA0Ni42NDIx IDUwIDQyLjUgNTAgTCA4IDUwIEwgOCA1MCBDIDMuNTgxNzIgNTAgNS40MTA4M2UtMTYgNDYuNDE4 MyAwIDQyIEwgMCAzNy41IEwgMCAzNy41IEMgNS4wNzI2NWUtMTYgMzMuMzU3OSAzLjM1Nzg2IDMw IDcuNSAzMCBMIDcuNSAzMCBMIDcuNSAzMCBDIDExLjY0MjEgMzAgMTUgMjYuNjQyMSAxNSAyMi41 IEwgMTUgMjIuNSBMIDE1IDIyLjUgQyAxNSAxOC4zNTc5IDE4LjM1NzkgMTUgMjIuNSAxNSBMIDIy LjUgMTUgTCAyMi41IDE1IEMgMjYuNjQyMSAxNSAzMCAxMS42NDIxIDMwIDcuNSBaIiBmaWxsPSJu b25lIiBzdHJva2U9ImJsdWUiIHN0cm9rZS13aWR0aD0iMyI+PC9wYXRoPgogICAgIDwvZz4KKyAg ICA8ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSg1ODAsIDM0MCkiPgorICAgICAgICA8cmVjdCB4PSIw IiB5PSIwIiB3aWR0aD0iMzAiIGhlaWdodD0iMjAiIGZpbGw9InJnYmEoMCwgMCwgMCwgMC4yKSIg c3Ryb2tlPSJyZ2JhKDAsIDAsIDAsIDAuNSkiPjwvcmVjdD4KKyAgICAgICAgPHJlY3QgeD0iMzAi IHk9IjAiIHdpZHRoPSIzMCIgaGVpZ2h0PSIyMCIgZmlsbD0icmdiYSgwLCAwLCAwLCAwLjIpIiBz dHJva2U9InJnYmEoMCwgMCwgMCwgMC41KSI+PC9yZWN0PgorICAgICAgICA8cmVjdCB4PSI2MCIg eT0iMCIgd2lkdGg9IjMwIiBoZWlnaHQ9IjIwIiBmaWxsPSJyZ2JhKDAsIDAsIDAsIDAuMikiIHN0 cm9rZT0icmdiYSgwLCAwLCAwLCAwLjUpIj48L3JlY3Q+CisgICAgICAgIDxwYXRoIGQ9Ik0gMCA4 IEwgMCA4IEMgNS40MTA4M2UtMTYgMy41ODE3MiAzLjU4MTcyIDEuNTA1ODJlLTE1IDggMS43NzYz NmUtMTUgTCAyMiAwIEwgMzAgMCBMIDUyIDAgTCA2MCAwIEwgODIgMCBMIDgyIDAgQyA4Ni40MTgz IDIuNzA1NDJlLTE2IDkwIDMuNTgxNzIgOTAgOCBMIDkwIDEyIEwgOTAgMTIgQyA5MCAxNi40MTgz IDg2LjQxODMgMjAgODIgMjAgTCA2OCAyMCBMIDYwIDIwIEwgMzggMjAgTCAzMCAyMCBMIDggMjAg TCA4IDIwIEMgMy41ODE3MiAyMCA1LjQxMDgzZS0xNiAxNi40MTgzIDAgMTIgWiIgZmlsbD0ibm9u ZSIgc3Ryb2tlPSJibHVlIiBzdHJva2Utd2lkdGg9IjMiPjwvcGF0aD4KKyAgICA8L2c+CisgICAg PGcgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNTgwLCAzODApIj4KKyAgICAgICAgPHJlY3QgeD0iMCIg eT0iMCIgd2lkdGg9IjMwIiBoZWlnaHQ9IjIwIiBmaWxsPSJyZ2JhKDAsIDAsIDAsIDAuMikiIHN0 cm9rZT0icmdiYSgwLCAwLCAwLCAwLjUpIj48L3JlY3Q+CisgICAgICAgIDxyZWN0IHg9IjMwIiB5 PSIwIiB3aWR0aD0iMzAiIGhlaWdodD0iMjAiIGZpbGw9InJnYmEoMCwgMCwgMCwgMC4yKSIgc3Ry b2tlPSJyZ2JhKDAsIDAsIDAsIDAuNSkiPjwvcmVjdD4KKyAgICAgICAgPHJlY3QgeD0iNjAiIHk9 IjAiIHdpZHRoPSIzMCIgaGVpZ2h0PSIyMCIgZmlsbD0icmdiYSgwLCAwLCAwLCAwLjIpIiBzdHJv a2U9InJnYmEoMCwgMCwgMCwgMC41KSI+PC9yZWN0PgorICAgICAgICA8cGF0aCBkPSJNIDAgOCBM IDAgOCBDIDUuNDEwODNlLTE2IDMuNTgxNzIgMy41ODE3MiAxLjUwNTgyZS0xNSA4IDEuNzc2MzZl LTE1IEwgMjIgMCBMIDMwIDAgTCA1MiAwIEwgNjAgMCBMIDgyIDAgTCA4MiAwIEMgODYuNDE4MyAy LjcwNTQyZS0xNiA5MCAzLjU4MTcyIDkwIDggTCA5MCAxMiBMIDkwIDEyIEMgOTAgMTYuNDE4MyA4 Ni40MTgzIDIwIDgyIDIwIEwgNjggMjAgTCA2MCAyMCBMIDM4IDIwIEwgMzAgMjAgTCA4IDIwIEwg OCAyMCBDIDMuNTgxNzIgMjAgNS40MTA4M2UtMTYgMTYuNDE4MyAwIDEyIFoiIGZpbGw9Im5vbmUi IHN0cm9rZT0iYmx1ZSIgc3Ryb2tlLXdpZHRoPSIzIj48L3BhdGg+CisgICAgPC9nPgogICAgIDxn IHRyYW5zZm9ybT0idHJhbnNsYXRlKDU4MCwgMzAwKSI+CiAgICAgICAgIDxyZWN0IHg9IjAiIHk9 IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InJnYmEoMCwgMCwgMCwgMC4yKSIgc3Ryb2tl PSJyZ2JhKDAsIDAsIDAsIDAuNSkiPjwvcmVjdD4KICAgICAgICAgPHJlY3QgeD0iNCIgeT0iMCIg d2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0icmdiYSgwLCAwLCAwLCAwLjIpIiBzdHJva2U9InJn YmEoMCwgMCwgMCwgMC41KSI+PC9yZWN0PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9z aHJpbmstd3JhcC9yZWN0LXNocmluay13cmFwLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3Nocmlu ay13cmFwL3JlY3Qtc2hyaW5rLXdyYXAuaHRtbAppbmRleCA1Yzg4ZmNjYjkwNmY5M2NmYzhjMjFl OTNjNTllODBmYjFmMDY2N2Y2Li45MDY4Nzg1ODM4YTI2MDFmZTI2ZmZhOTgyYTE0YjRmMzNkYjZl ZWQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3Nocmluay13cmFwL3JlY3Qtc2hyaW5r LXdyYXAuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Nocmluay13cmFwL3JlY3Qtc2hyaW5r LXdyYXAuaHRtbApAQCAtMjM0LDYgKzIzNCwxOCBAQCB3aW5kb3cub25sb2FkID0gZnVuY3Rpb24g KCkgewogICAgICAgICBbMTUsIDE1LCAzNSwgMjBdLAogICAgICAgICBbMCwgMzAsIDUwLCAyMF1d KTsKIAorICAgIC8vIE91dC1vZi1vcmRlciByZWN0czoKKworICAgIHRlc3RSZWN0cyhbNTgwLCAz NDBdLCBbCisgICAgICAgIFs2MCwgMCwgMzAsIDIwXSwKKyAgICAgICAgWzAsIDAsIDMwLCAyMF0s CisgICAgICAgIFszMCwgMCwgMzAsIDIwXV0pOworCisgICAgdGVzdFJlY3RzKFs1ODAsIDM4MF0s IFsKKyAgICAgICAgWzMwLCAwLCAzMCwgMjBdLAorICAgICAgICBbNjAsIDAsIDMwLCAyMF0sCisg ICAgICAgIFswLCAwLCAzMCwgMjBdXSk7CisKICAgICAvLyBNb3JlIHRoYW4gMjAgKG91ciBzaHJp bmt3cmFwcGluZyBsaW1pdCk6CiAKICAgICB0ZXN0UmVjdHMoWzU4MCwgMzAwXSwgWwo=