238101 2022-03-18 15:28:04 -0700 [IFC][Integration] Rename InlineIterator::Line::blockDirectionPointInLine to contentStartInBlockDirection 2022-03-19 14:11:55 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1852862 0 zalan 2022-03-18 15:28:04 -0700 ssia 1852866 1 455146 zalan 2022-03-18 15:33:41 -0700 Created attachment 455146 [fast-cq]Patch 1852985 2 ews-feeder 2022-03-19 13:25:12 -0700 Committed r291532 (248638@main): <https://commits.webkit.org/248638@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 455146. 1852986 3 webkit-bug-importer 2022-03-19 13:26:18 -0700 <rdar://problem/90527994> 455146 2022-03-18 15:33:41 -0700 2022-03-19 14:11:55 -0700 [fast-cq]Patch bug-238101-20220318153340.patch text/plain 12320 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTUwMzYyNWExOGQ3M2Yy MzBlZGU2MTc4YWUyNDI5ZWQ3YmQxOGY2Mi4uNjQ3MTgxMDJiNmRlMDU0MzgwNWU4NjIyNmQ4ZGZj OTQwZWMyYWQ4OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDIyLTAzLTE4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0g UmVuYW1lIElubGluZUl0ZXJhdG9yOjpMaW5lOjpibG9ja0RpcmVjdGlvblBvaW50SW5MaW5lIHRv IGNvbnRlbnRTdGFydEluQmxvY2tEaXJlY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODEwMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIGJsb2NrRGlyZWN0aW9uUG9pbnRJbkxpbmUgcmV0dXJucyB0 aGUgcG9zaXRpb24gKHZlcnRpY2FsIG9yIGhvcml6b250YWwsIGRlcGVuZGluZyBvbiB0aGUgd3Jp dGluZyBtb2RlKSB3aGVyZSB0aGUgY29udGVudAorICAgICAgICBzdGFydHMgKHdoaWNoIGZvciBm bGlwcGVkIHdyaXRpbmcgbW9kZSBpcyB0aGUgYm90dG9tIG9mIHRoZSBsaW5lKS4KKyAgICAgICAg TGV0J3MgYWxzbyBtb3ZlIHRoaXMgZnVuY3Rpb24gb3V0IG9mIHRoZSBMaW5lIGNsYXNzIGFuZCBo YXZlIGl0IGFzIGEgc3RhbmRhbG9uZSBoZWxwZXIgZnVuY3Rpb24gKGFuZCBtb3ZlL3JlbmFtZSBz b21lIHByaXZhdGUgTGluZQorICAgICAgICBmdW5jdGlvbnMgdG8gcHVibGljKS4KKworICAgICAg ICAqIGVkaXRpbmcvVmlzaWJsZVVuaXRzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmFic29sdXRl TGluZURpcmVjdGlvblBvaW50VG9Mb2NhbFBvaW50SW5CbG9jayk6CisgICAgICAgICogbGF5b3V0 L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJ bmxpbmVJdGVyYXRvcjo6TGluZTo6YmxvY2tEaXJlY3Rpb25Qb2ludEluTGluZSBjb25zdCk6IERl bGV0ZWQuCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZS5o OgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OmNvbnRlbnRTdGFydEluQmxvY2tE aXJlY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmU6OmNvbnRl bnRMb2dpY2FsVG9wQWRqdXN0ZWRGb3JIaXRUZXN0aW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OklubGluZUl0ZXJhdG9yOjpMaW5lOjpjb250ZW50TG9naWNhbFRvcEZvckhpdFRlc3Rpbmcg Y29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVy YXRvckxpbmVMZWdhY3lQYXRoLmg6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6 TGluZUl0ZXJhdG9yTGVnYWN5UGF0aDo6Y29udGVudExvZ2ljYWxUb3BBZGp1c3RlZEZvckhpdFRl c3RpbmcgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lSXRlcmF0b3I6OkxpbmVJdGVy YXRvckxlZ2FjeVBhdGg6OmNvbnRlbnRMb2dpY2FsVG9wRm9ySGl0VGVzdGluZyBjb25zdCk6IERl bGV0ZWQuCisgICAgICAgICogbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZU1v ZGVyblBhdGguaDoKKyAgICAgICAgKFdlYkNvcmU6OklubGluZUl0ZXJhdG9yOjpMaW5lSXRlcmF0 b3JNb2Rlcm5QYXRoOjpjb250ZW50TG9naWNhbFRvcEFkanVzdGVkRm9ySGl0VGVzdGluZyBjb25z dCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVJdGVyYXRvcjo6TGluZUl0ZXJhdG9yTW9kZXJu UGF0aDo6Y29udGVudExvZ2ljYWxUb3BGb3JIaXRUZXN0aW5nIGNvbnN0KTogRGVsZXRlZC4KKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckJsb2NrRmxvdzo6cG9zaXRpb25Gb3JQb2ludFdpdGhJbmxpbmVDaGlsZHJlbik6Cisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclJlcGxhY2VkOjpwb3NpdGlvbkZvclBvaW50KToKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyVGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Ojpwb3NpdGlvbkZv clBvaW50KToKKwogMjAyMi0wMy0xOCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0lGQ11bSW50ZWdyYXRpb25dIFVzZSBhIG1vcmUgZGVzY3JpcHRpdmUgbmFtZSBm b3IgSW5saW5lSXRlcmF0b3I6OkxpbmU6OmVuY2xvc2luZyogZnVuY3Rpb25zCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVVbml0cy5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL1Zpc2libGVVbml0cy5jcHAKaW5kZXggMmM4MDg3MGU2NmRjZDdlYTg3NDQ1OWNl NzMwYTlhNjg3OWY5NDBmMC4uMzZhMzBhYWM0Zjk4NWM1NWQwNjRjOGY0MzhkYjAzMGYxYjAzOTNm MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlVW5pdHMuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVVuaXRzLmNwcApAQCAtOTQyLDkgKzk0 Miw5IEBAIHN0YXRpYyBpbmxpbmUgSW50UG9pbnQgYWJzb2x1dGVMaW5lRGlyZWN0aW9uUG9pbnRU b0xvY2FsUG9pbnRJbkJsb2NrKElubGluZUl0ZXJhCiAgICAgRmxvYXRQb2ludCBhYnNvbHV0ZUJs b2NrUG9pbnQgPSBjb250YWluaW5nQmxvY2subG9jYWxUb0Fic29sdXRlKEZsb2F0UG9pbnQoKSkg LSB0b0Zsb2F0U2l6ZShjb250YWluaW5nQmxvY2suc2Nyb2xsUG9zaXRpb24oKSk7CiAKICAgICBp ZiAoY29udGFpbmluZ0Jsb2NrLmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCi0gICAgICAgIHJl dHVybiBJbnRQb2ludChsaW5lRGlyZWN0aW9uUG9pbnQgLSBhYnNvbHV0ZUJsb2NrUG9pbnQueCgp LCBsaW5lLT5ibG9ja0RpcmVjdGlvblBvaW50SW5MaW5lKCkpOworICAgICAgICByZXR1cm4gSW50 UG9pbnQobGluZURpcmVjdGlvblBvaW50IC0gYWJzb2x1dGVCbG9ja1BvaW50LngoKSwgY29udGVu dFN0YXJ0SW5CbG9ja0RpcmVjdGlvbigqbGluZSkpOwogCi0gICAgcmV0dXJuIEludFBvaW50KGxp bmUtPmJsb2NrRGlyZWN0aW9uUG9pbnRJbkxpbmUoKSwgbGluZURpcmVjdGlvblBvaW50IC0gYWJz b2x1dGVCbG9ja1BvaW50LnkoKSk7CisgICAgcmV0dXJuIEludFBvaW50KGNvbnRlbnRTdGFydElu QmxvY2tEaXJlY3Rpb24oKmxpbmUpLCBsaW5lRGlyZWN0aW9uUG9pbnQgLSBhYnNvbHV0ZUJsb2Nr UG9pbnQueSgpKTsKIH0KIAogc3RhdGljIEVsZW1lbnQqIHJvb3RFZGl0YWJsZU9yRG9jdW1lbnRF bGVtZW50KE5vZGUmIG5vZGUsIEVkaXRhYmxlVHlwZSBlZGl0YWJsZVR5cGUpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmUu Y3BwCmluZGV4IGUxNmMwNmVlMzU2YzViNzZlNjIxOTY4NDUzNzk5NzI5ZDlmNGZlYTguLjM0YjY5 ZWVhMjk3M2RhZjljZDBkNjAyYTNjYmI0NWY0MDIwYTViYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmUuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9JbmxpbmVJdGVyYXRvckxpbmUuY3BwCkBA IC0xNTcsMTEgKzE1Nyw2IEBAIExlYWZCb3hJdGVyYXRvciBMaW5lOjpjbG9zZXN0Qm94Rm9yTG9n aWNhbExlZnRQb3NpdGlvbihpbnQgbGVmdFBvc2l0aW9uLCBib29sIGVkCiAgICAgcmV0dXJuIGNs b3Nlc3RCb3g7CiB9CiAKLWludCBMaW5lOjpibG9ja0RpcmVjdGlvblBvaW50SW5MaW5lKCkgY29u c3QKLXsKLSAgICByZXR1cm4gIWNvbnRhaW5pbmdCbG9jaygpLnN0eWxlKCkuaXNGbGlwcGVkQmxv Y2tzV3JpdGluZ01vZGUoKSA/IHN0ZDo6bWF4KGNvbnRlbnRMb2dpY2FsVG9wKCksIGNvbnRlbnRM b2dpY2FsVG9wRm9ySGl0VGVzdGluZygpKSA6IHN0ZDo6bWluKGNvbnRlbnRMb2dpY2FsQm90dG9t KCksIGNvbnRlbnRMb2dpY2FsQm90dG9tQWRqdXN0ZWRGb3JGb2xsb3dpbmdMaW5lKCkpOwotfQot CiB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9J bmxpbmVJdGVyYXRvckxpbmUuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9J bmxpbmVJdGVyYXRvckxpbmUuaAppbmRleCBlYzEyYjgyZGM5NTZkZTY0NjRmNTYwYWMwMTc4ZWY1 ODhkMzUxYmQ0Li45NTYyMjRhY2RjZWRlZTBhYzgwNzFjNzdiZWMzMjFiM2Y2ODFhZDNjIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JM aW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJh dG9yTGluZS5oCkBAIC02NSw5ICs2NSw5IEBAIHB1YmxpYzoKICAgICBmbG9hdCBjb250ZW50TG9n aWNhbFJpZ2h0KCkgY29uc3Q7CiAgICAgZmxvYXQgY29udGVudExvZ2ljYWxXaWR0aCgpIGNvbnN0 OwogCi0gICAgTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFRvcEZvckhpdFRlc3RpbmcoKSBjb25z dDsKLQotICAgIGludCBibG9ja0RpcmVjdGlvblBvaW50SW5MaW5lKCkgY29uc3Q7CisgICAgTGF5 b3V0VW5pdCBjb250ZW50TG9naWNhbFRvcEFkanVzdGVkRm9ySGl0VGVzdGluZygpIGNvbnN0Owor ICAgIExheW91dFVuaXQgY29udGVudExvZ2ljYWxUb3BBZGp1c3RlZEZvclByZWNlZGluZ0xpbmUo KSBjb25zdDsKKyAgICBMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsQm90dG9tQWRqdXN0ZWRGb3JG b2xsb3dpbmdMaW5lKCkgY29uc3Q7CiAKICAgICBib29sIGlzSG9yaXpvbnRhbCgpIGNvbnN0Owog CkBAIC05MiwxMSArOTIsNiBAQCBwdWJsaWM6CiAgICAgCiBwcml2YXRlOgogICAgIGZyaWVuZCBj bGFzcyBMaW5lSXRlcmF0b3I7Ci0gICAgLy8gRklYTUU6IFRoaXMgaXMgdGVtcG9yYXJ5LgotICAg IGZyaWVuZCBjbGFzcyBXZWJDb3JlOjpMaW5lU2VsZWN0aW9uOwotCi0gICAgTGF5b3V0VW5pdCBj b250ZW50TG9naWNhbFRvcEFkanVzdGVkRm9yUHJlY2VkaW5nTGluZSgpIGNvbnN0OwotICAgIExh eW91dFVuaXQgY29udGVudExvZ2ljYWxCb3R0b21BZGp1c3RlZEZvckZvbGxvd2luZ0xpbmUoKSBj b25zdDsKIAogICAgIFBhdGhWYXJpYW50IG1fcGF0aFZhcmlhbnQ7CiB9OwpAQCAtMTMzLDYgKzEy OCwxMiBAQCBMaW5lSXRlcmF0b3IgZmlyc3RMaW5lRm9yKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYp OwogTGluZUl0ZXJhdG9yIGxhc3RMaW5lRm9yKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYpOwogCiAv LyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQoraW5saW5l IExheW91dFVuaXQgY29udGVudFN0YXJ0SW5CbG9ja0RpcmVjdGlvbihjb25zdCBMaW5lJiBsaW5l KQoreworICAgIGlmICghbGluZS5jb250YWluaW5nQmxvY2soKS5zdHlsZSgpLmlzRmxpcHBlZEJs b2Nrc1dyaXRpbmdNb2RlKCkpCisgICAgICAgIHJldHVybiBzdGQ6Om1heChsaW5lLmNvbnRlbnRM b2dpY2FsVG9wKCksIGxpbmUuY29udGVudExvZ2ljYWxUb3BBZGp1c3RlZEZvckhpdFRlc3Rpbmco KSk7CisgICAgcmV0dXJuIHN0ZDo6bWluKGxpbmUuY29udGVudExvZ2ljYWxCb3R0b20oKSwgbGlu ZS5jb250ZW50TG9naWNhbEJvdHRvbUFkanVzdGVkRm9yRm9sbG93aW5nTGluZSgpKTsKK30KIAog aW5saW5lIExpbmU6OkxpbmUoUGF0aFZhcmlhbnQmJiBwYXRoKQogICAgIDogbV9wYXRoVmFyaWFu dChXVEZNb3ZlKHBhdGgpKQpAQCAtMTYwLDEwICsxNjEsMTAgQEAgaW5saW5lIExheW91dFVuaXQg TGluZTo6Y29udGVudExvZ2ljYWxUb3BBZGp1c3RlZEZvclByZWNlZGluZ0xpbmUoKSBjb25zdAog ICAgIH0pOwogfQogCi1pbmxpbmUgTGF5b3V0VW5pdCBMaW5lOjpjb250ZW50TG9naWNhbFRvcEZv ckhpdFRlc3RpbmcoKSBjb25zdAoraW5saW5lIExheW91dFVuaXQgTGluZTo6Y29udGVudExvZ2lj YWxUb3BBZGp1c3RlZEZvckhpdFRlc3RpbmcoKSBjb25zdAogewogICAgIHJldHVybiBXVEY6OnN3 aXRjaE9uKG1fcGF0aFZhcmlhbnQsIFtdKGNvbnN0IGF1dG8mIHBhdGgpIHsKLSAgICAgICAgcmV0 dXJuIHBhdGguY29udGVudExvZ2ljYWxUb3BGb3JIaXRUZXN0aW5nKCk7CisgICAgICAgIHJldHVy biBwYXRoLmNvbnRlbnRMb2dpY2FsVG9wQWRqdXN0ZWRGb3JIaXRUZXN0aW5nKCk7CiAgICAgfSk7 CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9Jbmxp bmVJdGVyYXRvckxpbmVMZWdhY3lQYXRoLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdy YXRpb24vSW5saW5lSXRlcmF0b3JMaW5lTGVnYWN5UGF0aC5oCmluZGV4IGIxY2M4N2ZkM2E5YzU3 ZTdmZjM1NGY1MjhmZTJhYjc3Y2FkYjFlY2UuLmZjM2Y0ZjQyMzIyMDg3MTQ2NGRhMWU2YWJiYThi ZGNhY2M2ZTk5ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlv bi9JbmxpbmVJdGVyYXRvckxpbmVMZWdhY3lQYXRoLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJhdG9yTGluZUxlZ2FjeVBhdGguaApAQCAtNDYsNyAr NDYsNyBAQCBwdWJsaWM6CiAgICAgTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFRvcCgpIGNvbnN0 IHsgcmV0dXJuIG1fcm9vdElubGluZUJveC0+bGluZVRvcCgpOyB9CiAgICAgTGF5b3V0VW5pdCBj b250ZW50TG9naWNhbEJvdHRvbSgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdElubGluZUJveC0+bGlu ZUJvdHRvbSgpOyB9CiAgICAgTGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFRvcEFkanVzdGVkRm9y UHJlY2VkaW5nTGluZSgpIGNvbnN0IHsgcmV0dXJuIG1fcm9vdElubGluZUJveC0+c2VsZWN0aW9u VG9wKCk7IH0KLSAgICBMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsVG9wRm9ySGl0VGVzdGluZygp IGNvbnN0IHsgcmV0dXJuIG1fcm9vdElubGluZUJveC0+c2VsZWN0aW9uVG9wKExlZ2FjeVJvb3RJ bmxpbmVCb3g6OkZvckhpdFRlc3Rpbmc6Olllcyk7IH0KKyAgICBMYXlvdXRVbml0IGNvbnRlbnRM b2dpY2FsVG9wQWRqdXN0ZWRGb3JIaXRUZXN0aW5nKCkgY29uc3QgeyByZXR1cm4gbV9yb290SW5s aW5lQm94LT5zZWxlY3Rpb25Ub3AoTGVnYWN5Um9vdElubGluZUJveDo6Rm9ySGl0VGVzdGluZzo6 WWVzKTsgfQogICAgIExheW91dFVuaXQgY29udGVudExvZ2ljYWxCb3R0b21BZGp1c3RlZEZvckZv bGxvd2luZ0xpbmUoKSBjb25zdCB7IHJldHVybiBtX3Jvb3RJbmxpbmVCb3gtPnNlbGVjdGlvbkJv dHRvbSgpOyB9CiAgICAgTGF5b3V0VW5pdCBsaW5lQm94VG9wKCkgY29uc3QgeyByZXR1cm4gbV9y b290SW5saW5lQm94LT5saW5lQm94VG9wKCk7IH0KICAgICBMYXlvdXRVbml0IGxpbmVCb3hCb3R0 b20oKSBjb25zdCB7IHJldHVybiBtX3Jvb3RJbmxpbmVCb3gtPmxpbmVCb3hCb3R0b20oKTsgfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGluZUl0ZXJh dG9yTGluZU1vZGVyblBhdGguaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9J bmxpbmVJdGVyYXRvckxpbmVNb2Rlcm5QYXRoLmgKaW5kZXggODA2YmJkZDM4NWFlMDBlYmNlOGNm M2NkNTYyZDM2NzRhYWZhYjIzMy4uNWRiMmMzYmYwM2I1OWI0NzgwYmNjNDQ1MjdlMDY2YzE0MWYw ZThjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0lubGlu ZUl0ZXJhdG9yTGluZU1vZGVyblBhdGguaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50 ZWdyYXRpb24vSW5saW5lSXRlcmF0b3JMaW5lTW9kZXJuUGF0aC5oCkBAIC01OCw3ICs1OCw3IEBA IHB1YmxpYzoKICAgICAvLyBGSVhNRTogUmVtb3ZlIHRoZSBjb250YWluaW5nQmxvY2soKS5ib3Jk ZXJBbmRQYWRkaW5nQmVmb3JlKCkgb2Zmc2V0IGFmdGVyIHJldGlyaW5nIGxlZ2FjeSBsaW5lIGxh eW91dC4gSXQgYWxzbyByZXF1aXJlcyBjaGFuZ2VzIGluIFJlbmRlclRleHQ6OnBvc2l0aW9uRm9y UG9pbnQgdG8gZmluZCB0aGUgZmlyc3QgbGluZSB3aXRoIG9mZnNldC4KICAgICAvLyAtIHRoZSAi YmVmb3JlIiB2YWx1ZSBpcyBhbHJlYWR5IGZhY3RvcmVkIGluIHRvIHRoZSBsaW5lIG9mZnNldAog ICAgIC8vIC0gdGhpcyBsb2dpYyBuZWdhdGVzIHRoZSBmaXJzdCBsaW5lJ3MgbmF0dXJhbCBvZmZz ZXQgKGUuZy4gYmxvY2sgaGFzIG5vIGJvcmRlci9wYWRkaW5nIGJ1dCB0aGUgZmlyc3QgbGluZSBo YXMgYSBjb21wdXRlZCBvZmZzZXQpLgotICAgIExheW91dFVuaXQgY29udGVudExvZ2ljYWxUb3BG b3JIaXRUZXN0aW5nKCkgY29uc3QgeyByZXR1cm4gIW1fbGluZUluZGV4ID8gY29udGFpbmluZ0Js b2NrKCkuYm9yZGVyQW5kUGFkZGluZ0JlZm9yZSgpIDogY29udGVudExvZ2ljYWxUb3BBZGp1c3Rl ZEZvclByZWNlZGluZ0xpbmUoKTsgfTsKKyAgICBMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsVG9w QWRqdXN0ZWRGb3JIaXRUZXN0aW5nKCkgY29uc3QgeyByZXR1cm4gIW1fbGluZUluZGV4ID8gY29u dGFpbmluZ0Jsb2NrKCkuYm9yZGVyQW5kUGFkZGluZ0JlZm9yZSgpIDogY29udGVudExvZ2ljYWxU b3BBZGp1c3RlZEZvclByZWNlZGluZ0xpbmUoKTsgfTsKICAgICAvLyBGSVhNRTogSW1wbGVtZW50 LgogICAgIExheW91dFVuaXQgY29udGVudExvZ2ljYWxCb3R0b21BZGp1c3RlZEZvckZvbGxvd2lu Z0xpbmUoKSBjb25zdCB7IHJldHVybiBjb250ZW50TG9naWNhbEJvdHRvbSgpOyB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0Zsb3cuY3BwIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHAKaW5kZXggY2YwMGI4YzI5 YTYwYzM0ZTdlNGY3ODg2Y2Q1ZjE5ODE3MmU0NDJkNS4uNWM3ODZkZDFlMzlkMDNhNTczNmRhZjA2 ZDEyMDhmNGY3NzA2NDI0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrRmxvdy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrRmxvdy5jcHAKQEAgLTM0MjEsNyArMzQyMSw3IEBAIFZpc2libGVQb3NpdGlvbiBSZW5kZXJC bG9ja0Zsb3c6OnBvc2l0aW9uRm9yUG9pbnRXaXRoSW5saW5lQ2hpbGRyZW4oY29uc3QgTGF5b3V0 CiAKICAgICBpZiAoY2xvc2VzdEJveCkgewogICAgICAgICBpZiAobW92ZUNhcmV0VG9Cb3VuZGFy eSkgewotICAgICAgICAgICAgTGF5b3V0VW5pdCBmaXJzdExpbmVXaXRoQ2hpbGRyZW5Ub3AgPSBz dGQ6Om1pbihmaXJzdExpbmVXaXRoQ2hpbGRyZW4tPmNvbnRlbnRMb2dpY2FsVG9wRm9ySGl0VGVz dGluZygpLCBMYXlvdXRVbml0KGZpcnN0TGluZVdpdGhDaGlsZHJlbi0+Y29udGVudExvZ2ljYWxU b3AoKSkpOworICAgICAgICAgICAgTGF5b3V0VW5pdCBmaXJzdExpbmVXaXRoQ2hpbGRyZW5Ub3Ag PSBzdGQ6Om1pbihmaXJzdExpbmVXaXRoQ2hpbGRyZW4tPmNvbnRlbnRMb2dpY2FsVG9wQWRqdXN0 ZWRGb3JIaXRUZXN0aW5nKCksIExheW91dFVuaXQoZmlyc3RMaW5lV2l0aENoaWxkcmVuLT5jb250 ZW50TG9naWNhbFRvcCgpKSk7CiAgICAgICAgICAgICBpZiAocG9pbnRJbkxvZ2ljYWxDb250ZW50 cy55KCkgPCBmaXJzdExpbmVXaXRoQ2hpbGRyZW5Ub3AKICAgICAgICAgICAgICAgICB8fCAoYmxv Y2tzQXJlRmxpcHBlZCAmJiBwb2ludEluTG9naWNhbENvbnRlbnRzLnkoKSA9PSBmaXJzdExpbmVX aXRoQ2hpbGRyZW5Ub3ApKSB7CiAgICAgICAgICAgICAgICAgYXV0byBib3ggPSBmaXJzdExpbmVX aXRoQ2hpbGRyZW4tPmZpcnN0TGVhZkJveCgpOwpAQCAtMzQzNSw3ICszNDM1LDcgQEAgVmlzaWJs ZVBvc2l0aW9uIFJlbmRlckJsb2NrRmxvdzo6cG9zaXRpb25Gb3JQb2ludFdpdGhJbmxpbmVDaGls ZHJlbihjb25zdCBMYXlvdXQKICAgICAgICAgfQogCiAgICAgICAgIC8vIHBhc3MgdGhlIGJveCBh IHRvcCBwb3NpdGlvbiB0aGF0IGlzIGluc2lkZSBpdAotICAgICAgICBMYXlvdXRQb2ludCBwb2lu dChwb2ludEluTG9naWNhbENvbnRlbnRzLngoKSwgY2xvc2VzdEJveC0+bGluZSgpLT5ibG9ja0Rp cmVjdGlvblBvaW50SW5MaW5lKCkpOworICAgICAgICBhdXRvIHBvaW50ID0gTGF5b3V0UG9pbnQg eyBwb2ludEluTG9naWNhbENvbnRlbnRzLngoKSwgY29udGVudFN0YXJ0SW5CbG9ja0RpcmVjdGlv bigqY2xvc2VzdEJveC0+bGluZSgpKSB9OwogICAgICAgICBpZiAoIWlzSG9yaXpvbnRhbFdyaXRp bmdNb2RlKCkpCiAgICAgICAgICAgICBwb2ludCA9IHBvaW50LnRyYW5zcG9zZWRQb2ludCgpOwog ICAgICAgICBpZiAoY2xvc2VzdEJveC0+cmVuZGVyZXIoKS5pc1JlcGxhY2VkT3JJbmxpbmVCbG9j aygpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlcGxhY2Vk LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZXBsYWNlZC5jcHAKaW5kZXgg ZWE4NTc0YmU1NDNkZmRiZDc2ZGQ0NTI5MmRmY2UyM2Q2NmFkYjU3My4uNTM2NjJmZGYwYTc4YWFh MjA2NzkzN2MxNTdiNTExODQ2ZDY5MzY3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclJlcGxhY2VkLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyUmVwbGFjZWQuY3BwCkBAIC03MjIsNyArNzIyLDcgQEAgVmlzaWJsZVBvc2l0aW9uIFJl bmRlclJlcGxhY2VkOjpwb3NpdGlvbkZvclBvaW50KGNvbnN0IExheW91dFBvaW50JiBwb2ludCwg Y29uc3QKICAgICBhdXRvIFt0b3AsIGJvdHRvbV0gPSBbJl0gewogICAgICAgICBpZiAoYXV0byBy dW4gPSBJbmxpbmVJdGVyYXRvcjo6Ym94Rm9yKCp0aGlzKSkgewogICAgICAgICAgICAgYXV0byBs aW5lID0gcnVuLT5saW5lKCk7Ci0gICAgICAgICAgICByZXR1cm4gc3RkOjptYWtlX3BhaXIobGlu ZS0+Y29udGVudExvZ2ljYWxUb3BGb3JIaXRUZXN0aW5nKCksIExpbmVTZWxlY3Rpb246OmxvZ2lj YWxCb3R0b20oKmxpbmUpKTsKKyAgICAgICAgICAgIHJldHVybiBzdGQ6Om1ha2VfcGFpcihsaW5l LT5jb250ZW50TG9naWNhbFRvcEFkanVzdGVkRm9ySGl0VGVzdGluZygpLCBMaW5lU2VsZWN0aW9u Ojpsb2dpY2FsQm90dG9tKCpsaW5lKSk7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHN0ZDo6 bWFrZV9wYWlyKGxvZ2ljYWxUb3AoKSwgbG9naWNhbEJvdHRvbSgpKTsKICAgICB9KCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAKaW5kZXggMTE2M2E2ZjkwNDdhYTVkYjc2 N2NlYzFjOWY4ZDlkMzI0NTY5NjM4Zi4uZTljYTE3YjU2OGU3NWRlNDA1OTdkZDk5Y2EyMWZlNGE0 MjY5ZGVhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcApAQCAtNjc0 LDcgKzY3NCw3IEBAIFZpc2libGVQb3NpdGlvbiBSZW5kZXJUZXh0Ojpwb3NpdGlvbkZvclBvaW50 KGNvbnN0IExheW91dFBvaW50JiBwb2ludCwgY29uc3QgUmVuCiAgICAgICAgICAgICBydW4udHJh dmVyc2VOZXh0VGV4dEJveCgpOwogCiAgICAgICAgIGF1dG8gbGluZSA9IHJ1bi0+bGluZSgpOwot ICAgICAgICBhdXRvIHRvcCA9IHN0ZDo6bWluKGxpbmUtPmNvbnRlbnRMb2dpY2FsVG9wRm9ySGl0 VGVzdGluZygpLCBsaW5lLT5jb250ZW50TG9naWNhbFRvcCgpKTsKKyAgICAgICAgYXV0byB0b3Ag PSBzdGQ6Om1pbihsaW5lLT5jb250ZW50TG9naWNhbFRvcEFkanVzdGVkRm9ySGl0VGVzdGluZygp LCBsaW5lLT5jb250ZW50TG9naWNhbFRvcCgpKTsKICAgICAgICAgaWYgKHBvaW50QmxvY2tEaXJl Y3Rpb24gPiB0b3AgfHwgKCFibG9ja3NBcmVGbGlwcGVkICYmIHBvaW50QmxvY2tEaXJlY3Rpb24g PT0gdG9wKSkgewogICAgICAgICAgICAgYXV0byBib3R0b20gPSBMaW5lU2VsZWN0aW9uOjpsb2dp Y2FsQm90dG9tKCpsaW5lKTsKICAgICAgICAgICAgIGlmIChhdXRvIG5leHRMaW5lID0gbGluZS0+ bmV4dCgpKQo=