242000 2022-06-25 03:14:55 -0700 Fix block-aspect-ratio-037.html 2022-06-29 06:58:35 -0700 1 1 1 Unclassified WebKit CSS Safari 15 Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis changseok clopez darin esprehn+autocc ews-watchlist glenn jochen.kuehner kondapallykalyan pdr webkit-bug-importer youennf zalan oldest_to_newest 1878354 0 rbuis 2022-06-25 03:14:55 -0700 Fix block-aspect-ratio-037.html. 1878355 1 460490 rbuis 2022-06-25 03:26:21 -0700 Created attachment 460490 Patch 1878357 2 ews-watchlist 2022-06-25 03:28:22 -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 1878428 3 460490 darin 2022-06-26 16:54:26 -0700 Comment on attachment 460490 Patch r=me Is the single regression test sufficient coverage for both code changes? 1878478 4 460502 rbuis 2022-06-27 06:21:35 -0700 Created attachment 460502 Patch 1878749 5 rbuis 2022-06-28 05:47:22 -0700 (In reply to Darin Adler from comment #3) > Comment on attachment 460490 [details] > Patch > > r=me > > Is the single regression test sufficient coverage for both code changes? The change in constrainLogicalHeightByMinMax is covered by aspect-ratio/grid-aspect-ratio-022.html. 1878752 6 ews-feeder 2022-06-28 05:54:27 -0700 Committed 251908@main (e97db329a49a): <https://commits.webkit.org/251908@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 460502. 1878753 7 webkit-bug-importer 2022-06-28 05:55:12 -0700 <rdar://problem/96055491> 1879008 8 rbuis 2022-06-29 06:58:35 -0700 *** Bug 231775 has been marked as a duplicate of this bug. *** 460490 2022-06-25 03:26:21 -0700 2022-06-27 06:21:31 -0700 Patch bug-242000-20220625112619.patch text/plain 5248 rbuis RnJvbSA0N2YwNTRhNGY4N2UxMzA2NThlODA3NzVjYmJkYTMxOTI2M2Q2NmQ0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSb2IgQnVpcyA8cmJ1aXNAaWdhbGlhLmNvbT4KRGF0ZTogU2F0 LCAyNSBKdW4gMjAyMiAxMToxNTowNSArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIEZpeCBibG9jay1h c3BlY3QtcmF0aW8tMDM3Lmh0bWwKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yNDIwMDAKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKT25seSB0cmFuc2ZlciBt aW4vbWF4IGJsb2NrLXNpemVzIGlmIGlubGluZS1zaXplIGlzIGF1dG8gYXMgc3BlY2lmaWVkIGhl cmUgWzFdOgoiVGhpcyB0cmFuc2ZlcnJlZCBtaW5pbXVtIGlzIGNhcHBlZCBieSBhbnkgZGVmaW5p dGUgcHJlZmVycmVkIG9yIG1heGltdW0gc2l6ZSBpbiB0aGUgZGVzdGluYXRpb24gYXhpcy4iCiJU aGlzIHRyYW5zZmVycmVkIG1heGltdW0gaXMgZmxvb3JlZCBieSBhbnkgZGVmaW5pdGUgcHJlZmVy cmVkIG9yIG1pbmltdW0gc2l6ZSBpbiB0aGUgZGVzdGluYXRpb24gYXhpcyBhcyB3ZWxsIGFzIGJ5 IHRoZSB0cmFuc2ZlcnJlZCBtaW5pbXVtLCBpZiBhbnkuIgoKWzFdIGh0dHBzOi8vZHJhZnRzLmNz c3dnLm9yZy9jc3Mtc2l6aW5nLTQvI2FzcGVjdC1yYXRpby1zaXplLXRyYW5zZmVycwoKKiBMYXlv dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2Fz cGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDM3LWV4cGVjdGVkLnhodDogQWRkZWQuCiog TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemlu Zy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAzNy5odG1sOiBBZGRlZC4KKiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKFdlYkNvcmU6OlJlbmRlckJveDo6 Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4IGNvbnN0KToKKFdlYkNvcmU6 OlJlbmRlckJveDo6Y29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4IGNvbnN0KToKLS0tCiBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcCAgICAgICAgfCAgNyArKysrKy0t CiAuLi4vYmxvY2stYXNwZWN0LXJhdGlvLTAzNy1leHBlY3RlZC54aHQgICAgICAgfCAxOSArKysr KysrKysrKysrKysrKysrCiAuLi4vYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMzcu aHRtbCAgfCAgNSArKysrKwogMyBmaWxlcyBjaGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCAyIGRl bGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IExheW91dFRlc3RzL2ltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVj dC1yYXRpby0wMzctZXhwZWN0ZWQueGh0CiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMv aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0 aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAzNy5odG1sCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmNwcAppbmRleCA5ZDA0M2I4MmJlY2IuLmMxNzhmMjc5NTE2MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTY3Nyw4ICs2NzcsMTAgQEAgTGF5b3V0VW5p dCBSZW5kZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxXaWR0aEluRnJhZ21lbnRCeU1pbk1heChMYXlv dXRVbml0IGxvZ2ljYWwKICAgICBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGVUb1VzZSA9IHN0eWxl KCk7CiAKICAgICBpZiAoc2hvdWxkQ29tcHV0ZUxvZ2ljYWxIZWlnaHRGcm9tQXNwZWN0UmF0aW8o KSkgewotICAgICAgICBhdXRvIFtsb2dpY2FsTWluV2lkdGgsIGxvZ2ljYWxNYXhXaWR0aF0gPSBj b21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7Ci0gICAgICAgIGxvZ2lj YWxXaWR0aCA9IHN0ZDo6Y2xhbXAobG9naWNhbFdpZHRoLCBsb2dpY2FsTWluV2lkdGgsIGxvZ2lj YWxNYXhXaWR0aCk7CisgICAgICAgIGlmICghc3R5bGVUb1VzZS5sb2dpY2FsV2lkdGgoKS5pc1Nw ZWNpZmllZCgpKSB7CisgICAgICAgICAgICBhdXRvIFtsb2dpY2FsTWluV2lkdGgsIGxvZ2ljYWxN YXhXaWR0aF0gPSBjb21wdXRlTWluTWF4TG9naWNhbFdpZHRoRnJvbUFzcGVjdFJhdGlvKCk7Cisg ICAgICAgICAgICBsb2dpY2FsV2lkdGggPSBzdGQ6OmNsYW1wKGxvZ2ljYWxXaWR0aCwgbG9naWNh bE1pbldpZHRoLCBsb2dpY2FsTWF4V2lkdGgpOworICAgICAgICB9CiAgICAgfQogCiAgICAgaWYg KCFzdHlsZVRvVXNlLmxvZ2ljYWxNYXhXaWR0aCgpLmlzVW5kZWZpbmVkKCkgJiYgKGFsbG93SW50 cmluc2ljID09IEFsbG93SW50cmluc2ljOjpZZXMgfHwgIXN0eWxlVG9Vc2UubG9naWNhbE1heFdp ZHRoKCkuaXNJbnRyaW5zaWMoKSkpCkBAIC03MDMsNiArNzA1LDcgQEAgTGF5b3V0VW5pdCBSZW5k ZXJCb3g6OmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChMYXlvdXRVbml0IGxvZ2ljYWxI ZWlnaHQsIHMKICAgICBhdXRvIGxvZ2ljYWxNaW5IZWlnaHQgPSBzdHlsZVRvVXNlLmxvZ2ljYWxN aW5IZWlnaHQoKTsKICAgICBpZiAobG9naWNhbE1pbkhlaWdodC5pc0F1dG8oKSAmJiBzaG91bGRD b21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpICYmIGludHJpbnNpY0NvbnRlbnRI ZWlnaHQgJiYgIWlzPFJlbmRlclJlcGxhY2VkPigqdGhpcykgJiYgZWZmZWN0aXZlT3ZlcmZsb3dC bG9ja0RpcmVjdGlvbigpID09IE92ZXJmbG93OjpWaXNpYmxlKSB7CiAgICAgICAgIGF1dG8gaGVp Z2h0RnJvbUFzcGVjdFJhdGlvID0gYmxvY2tTaXplRnJvbUFzcGVjdFJhdGlvKGhvcml6b250YWxC b3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHZlcnRpY2FsQm9yZGVyQW5kUGFkZGluZ0V4dGVudCgp LCBzdHlsZSgpLmxvZ2ljYWxBc3BlY3RSYXRpbygpLCBzdHlsZSgpLmJveFNpemluZ0ZvckFzcGVj dFJhdGlvKCksIGxvZ2ljYWxXaWR0aCgpKSAtIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0 KCk7CisgICAgICAgIGhlaWdodEZyb21Bc3BlY3RSYXRpbyA9IHN0ZDo6bWluKGhlaWdodEZyb21B c3BlY3RSYXRpbywgbG9naWNhbEhlaWdodCk7CiAgICAgICAgIGlmIChmaXJzdENoaWxkKCkpCiAg ICAgICAgICAgICBoZWlnaHRGcm9tQXNwZWN0UmF0aW8gPSBzdGQ6Om1heChoZWlnaHRGcm9tQXNw ZWN0UmF0aW8sICppbnRyaW5zaWNDb250ZW50SGVpZ2h0KTsKICAgICAgICAgbG9naWNhbE1pbkhl aWdodCA9IExlbmd0aChoZWlnaHRGcm9tQXNwZWN0UmF0aW8sIExlbmd0aFR5cGU6OkZpeGVkKTsK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMzctZXhwZWN0 ZWQueGh0IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3Mv Y3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAzNy1leHBlY3RlZC54 aHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi4wNWExMzc5NDQ4MmEK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDM3 LWV4cGVjdGVkLnhodApAQCAtMCwwICsxLDE5IEBACis8IURPQ1RZUEUgaHRtbCBQVUJMSUMgIi0v L1czQy8vRFREIFhIVE1MIDEuMCBTdHJpY3QvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIveGh0 bWwxL0RURC94aHRtbDEtc3RyaWN0LmR0ZCI+Cis8aHRtbCB4bWxucz0iaHR0cDovL3d3dy53My5v cmcvMTk5OS94aHRtbCI+CisgPGhlYWQ+CisgIDx0aXRsZT5DU1MgUmVmdGVzdCBSZWZlcmVuY2U8 L3RpdGxlPgorICA8bGluayByZWw9ImF1dGhvciIgdGl0bGU9IkfDqXJhcmQgVGFsYm90IiBocmVm PSJodHRwOi8vd3d3Lmd0YWxib3Qub3JnL0Jyb3dzZXJCdWdzU2VjdGlvbi9jc3MyMXRlc3RzdWl0 ZS8iIC8+CisgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PCFbQ0RBVEFbCisgIGRpdgorICB7Cisg IGJhY2tncm91bmQtY29sb3I6IGdyZWVuOworICBoZWlnaHQ6IDEwMHB4OworICB3aWR0aDogMTAw cHg7CisgIH0KKyAgXV0+PC9zdHlsZT4KKyA8L2hlYWQ+CisgPGJvZHk+CisgIDxwPlRlc3QgcGFz c2VzIGlmIHRoZXJlIGlzIGEgZmlsbGVkIGdyZWVuIHNxdWFyZSBhbmQgPHN0cm9uZz5ubyByZWQ8 L3N0cm9uZz4uPC9wPgorICA8ZGl2PjwvZGl2PgorIDwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1z aXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMzcuaHRtbCBiL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNwZWN0 LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMzcuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAuLjI2Yjc5NWIyYTBiYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvY3NzL2Nzcy1zaXppbmcvYXNw ZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMzcuaHRtbApAQCAtMCwwICsxLDUgQEAKKzwh RE9DVFlQRSBodG1sPgorPGxpbmsgcmVsPSJoZWxwIiBocmVmPSJodHRwczovL2RyYWZ0cy5jc3N3 Zy5vcmcvY3NzLXNpemluZy00LyNhc3BlY3QtcmF0aW8iPgorPGxpbmsgcmVsPSJtYXRjaCIgaHJl Zj0iLi4vLi4vcmVmZXJlbmNlL3JlZi1maWxsZWQtZ3JlZW4tMTAwcHgtc3F1YXJlLnhodCIgLz4K KzxwPlRlc3QgcGFzc2VzIGlmIHRoZXJlIGlzIGEgZmlsbGVkIGdyZWVuIHNxdWFyZSBhbmQgPHN0 cm9uZz5ubyByZWQ8L3N0cm9uZz4uPC9wPgorPGRpdiBzdHlsZT0iYXNwZWN0LXJhdGlvOiAyLzE7 IG1pbi1oZWlnaHQ6IDEwMHB4OyB3aWR0aDogMTAwcHg7IGJhY2tncm91bmQ6IGdyZWVuOyI+PC9k aXY+Cg== 460502 2022-06-27 06:21:35 -0700 2022-06-28 05:54:28 -0700 Patch bug-242000-20220627142134.patch text/plain 5298 rbuis RnJvbSA0ZDk5M2NmNTVlZjBiOTAwYmZiYzRhZTM3YjRhNjNlMzkyMjhjMTE0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSb2IgQnVpcyA8cmJ1aXNAaWdhbGlhLmNvbT4KRGF0ZTogU2F0 LCAyNSBKdW4gMjAyMiAxMToxNTowNSArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIEZpeCBibG9jay1h c3BlY3QtcmF0aW8tMDM3Lmh0bWwKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yNDIwMDAKClJldmlld2VkIGJ5IERhcmluIEFkbGVyLgoKT25seSB0cmFuc2ZlciBtaW4v bWF4IGJsb2NrLXNpemVzIGlmIGlubGluZS1zaXplIGlzIGF1dG8gYXMgc3BlY2lmaWVkIGhlcmUg WzFdOgoiVGhpcyB0cmFuc2ZlcnJlZCBtaW5pbXVtIGlzIGNhcHBlZCBieSBhbnkgZGVmaW5pdGUg cHJlZmVycmVkIG9yIG1heGltdW0gc2l6ZSBpbiB0aGUgZGVzdGluYXRpb24gYXhpcy4iCiJUaGlz IHRyYW5zZmVycmVkIG1heGltdW0gaXMgZmxvb3JlZCBieSBhbnkgZGVmaW5pdGUgcHJlZmVycmVk IG9yIG1pbmltdW0gc2l6ZSBpbiB0aGUgZGVzdGluYXRpb24gYXhpcyBhcyB3ZWxsIGFzIGJ5IHRo ZSB0cmFuc2ZlcnJlZCBtaW5pbXVtLCBpZiBhbnkuIgoKWzFdIGh0dHBzOi8vZHJhZnRzLmNzc3dn Lm9yZy9jc3Mtc2l6aW5nLTQvI2FzcGVjdC1yYXRpby1zaXplLXRyYW5zZmVycwoKKiBMYXlvdXRU ZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVj dC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDM3LWV4cGVjdGVkLnhodDogQWRkZWQuCiogTGF5 b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h c3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAzNy5odG1sOiBBZGRlZC4KKiBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcDoKKFdlYkNvcmU6OlJlbmRlckJveDo6Y29u c3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4IGNvbnN0KToKKFdlYkNvcmU6OlJl bmRlckJveDo6Y29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4IGNvbnN0KTogdHJhbnNmZXJy ZWQgbWluIHNpemUgbmVlZHMgdG8gYmUgY2FwcGVkIGJ5IG1heCBzaXplLgotLS0KIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwICAgICAgICB8ICA3ICsrKysrLS0KIC4uLi9i bG9jay1hc3BlY3QtcmF0aW8tMDM3LWV4cGVjdGVkLnhodCAgICAgICB8IDE5ICsrKysrKysrKysr KysrKysrKysKIC4uLi9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAzNy5odG1sICB8 ICA1ICsrKysrCiAzIGZpbGVzIGNoYW5nZWQsIDI5IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25z KC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlv LTAzNy1leHBlY3RlZC54aHQKIGNyZWF0ZSBtb2RlIDEwMDY0NCBMYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6aW5nL2FzcGVjdC1yYXRpby9ibG9j ay1hc3BlY3QtcmF0aW8tMDM3Lmh0bWwKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3gu Y3BwCmluZGV4IDlkMDQzYjgyYmVjYi4uYzE3OGYyNzk1MTYxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcApAQCAtNjc3LDggKzY3NywxMCBAQCBMYXlvdXRVbml0IFJlbmRl ckJveDo6Y29uc3RyYWluTG9naWNhbFdpZHRoSW5GcmFnbWVudEJ5TWluTWF4KExheW91dFVuaXQg bG9naWNhbAogICAgIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZVRvVXNlID0gc3R5bGUoKTsKIAog ICAgIGlmIChzaG91bGRDb21wdXRlTG9naWNhbEhlaWdodEZyb21Bc3BlY3RSYXRpbygpKSB7Ci0g ICAgICAgIGF1dG8gW2xvZ2ljYWxNaW5XaWR0aCwgbG9naWNhbE1heFdpZHRoXSA9IGNvbXB1dGVN aW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKTsKLSAgICAgICAgbG9naWNhbFdpZHRo ID0gc3RkOjpjbGFtcChsb2dpY2FsV2lkdGgsIGxvZ2ljYWxNaW5XaWR0aCwgbG9naWNhbE1heFdp ZHRoKTsKKyAgICAgICAgaWYgKCFzdHlsZVRvVXNlLmxvZ2ljYWxXaWR0aCgpLmlzU3BlY2lmaWVk KCkpIHsKKyAgICAgICAgICAgIGF1dG8gW2xvZ2ljYWxNaW5XaWR0aCwgbG9naWNhbE1heFdpZHRo XSA9IGNvbXB1dGVNaW5NYXhMb2dpY2FsV2lkdGhGcm9tQXNwZWN0UmF0aW8oKTsKKyAgICAgICAg ICAgIGxvZ2ljYWxXaWR0aCA9IHN0ZDo6Y2xhbXAobG9naWNhbFdpZHRoLCBsb2dpY2FsTWluV2lk dGgsIGxvZ2ljYWxNYXhXaWR0aCk7CisgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAoIXN0eWxl VG9Vc2UubG9naWNhbE1heFdpZHRoKCkuaXNVbmRlZmluZWQoKSAmJiAoYWxsb3dJbnRyaW5zaWMg PT0gQWxsb3dJbnRyaW5zaWM6OlllcyB8fCAhc3R5bGVUb1VzZS5sb2dpY2FsTWF4V2lkdGgoKS5p c0ludHJpbnNpYygpKSkKQEAgLTcwMyw2ICs3MDUsNyBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6 Y29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCwg cwogICAgIGF1dG8gbG9naWNhbE1pbkhlaWdodCA9IHN0eWxlVG9Vc2UubG9naWNhbE1pbkhlaWdo dCgpOwogICAgIGlmIChsb2dpY2FsTWluSGVpZ2h0LmlzQXV0bygpICYmIHNob3VsZENvbXB1dGVM b2dpY2FsSGVpZ2h0RnJvbUFzcGVjdFJhdGlvKCkgJiYgaW50cmluc2ljQ29udGVudEhlaWdodCAm JiAhaXM8UmVuZGVyUmVwbGFjZWQ+KCp0aGlzKSAmJiBlZmZlY3RpdmVPdmVyZmxvd0Jsb2NrRGly ZWN0aW9uKCkgPT0gT3ZlcmZsb3c6OlZpc2libGUpIHsKICAgICAgICAgYXV0byBoZWlnaHRGcm9t QXNwZWN0UmF0aW8gPSBibG9ja1NpemVGcm9tQXNwZWN0UmF0aW8oaG9yaXpvbnRhbEJvcmRlckFu ZFBhZGRpbmdFeHRlbnQoKSwgdmVydGljYWxCb3JkZXJBbmRQYWRkaW5nRXh0ZW50KCksIHN0eWxl KCkubG9naWNhbEFzcGVjdFJhdGlvKCksIHN0eWxlKCkuYm94U2l6aW5nRm9yQXNwZWN0UmF0aW8o KSwgbG9naWNhbFdpZHRoKCkpIC0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKTsKKyAg ICAgICAgaGVpZ2h0RnJvbUFzcGVjdFJhdGlvID0gc3RkOjptaW4oaGVpZ2h0RnJvbUFzcGVjdFJh dGlvLCBsb2dpY2FsSGVpZ2h0KTsKICAgICAgICAgaWYgKGZpcnN0Q2hpbGQoKSkKICAgICAgICAg ICAgIGhlaWdodEZyb21Bc3BlY3RSYXRpbyA9IHN0ZDo6bWF4KGhlaWdodEZyb21Bc3BlY3RSYXRp bywgKmludHJpbnNpY0NvbnRlbnRIZWlnaHQpOwogICAgICAgICBsb2dpY2FsTWluSGVpZ2h0ID0g TGVuZ3RoKGhlaWdodEZyb21Bc3BlY3RSYXRpbywgTGVuZ3RoVHlwZTo6Rml4ZWQpOwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3Nz LXNpemluZy9hc3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAzNy1leHBlY3RlZC54aHQg Yi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2Nzcy9jc3Mtc2l6 aW5nL2FzcGVjdC1yYXRpby9ibG9jay1hc3BlY3QtcmF0aW8tMDM3LWV4cGVjdGVkLnhodApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAuLjA1YTEzNzk0NDgyYQotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMv Y3NzL2Nzcy1zaXppbmcvYXNwZWN0LXJhdGlvL2Jsb2NrLWFzcGVjdC1yYXRpby0wMzctZXhwZWN0 ZWQueGh0CkBAIC0wLDAgKzEsMTkgQEAKKzwhRE9DVFlQRSBodG1sIFBVQkxJQyAiLS8vVzNDLy9E VEQgWEhUTUwgMS4wIFN0cmljdC8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9UUi94aHRtbDEvRFRE L3hodG1sMS1zdHJpY3QuZHRkIj4KKzxodG1sIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5 L3hodG1sIj4KKyA8aGVhZD4KKyAgPHRpdGxlPkNTUyBSZWZ0ZXN0IFJlZmVyZW5jZTwvdGl0bGU+ CisgIDxsaW5rIHJlbD0iYXV0aG9yIiB0aXRsZT0iR8OpcmFyZCBUYWxib3QiIGhyZWY9Imh0dHA6 Ly93d3cuZ3RhbGJvdC5vcmcvQnJvd3NlckJ1Z3NTZWN0aW9uL2NzczIxdGVzdHN1aXRlLyIgLz4K KyAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj48IVtDREFUQVsKKyAgZGl2CisgIHsKKyAgYmFja2dy b3VuZC1jb2xvcjogZ3JlZW47CisgIGhlaWdodDogMTAwcHg7CisgIHdpZHRoOiAxMDBweDsKKyAg fQorICBdXT48L3N0eWxlPgorIDwvaGVhZD4KKyA8Ym9keT4KKyAgPHA+VGVzdCBwYXNzZXMgaWYg dGhlcmUgaXMgYSBmaWxsZWQgZ3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25nPm5vIHJlZDwvc3Ryb25n Pi48L3A+CisgIDxkaXY+PC9kaXY+CisgPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9h c3BlY3QtcmF0aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAzNy5odG1sIGIvTGF5b3V0VGVzdHMvaW1w b3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0aW8v YmxvY2stYXNwZWN0LXJhdGlvLTAzNy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMC4uMjZiNzk1YjJhMGJhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9jc3MvY3NzLXNpemluZy9hc3BlY3QtcmF0 aW8vYmxvY2stYXNwZWN0LXJhdGlvLTAzNy5odG1sCkBAIC0wLDAgKzEsNSBAQAorPCFET0NUWVBF IGh0bWw+Cis8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9j c3Mtc2l6aW5nLTQvI2FzcGVjdC1yYXRpbyI+Cis8bGluayByZWw9Im1hdGNoIiBocmVmPSIuLi8u Li9yZWZlcmVuY2UvcmVmLWZpbGxlZC1ncmVlbi0xMDBweC1zcXVhcmUueGh0IiAvPgorPHA+VGVz dCBwYXNzZXMgaWYgdGhlcmUgaXMgYSBmaWxsZWQgZ3JlZW4gc3F1YXJlIGFuZCA8c3Ryb25nPm5v IHJlZDwvc3Ryb25nPi48L3A+Cis8ZGl2IHN0eWxlPSJhc3BlY3QtcmF0aW86IDIvMTsgbWluLWhl aWdodDogMTAwcHg7IHdpZHRoOiAxMDBweDsgYmFja2dyb3VuZDogZ3JlZW47Ij48L2Rpdj4K