230335 2021-09-15 22:28:35 -0700 Multi-line text clipped to its background is painted in the wrong place 2021-11-06 05:26:51 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified NEW https://github.com/web-platform-tests/wpt/pull/30812 InRadar P2 Normal --- 1 mmaxfield mmaxfield bfulgham changseok clopez esprehn+autocc ews-watchlist glenn kondapallykalyan ntim pdr simon.fraser webkit-bug-importer youennf zalan oldest_to_newest 1793953 0 mmaxfield 2021-09-15 22:28:35 -0700 Multi-line text clipped to its background is painted in the wrong place 1793955 1 438317 mmaxfield 2021-09-15 22:29:59 -0700 Created attachment 438317 Patch 1793956 2 mmaxfield 2021-09-15 22:30:02 -0700 <rdar://problem/59928689> 1793958 3 ews-watchlist 2021-09-15 22:31:56 -0700 This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess 1794229 4 438405 mmaxfield 2021-09-16 15:21:07 -0700 Created attachment 438405 Patch 1794597 5 438405 zalan 2021-09-17 13:54:47 -0700 Comment on attachment 438405 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=438405&action=review > Source/WebCore/rendering/LegacyInlineFlowBox.cpp:1215 > - for (auto* curr = prevLineBox(); curr; curr = curr->prevLineBox()) > + for (auto* curr = previousOnLine(); curr; curr = curr->previousOnLine()) I don't really know how this fill layer painting is supposed to work but according to the comment a few lines above, we are trying to form a long "strip" here. This strip includes the entire inline box (<span> in this case) with all its fragments spanning across multiple lines, if applicable. e.g <b>first line</b><span>still first line<br>second line</span>, would form 3 lines boxes across the 2 lines, one for the <b> and 2 for the <span>. When we are on the second line, the loop with prevLineBox() would collect the second line box from the first line (which belongs to the same inline box, <span> in this case). Then we offset the stripX with the logicalOffsetOnLine value potentially producing a negative starting point. The logical right of this strip should still fully include the current line box though. Not sure why we do this, but that's what the comment describes above. Now with your change we stop collecting the fragments from the previous line(s) (though interestingly we still do it for the next line(s) in the subsequent loop). If that's the desired behavior the comment should be updated accordingly. However previousOnLine() crosses the inline box boundary (as it walks all the boxes on the line) so our offset again would be incorrect if there was a previous content on the line (see the example above). I haven't tried this but it looks to be working only when the inline box starts at the logical left of the line. 438317 2021-09-15 22:29:59 -0700 2021-09-16 15:21:05 -0700 Patch bug-230335-20210915222959.patch text/plain 7347 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzNmMjQxOTZhZTdmMjZm NThjN2YwYTdlOTJkNmQwNzNiOTM5MmJiOC4uNWNjNDQxNjdlYjQ0NzQ4MWYyZWU4Yzc5MjM0Mzc0 NmM4ZjI2OWZhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA5LTE1ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgTXVsdGktbGlu ZSB0ZXh0IGNsaXBwZWQgdG8gaXRzIGJhY2tncm91bmQgaXMgcGFpbnRlZCBpbiB0aGUgd3Jvbmcg cGxhY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz MDMzNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTk5Mjg2ODk+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ugd2VyZSBzaW1wbHkgdXNpbmcgcHJl dkxpbmVCb3goKSB0byBwb3NpdGlvbiB0aGUgdGV4dCBpbnN0ZWFkIG9mIHByZXZpb3VzT25MaW5l KCkuCisKKyAgICAgICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLWJhY2tncm91bmRzL2JhY2tncm91bmQtY2xpcC9jbGlwLXRleHQtbXVsdGktbGluZS5odG1s CisKKyAgICAgICAgKiByZW5kZXJpbmcvTGVnYWN5SW5saW5lRmxvd0JveC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMZWdhY3lJbmxpbmVGbG93Qm94OjpwYWludEZpbGxMYXllcik6CisKIDIwMjEt MDktMTUgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAg ICBGaXggWGNvZGUgYnVpbGQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9M ZWdhY3lJbmxpbmVGbG93Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MZWdhY3lJ bmxpbmVGbG93Qm94LmNwcAppbmRleCBlYmYyNjA3YjdhZjliM2U0NjcxNWI2ZWZiYTBiZWQxMTI5 Mjc4NzkzLi45YzNiZmNhNWY0MDM4MGEzMmFiNTVkOTE0Y2ZiYjg2MzA1NjgxMjY4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvTGVnYWN5SW5saW5lRmxvd0JveC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xlZ2FjeUlubGluZUZsb3dCb3guY3BwCkBAIC0x MjEyLDEzICsxMjEyLDEzIEBAIHZvaWQgTGVnYWN5SW5saW5lRmxvd0JveDo6cGFpbnRGaWxsTGF5 ZXIoY29uc3QgUGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IENvbG9yCiAgICAgICAgIExheW91 dFVuaXQgbG9naWNhbE9mZnNldE9uTGluZTsKICAgICAgICAgTGF5b3V0VW5pdCB0b3RhbExvZ2lj YWxXaWR0aDsKICAgICAgICAgaWYgKHJlbmRlcmVyKCkuc3R5bGUoKS5kaXJlY3Rpb24oKSA9PSBU ZXh0RGlyZWN0aW9uOjpMVFIpIHsKLSAgICAgICAgICAgIGZvciAoYXV0byogY3VyciA9IHByZXZM aW5lQm94KCk7IGN1cnI7IGN1cnIgPSBjdXJyLT5wcmV2TGluZUJveCgpKQorICAgICAgICAgICAg Zm9yIChhdXRvKiBjdXJyID0gcHJldmlvdXNPbkxpbmUoKTsgY3VycjsgY3VyciA9IGN1cnItPnBy ZXZpb3VzT25MaW5lKCkpCiAgICAgICAgICAgICAgICAgbG9naWNhbE9mZnNldE9uTGluZSArPSBj dXJyLT5sb2dpY2FsV2lkdGgoKTsKICAgICAgICAgICAgIHRvdGFsTG9naWNhbFdpZHRoID0gbG9n aWNhbE9mZnNldE9uTGluZTsKICAgICAgICAgICAgIGZvciAoYXV0byogY3VyciA9IHRoaXM7IGN1 cnI7IGN1cnIgPSBjdXJyLT5uZXh0TGluZUJveCgpKQogICAgICAgICAgICAgICAgIHRvdGFsTG9n aWNhbFdpZHRoICs9IGN1cnItPmxvZ2ljYWxXaWR0aCgpOwogICAgICAgICB9IGVsc2UgewotICAg ICAgICAgICAgZm9yIChhdXRvKiBjdXJyID0gbmV4dExpbmVCb3goKTsgY3VycjsgY3VyciA9IGN1 cnItPm5leHRMaW5lQm94KCkpCisgICAgICAgICAgICBmb3IgKGF1dG8qIGN1cnIgPSBuZXh0T25M aW5lKCk7IGN1cnI7IGN1cnIgPSBjdXJyLT5uZXh0T25MaW5lKCkpCiAgICAgICAgICAgICAgICAg bG9naWNhbE9mZnNldE9uTGluZSArPSBjdXJyLT5sb2dpY2FsV2lkdGgoKTsKICAgICAgICAgICAg IHRvdGFsTG9naWNhbFdpZHRoID0gbG9naWNhbE9mZnNldE9uTGluZTsKICAgICAgICAgICAgIGZv ciAoYXV0byogY3VyciA9IHRoaXM7IGN1cnI7IGN1cnIgPSBjdXJyLT5wcmV2TGluZUJveCgpKQpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggOGEzYmI3MjNkM2NlZjAzMDdhN2JmNDIz Yzg0MTIxMTBlOTdjMzQ5NS4uMjVmMDZlNDc5NWEzMTU4NTNiMjYzODZjNWZjNzNjYmRhODJjMzFi OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZworKysgYi9M YXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEt MDktMTUgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAg ICBNdWx0aS1saW5lIHRleHQgY2xpcHBlZCB0byBpdHMgYmFja2dyb3VuZCBpcyBwYWludGVkIGlu IHRoZSB3cm9uZyBwbGFjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjMwMzM1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81OTkyODY4OT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGJlaW5n IHVwc3RyZWFtZWQgaW4gaHR0cHM6Ly9naXRodWIuY29tL3dlYi1wbGF0Zm9ybS10ZXN0cy93cHQv cHVsbC8zMDgxMi4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWJhY2tn cm91bmRzL2JhY2tncm91bmQtY2xpcC9jbGlwLXRleHQtbXVsdGktbGluZS1leHBlY3RlZC5odG1s OiBBZGRlZC4KKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1iYWNrZ3JvdW5k cy9iYWNrZ3JvdW5kLWNsaXAvY2xpcC10ZXh0LW11bHRpLWxpbmUuaHRtbDogQWRkZWQuCisKIDIw MjEtMDktMTUgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAog ICAgICAgICBBZGQgSURMIHNrZWxldG9uIGZvciBTaGFyZWRXb3JrZXIKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1iYWNrZ3Jv dW5kcy9iYWNrZ3JvdW5kLWNsaXAvY2xpcC10ZXh0LW11bHRpLWxpbmUtZXhwZWN0ZWQuaHRtbCBi L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1iYWNr Z3JvdW5kcy9iYWNrZ3JvdW5kLWNsaXAvY2xpcC10ZXh0LW11bHRpLWxpbmUtZXhwZWN0ZWQuaHRt bApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwLi5kNTkwYWI3NWEwNjRjMzAzMDY2OTYxNDY0YzJhZmE2ZDc2NTE3YmRjCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9jc3MvY3NzLWJhY2tncm91bmRzL2JhY2tncm91bmQtY2xpcC9jbGlwLXRleHQtbXVsdGkt bGluZS1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsMzYgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0 bWwgY2xhc3M9InJlZnRlc3Qtd2FpdCI+Cis8aGVhZD4KKzx0aXRsZT5DU1MgVGVzdDogYmFja2dy b3VuZC1jbGlwOiB0ZXh0IHBhaW50cyBtdWx0aS1saW5lIHRleHQgaW4gdGhlIHdyb25nIHBsYWNl PC90aXRsZT4KKzxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3Jn L2Nzcy1iYWNrZ3JvdW5kcy00LyN2YWxkZWYtYmFja2dyb3VuZC1jbGlwLXRleHQiPgorPGxpbmsg cmVsPSJhdXRob3IiIGhyZWY9Im1haWx0bzptbWF4ZmllbGRAYXBwbGUuY29tIiB0aXRsZT0iTXls ZXMgQy4gTWF4ZmllbGQiPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiB0eXBlPSJ0ZXh0L2NzcyIg aHJlZj0iL2ZvbnRzL2FoZW0uY3NzIj4KKzxzdHlsZT4KKyNjb250YWluZXIgeworICAgIHBvc2l0 aW9uOiByZWxhdGl2ZTsKKyAgICBwYWRkaW5nOiAzcHg7Cit9CisKK3NwYW4geworICAgIGNvbG9y OiBncmVlbjsKKyAgICBmb250OiA0OHB4ICJBaGVtIjsKK30KKworZGl2LmNvdmVyIHsKKyAgICBw b3NpdGlvbjogYWJzb2x1dGU7CisgICAgYmFja2dyb3VuZDogZ3JlZW47Cit9Cis8L3N0eWxlPgor PC9oZWFkPgorPGJvZHk+Cis8cD5UaGlzIHRlc3QgbWFrZXMgc3VyZSB0aGF0IG11bHRpLWxpbmUg ZWxlbWVudHMgd2l0aCA8Y29kZT5iYWNrZ3JvdW5kLWNsaXA6IHRleHQ8L2NvZGU+IGFyZSBwbGFj ZWQgY29ycmVjdGx5LiBUaGUgdGVzdCBwYXNzZXMgaWYgdGhlIHRvcCByZWN0YW5nbGUgaXMgKHJv dWdobHkpIGhhbGYgYXMgd2lkZSBhcyB0aGUgYm90dG9tIHJlY3RhbmdsZS48L3A+Cis8ZGl2IGlk PSJjb250YWluZXIiPgorPHNwYW4+QUFBPGJyPkFBQUFBQTwvc3Bhbj4KKzxkaXYgY2xhc3M9ImNv dmVyIiBzdHlsZT0ibGVmdDogMHB4OyB0b3A6IDBweDsgd2lkdGg6IGNhbGMoNDhweCAqIDMgKyAz cHgpOyBoZWlnaHQ6IDNweDsiPjwvZGl2PgorPGRpdiBjbGFzcz0iY292ZXIiIHN0eWxlPSJsZWZ0 OiAwcHg7IHRvcDogNDhweDsgd2lkdGg6IGNhbGMoNDhweCAqIDYgKyAzcHgpOyBoZWlnaHQ6IDZw eDsiPjwvZGl2PgorPGRpdiBjbGFzcz0iY292ZXIiIHN0eWxlPSJsZWZ0OiAwcHg7IHRvcDogY2Fs Yyg0OHB4ICogMik7IHdpZHRoOiBjYWxjKDQ4cHggKiA2ICsgM3B4KTsgaGVpZ2h0OiAzcHg7Ij48 L2Rpdj4KKzxkaXYgY2xhc3M9ImNvdmVyIiBzdHlsZT0ibGVmdDogMHB4OyB0b3A6IDBweDsgd2lk dGg6IDNweDsgaGVpZ2h0OiBjYWxjKDQ4cHggKiAyKTsiPjwvZGl2PgorPGRpdiBjbGFzcz0iY292 ZXIiIHN0eWxlPSJsZWZ0OiBjYWxjKDQ4cHggKiAzKTsgdG9wOiAwcHg7IHdpZHRoOiAzcHg7IGhl aWdodDogNDhweDsiPjwvZGl2PgorPGRpdiBjbGFzcz0iY292ZXIiIHN0eWxlPSJsZWZ0OiBjYWxj KDQ4cHggKiA2KTsgdG9wOiA0OHB4OyB3aWR0aDogM3B4OyBoZWlnaHQ6IDQ4cHg7Ij48L2Rpdj4K KzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1iYWNrZ3JvdW5kcy9iYWNrZ3JvdW5kLWNsaXAvY2xp cC10ZXh0LW11bHRpLWxpbmUuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvY3NzL2Nzcy1iYWNrZ3JvdW5kcy9iYWNrZ3JvdW5kLWNsaXAvY2xpcC10ZXh0 LW11bHRpLWxpbmUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xNWJkN2Q5ODYxN2ZiZDgzODU5Zjc1NmVjZDNk MGM3YTIzZGRiNDJiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLWJhY2tncm91bmRzL2JhY2tncm91bmQtY2xpcC9j bGlwLXRleHQtbXVsdGktbGluZS5odG1sCkBAIC0wLDAgKzEsNDAgQEAKKzwhRE9DVFlQRSBodG1s PgorPGh0bWwgY2xhc3M9InJlZnRlc3Qtd2FpdCI+Cis8aGVhZD4KKzx0aXRsZT5DU1MgVGVzdDog YmFja2dyb3VuZC1jbGlwOiB0ZXh0IHBhaW50cyBtdWx0aS1saW5lIHRleHQgaW4gdGhlIHdyb25n IHBsYWNlPC90aXRsZT4KKzxsaW5rIHJlbD0iaGVscCIgaHJlZj0iaHR0cHM6Ly9kcmFmdHMuY3Nz d2cub3JnL2Nzcy1iYWNrZ3JvdW5kcy00LyN2YWxkZWYtYmFja2dyb3VuZC1jbGlwLXRleHQiPgor PGxpbmsgcmVsPSJhdXRob3IiIGhyZWY9Im1haWx0bzptbWF4ZmllbGRAYXBwbGUuY29tIiB0aXRs ZT0iTXlsZXMgQy4gTWF4ZmllbGQiPgorPGxpbmsgcmVsPSJtYXRjaCIgaHJlZj0iY2xpcC10ZXh0 LW11bHRpLWxpbmUtcmVmLmh0bWwiPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiB0eXBlPSJ0ZXh0 L2NzcyIgaHJlZj0iL2ZvbnRzL2FoZW0uY3NzIj4KKzxzdHlsZT4KKyNjb250YWluZXIgeworICAg IHBvc2l0aW9uOiByZWxhdGl2ZTsKKyAgICBwYWRkaW5nOiAzcHg7Cit9CisKK3NwYW4geworICAg IGZvbnQ6IDQ4cHggIkFoZW0iOworICAgIC13ZWJraXQtYmFja2dyb3VuZC1jbGlwOiB0ZXh0Owor ICAgIC13ZWJraXQtdGV4dC1maWxsLWNvbG9yOiByZ2JhKDAsIDAsIDAsIDApOworICAgIGJhY2tn cm91bmQtaW1hZ2U6IGxpbmVhci1ncmFkaWVudCgwZGVnLCBncmVlbiAwJSwgZ3JlZW4gMTAwJSk7 Cit9CisKK2Rpdi5jb3ZlciB7CisgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIGJhY2tncm91 bmQ6IGdyZWVuOworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorPHA+VGhpcyB0ZXN0IG1h a2VzIHN1cmUgdGhhdCBtdWx0aS1saW5lIGVsZW1lbnRzIHdpdGggPGNvZGU+YmFja2dyb3VuZC1j bGlwOiB0ZXh0PC9jb2RlPiBhcmUgcGxhY2VkIGNvcnJlY3RseS4gVGhlIHRlc3QgcGFzc2VzIGlm IHRoZSB0b3AgcmVjdGFuZ2xlIGlzIChyb3VnaGx5KSBoYWxmIGFzIHdpZGUgYXMgdGhlIGJvdHRv bSByZWN0YW5nbGUuPC9wPgorPGRpdiBpZD0iY29udGFpbmVyIj4KKzxzcGFuPkFBQTxicj5BQUFB QUE8L3NwYW4+Cis8ZGl2IGNsYXNzPSJjb3ZlciIgc3R5bGU9ImxlZnQ6IDBweDsgdG9wOiAwcHg7 IHdpZHRoOiBjYWxjKDQ4cHggKiAzICsgM3B4KTsgaGVpZ2h0OiAzcHg7Ij48L2Rpdj4KKzxkaXYg Y2xhc3M9ImNvdmVyIiBzdHlsZT0ibGVmdDogMHB4OyB0b3A6IDQ4cHg7IHdpZHRoOiBjYWxjKDQ4 cHggKiA2ICsgM3B4KTsgaGVpZ2h0OiA2cHg7Ij48L2Rpdj4KKzxkaXYgY2xhc3M9ImNvdmVyIiBz dHlsZT0ibGVmdDogMHB4OyB0b3A6IGNhbGMoNDhweCAqIDIpOyB3aWR0aDogY2FsYyg0OHB4ICog NiArIDNweCk7IGhlaWdodDogM3B4OyI+PC9kaXY+Cis8ZGl2IGNsYXNzPSJjb3ZlciIgc3R5bGU9 ImxlZnQ6IDBweDsgdG9wOiAwcHg7IHdpZHRoOiAzcHg7IGhlaWdodDogY2FsYyg0OHB4ICogMik7 Ij48L2Rpdj4KKzxkaXYgY2xhc3M9ImNvdmVyIiBzdHlsZT0ibGVmdDogY2FsYyg0OHB4ICogMyk7 IHRvcDogMHB4OyB3aWR0aDogM3B4OyBoZWlnaHQ6IDQ4cHg7Ij48L2Rpdj4KKzxkaXYgY2xhc3M9 ImNvdmVyIiBzdHlsZT0ibGVmdDogY2FsYyg0OHB4ICogNik7IHRvcDogNDhweDsgd2lkdGg6IDNw eDsgaGVpZ2h0OiA0OHB4OyI+PC9kaXY+Cis8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4K 438405 2021-09-16 15:21:07 -0700 2021-09-17 16:28:07 -0700 Patch bug-230335-20210916152107.patch text/plain 7321 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyNDg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmM4MGMwMDY0YTA1MmFk MWU0NjkwMTIxMzdjZGJlMjY3YjlmYTE2YS4uMzI4YTUwNmZmNDNlZWJhYjJjY2FjZDhkYjY0Y2Q5 MTZkZGQxNDQ3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA5LTE1ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgTXVsdGktbGlu ZSB0ZXh0IGNsaXBwZWQgdG8gaXRzIGJhY2tncm91bmQgaXMgcGFpbnRlZCBpbiB0aGUgd3Jvbmcg cGxhY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz MDMzNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTk5Mjg2ODk+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ugd2VyZSBzaW1wbHkgdXNpbmcgcHJl dkxpbmVCb3goKSB0byBwb3NpdGlvbiB0aGUgdGV4dCBpbnN0ZWFkIG9mIHByZXZpb3VzT25MaW5l KCkuCisKKyAgICAgICAgVGVzdDogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLWJhY2tncm91bmRzL2JhY2tncm91bmQtY2xpcC9jbGlwLXRleHQtbXVsdGktbGluZS5odG1s CisKKyAgICAgICAgKiByZW5kZXJpbmcvTGVnYWN5SW5saW5lRmxvd0JveC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpMZWdhY3lJbmxpbmVGbG93Qm94OjpwYWludEZpbGxMYXllcik6CisKIDIwMjEt MDktMTUgIFBoaWxpcCBDaGltZW50byAgPHBjaGltZW50b0BpZ2FsaWEuY29tPgogCiAgICAgICAg IEZpeGVzIGZvciBidWlsZC13ZWJraXQgLS1taW5pbWFsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvTGVnYWN5SW5saW5lRmxvd0JveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvTGVnYWN5SW5saW5lRmxvd0JveC5jcHAKaW5kZXggZWJmMjYwN2I3YWY5YjNlNDY3 MTViNmVmYmEwYmVkMTEyOTI3ODc5My4uOWMzYmZjYTVmNDAzODBhMzJhYjU1ZDkxNGNmYmI4NjMw NTY4MTI2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xlZ2FjeUlubGlu ZUZsb3dCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MZWdhY3lJbmxpbmVG bG93Qm94LmNwcApAQCAtMTIxMiwxMyArMTIxMiwxMyBAQCB2b2lkIExlZ2FjeUlubGluZUZsb3dC b3g6OnBhaW50RmlsbExheWVyKGNvbnN0IFBhaW50SW5mbyYgcGFpbnRJbmZvLCBjb25zdCBDb2xv cgogICAgICAgICBMYXlvdXRVbml0IGxvZ2ljYWxPZmZzZXRPbkxpbmU7CiAgICAgICAgIExheW91 dFVuaXQgdG90YWxMb2dpY2FsV2lkdGg7CiAgICAgICAgIGlmIChyZW5kZXJlcigpLnN0eWxlKCku ZGlyZWN0aW9uKCkgPT0gVGV4dERpcmVjdGlvbjo6TFRSKSB7Ci0gICAgICAgICAgICBmb3IgKGF1 dG8qIGN1cnIgPSBwcmV2TGluZUJveCgpOyBjdXJyOyBjdXJyID0gY3Vyci0+cHJldkxpbmVCb3go KSkKKyAgICAgICAgICAgIGZvciAoYXV0byogY3VyciA9IHByZXZpb3VzT25MaW5lKCk7IGN1cnI7 IGN1cnIgPSBjdXJyLT5wcmV2aW91c09uTGluZSgpKQogICAgICAgICAgICAgICAgIGxvZ2ljYWxP ZmZzZXRPbkxpbmUgKz0gY3Vyci0+bG9naWNhbFdpZHRoKCk7CiAgICAgICAgICAgICB0b3RhbExv Z2ljYWxXaWR0aCA9IGxvZ2ljYWxPZmZzZXRPbkxpbmU7CiAgICAgICAgICAgICBmb3IgKGF1dG8q IGN1cnIgPSB0aGlzOyBjdXJyOyBjdXJyID0gY3Vyci0+bmV4dExpbmVCb3goKSkKICAgICAgICAg ICAgICAgICB0b3RhbExvZ2ljYWxXaWR0aCArPSBjdXJyLT5sb2dpY2FsV2lkdGgoKTsKICAgICAg ICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGZvciAoYXV0byogY3VyciA9IG5leHRMaW5lQm94KCk7 IGN1cnI7IGN1cnIgPSBjdXJyLT5uZXh0TGluZUJveCgpKQorICAgICAgICAgICAgZm9yIChhdXRv KiBjdXJyID0gbmV4dE9uTGluZSgpOyBjdXJyOyBjdXJyID0gY3Vyci0+bmV4dE9uTGluZSgpKQog ICAgICAgICAgICAgICAgIGxvZ2ljYWxPZmZzZXRPbkxpbmUgKz0gY3Vyci0+bG9naWNhbFdpZHRo KCk7CiAgICAgICAgICAgICB0b3RhbExvZ2ljYWxXaWR0aCA9IGxvZ2ljYWxPZmZzZXRPbkxpbmU7 CiAgICAgICAgICAgICBmb3IgKGF1dG8qIGN1cnIgPSB0aGlzOyBjdXJyOyBjdXJyID0gY3Vyci0+ cHJldkxpbmVCb3goKSkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IDhhM2JiNzIz ZDNjZWYwMzA3YTdiZjQyM2M4NDEyMTEwZTk3YzM0OTUuLjI1ZjA2ZTQ3OTVhMzE1ODUzYjI2Mzg2 YzVmYzczY2JkYTgyYzMxYjggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE2IEBACisyMDIxLTA5LTE1ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBs ZS5jb20+CisKKyAgICAgICAgTXVsdGktbGluZSB0ZXh0IGNsaXBwZWQgdG8gaXRzIGJhY2tncm91 bmQgaXMgcGFpbnRlZCBpbiB0aGUgd3JvbmcgcGxhY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDMzNQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NTk5Mjg2ODk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhpcyBpcyBiZWluZyB1cHN0cmVhbWVkIGluIGh0dHBzOi8vZ2l0aHViLmNvbS93ZWItcGxh dGZvcm0tdGVzdHMvd3B0L3B1bGwvMzA4MTIuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVz dHMvY3NzL2Nzcy1iYWNrZ3JvdW5kcy9iYWNrZ3JvdW5kLWNsaXAvY2xpcC10ZXh0LW11bHRpLWxp bmUtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL2Nz cy9jc3MtYmFja2dyb3VuZHMvYmFja2dyb3VuZC1jbGlwL2NsaXAtdGV4dC1tdWx0aS1saW5lLmh0 bWw6IEFkZGVkLgorCiAyMDIxLTA5LTE1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2Vu QHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWRkIElETCBza2VsZXRvbiBmb3IgU2hhcmVkV29ya2Vy CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L2Nzcy9jc3MtYmFja2dyb3VuZHMvYmFja2dyb3VuZC1jbGlwL2NsaXAtdGV4dC1tdWx0aS1saW5l LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL2Nzcy9jc3MtYmFja2dyb3VuZHMvYmFja2dyb3VuZC1jbGlwL2NsaXAtdGV4dC1tdWx0aS1s aW5lLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uY2RkYWZkY2Q1Mzc2ZWJlMzY3MDQ5MDJjNmZj ZTFiNmFjYTVmZjAwOQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1iYWNrZ3JvdW5kcy9iYWNrZ3JvdW5kLWNsaXAv Y2xpcC10ZXh0LW11bHRpLWxpbmUtZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDM2IEBACis8IURP Q1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8dGl0bGU+Q1NTIFRlc3Q6IGJhY2tncm91bmQt Y2xpcDogdGV4dCBwYWludHMgbXVsdGktbGluZSB0ZXh0IGluIHRoZSB3cm9uZyBwbGFjZTwvdGl0 bGU+Cis8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3Mt YmFja2dyb3VuZHMtNC8jdmFsZGVmLWJhY2tncm91bmQtY2xpcC10ZXh0Ij4KKzxsaW5rIHJlbD0i YXV0aG9yIiBocmVmPSJtYWlsdG86bW1heGZpZWxkQGFwcGxlLmNvbSIgdGl0bGU9Ik15bGVzIEMu IE1heGZpZWxkIj4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgdHlwZT0idGV4dC9jc3MiIGhyZWY9 Ii9mb250cy9haGVtLmNzcyI+Cis8c3R5bGU+CisjY29udGFpbmVyIHsKKyAgICBwb3NpdGlvbjog cmVsYXRpdmU7CisgICAgcGFkZGluZzogM3B4OworfQorCitzcGFuIHsKKyAgICBjb2xvcjogZ3Jl ZW47CisgICAgZm9udDogNDhweCAiQWhlbSI7Cit9CisKK2Rpdi5jb3ZlciB7CisgICAgcG9zaXRp b246IGFic29sdXRlOworICAgIGJhY2tncm91bmQ6IGdyZWVuOworfQorPC9zdHlsZT4KKzwvaGVh ZD4KKzxib2R5PgorPHA+VGhpcyB0ZXN0IG1ha2VzIHN1cmUgdGhhdCBtdWx0aS1saW5lIGVsZW1l bnRzIHdpdGggPGNvZGU+YmFja2dyb3VuZC1jbGlwOiB0ZXh0PC9jb2RlPiBhcmUgcGxhY2VkIGNv cnJlY3RseS4gVGhlIHRlc3QgcGFzc2VzIGlmIHRoZSB0b3AgcmVjdGFuZ2xlIGlzIChyb3VnaGx5 KSBoYWxmIGFzIHdpZGUgYXMgdGhlIGJvdHRvbSByZWN0YW5nbGUuPC9wPgorPGRpdiBpZD0iY29u dGFpbmVyIj4KKzxzcGFuPkFBQTxicj5BQUFBQUE8L3NwYW4+Cis8ZGl2IGNsYXNzPSJjb3ZlciIg c3R5bGU9ImxlZnQ6IDBweDsgdG9wOiAwcHg7IHdpZHRoOiBjYWxjKDQ4cHggKiAzICsgM3B4KTsg aGVpZ2h0OiAzcHg7Ij48L2Rpdj4KKzxkaXYgY2xhc3M9ImNvdmVyIiBzdHlsZT0ibGVmdDogMHB4 OyB0b3A6IDQ4cHg7IHdpZHRoOiBjYWxjKDQ4cHggKiA2ICsgM3B4KTsgaGVpZ2h0OiA2cHg7Ij48 L2Rpdj4KKzxkaXYgY2xhc3M9ImNvdmVyIiBzdHlsZT0ibGVmdDogMHB4OyB0b3A6IGNhbGMoNDhw eCAqIDIpOyB3aWR0aDogY2FsYyg0OHB4ICogNiArIDNweCk7IGhlaWdodDogM3B4OyI+PC9kaXY+ Cis8ZGl2IGNsYXNzPSJjb3ZlciIgc3R5bGU9ImxlZnQ6IDBweDsgdG9wOiAwcHg7IHdpZHRoOiAz cHg7IGhlaWdodDogY2FsYyg0OHB4ICogMik7Ij48L2Rpdj4KKzxkaXYgY2xhc3M9ImNvdmVyIiBz dHlsZT0ibGVmdDogY2FsYyg0OHB4ICogMyk7IHRvcDogMHB4OyB3aWR0aDogM3B4OyBoZWlnaHQ6 IDQ4cHg7Ij48L2Rpdj4KKzxkaXYgY2xhc3M9ImNvdmVyIiBzdHlsZT0ibGVmdDogY2FsYyg0OHB4 ICogNik7IHRvcDogNDhweDsgd2lkdGg6IDNweDsgaGVpZ2h0OiA0OHB4OyI+PC9kaXY+Cis8L2Jv ZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBs YXRmb3JtLXRlc3RzL2Nzcy9jc3MtYmFja2dyb3VuZHMvYmFja2dyb3VuZC1jbGlwL2NsaXAtdGV4 dC1tdWx0aS1saW5lLmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3MtYmFja2dyb3VuZHMvYmFja2dyb3VuZC1jbGlwL2NsaXAtdGV4dC1tdWx0 aS1saW5lLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZmQ5ODJlNTBjMDhmNTdjYWZiOTIxMTI1Yjc1ZmJiOWJl NzQyOGIxZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1iYWNrZ3JvdW5kcy9iYWNrZ3JvdW5kLWNsaXAvY2xpcC10 ZXh0LW11bHRpLWxpbmUuaHRtbApAQCAtMCwwICsxLDQwIEBACis8IURPQ1RZUEUgaHRtbD4KKzxo dG1sPgorPGhlYWQ+Cis8dGl0bGU+Q1NTIFRlc3Q6IGJhY2tncm91bmQtY2xpcDogdGV4dCBwYWlu dHMgbXVsdGktbGluZSB0ZXh0IGluIHRoZSB3cm9uZyBwbGFjZTwvdGl0bGU+Cis8bGluayByZWw9 ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtYmFja2dyb3VuZHMtNC8j dmFsZGVmLWJhY2tncm91bmQtY2xpcC10ZXh0Ij4KKzxsaW5rIHJlbD0iYXV0aG9yIiBocmVmPSJt YWlsdG86bW1heGZpZWxkQGFwcGxlLmNvbSIgdGl0bGU9Ik15bGVzIEMuIE1heGZpZWxkIj4KKzxs aW5rIHJlbD0ibWF0Y2giIGhyZWY9ImNsaXAtdGV4dC1tdWx0aS1saW5lLXJlZi5odG1sIj4KKzxs aW5rIHJlbD0ic3R5bGVzaGVldCIgdHlwZT0idGV4dC9jc3MiIGhyZWY9Ii9mb250cy9haGVtLmNz cyI+Cis8c3R5bGU+CisjY29udGFpbmVyIHsKKyAgICBwb3NpdGlvbjogcmVsYXRpdmU7CisgICAg cGFkZGluZzogM3B4OworfQorCitzcGFuIHsKKyAgICBmb250OiA0OHB4ICJBaGVtIjsKKyAgICAt d2Via2l0LWJhY2tncm91bmQtY2xpcDogdGV4dDsKKyAgICAtd2Via2l0LXRleHQtZmlsbC1jb2xv cjogcmdiYSgwLCAwLCAwLCAwKTsKKyAgICBiYWNrZ3JvdW5kLWltYWdlOiBsaW5lYXItZ3JhZGll bnQoMGRlZywgZ3JlZW4gMCUsIGdyZWVuIDEwMCUpOworfQorCitkaXYuY292ZXIgeworICAgIHBv c2l0aW9uOiBhYnNvbHV0ZTsKKyAgICBiYWNrZ3JvdW5kOiBncmVlbjsKK30KKzwvc3R5bGU+Cis8 L2hlYWQ+Cis8Ym9keT4KKzxwPlRoaXMgdGVzdCBtYWtlcyBzdXJlIHRoYXQgbXVsdGktbGluZSBl bGVtZW50cyB3aXRoIDxjb2RlPmJhY2tncm91bmQtY2xpcDogdGV4dDwvY29kZT4gYXJlIHBsYWNl ZCBjb3JyZWN0bHkuIFRoZSB0ZXN0IHBhc3NlcyBpZiB0aGUgdG9wIHJlY3RhbmdsZSBpcyAocm91 Z2hseSkgaGFsZiBhcyB3aWRlIGFzIHRoZSBib3R0b20gcmVjdGFuZ2xlLjwvcD4KKzxkaXYgaWQ9 ImNvbnRhaW5lciI+Cis8c3Bhbj5BQUE8YnI+QUFBQUFBPC9zcGFuPgorPGRpdiBjbGFzcz0iY292 ZXIiIHN0eWxlPSJsZWZ0OiAwcHg7IHRvcDogMHB4OyB3aWR0aDogY2FsYyg0OHB4ICogMyArIDNw eCk7IGhlaWdodDogM3B4OyI+PC9kaXY+Cis8ZGl2IGNsYXNzPSJjb3ZlciIgc3R5bGU9ImxlZnQ6 IDBweDsgdG9wOiA0OHB4OyB3aWR0aDogY2FsYyg0OHB4ICogNiArIDNweCk7IGhlaWdodDogNnB4 OyI+PC9kaXY+Cis8ZGl2IGNsYXNzPSJjb3ZlciIgc3R5bGU9ImxlZnQ6IDBweDsgdG9wOiBjYWxj KDQ4cHggKiAyKTsgd2lkdGg6IGNhbGMoNDhweCAqIDYgKyAzcHgpOyBoZWlnaHQ6IDNweDsiPjwv ZGl2PgorPGRpdiBjbGFzcz0iY292ZXIiIHN0eWxlPSJsZWZ0OiAwcHg7IHRvcDogMHB4OyB3aWR0 aDogM3B4OyBoZWlnaHQ6IGNhbGMoNDhweCAqIDIpOyI+PC9kaXY+Cis8ZGl2IGNsYXNzPSJjb3Zl ciIgc3R5bGU9ImxlZnQ6IGNhbGMoNDhweCAqIDMpOyB0b3A6IDBweDsgd2lkdGg6IDNweDsgaGVp Z2h0OiA0OHB4OyI+PC9kaXY+Cis8ZGl2IGNsYXNzPSJjb3ZlciIgc3R5bGU9ImxlZnQ6IGNhbGMo NDhweCAqIDYpOyB0b3A6IDQ4cHg7IHdpZHRoOiAzcHg7IGhlaWdodDogNDhweDsiPjwvZGl2Pgor PC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+Cg==