47306 2010-10-06 14:57:20 -0700 Convert determineStart/EndPosition and matchedEndLine to be writing-mode-aware. 2010-10-06 16:54:43 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 46123 1 hyatt hyatt abarth eric webkit.review.bot oldest_to_newest 290597 0 hyatt 2010-10-06 14:57:20 -0700 Convert determineStart/EndPosition and matchedEndLine to be writing-mode-aware. 290598 1 69996 hyatt 2010-10-06 14:58:08 -0700 Created attachment 69996 Patch 290607 2 hyatt 2010-10-06 15:13:46 -0700 Fixed in r69239. 290685 3 webkit.review.bot 2010-10-06 16:54:43 -0700 http://trac.webkit.org/changeset/69239 might have broken Chromium Win Release 69996 2010-10-06 14:58:08 -0700 2010-10-06 15:09:14 -0700 Patch patch.txt text/plain 9602 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2OTIzNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMTAtMDYgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzMwNgorICAgICAgICAKKyAgICAg ICAgQ29udmVydCBkZXRlcm1pbmVTdGFydC9FbmRQb3NpdGlvbiBhbmQgbWF0Y2hlZEVuZExpbmUg dG8gYmUgd3JpdGluZy1tb2RlLWF3YXJlLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJs b2NrTGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6ZGV0ZXJt aW5lU3RhcnRQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6ZGV0ZXJt aW5lRW5kUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6Om1hdGNoZWRF bmRMaW5lKToKKwogMjAxMC0xMC0wNiAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KSW5kZXg6IFdlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAkocmV2aXNpb24gNjkyMzUpCisrKyBXZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC05MTAsNyArOTEwLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6bGF5b3V0SW5saW5lQ2hpbGRyZW4o YgogCiBSb290SW5saW5lQm94KiBSZW5kZXJCbG9jazo6ZGV0ZXJtaW5lU3RhcnRQb3NpdGlvbihi b29sJiBmaXJzdExpbmUsIGJvb2wmIGZ1bGxMYXlvdXQsIGJvb2wmIHByZXZpb3VzTGluZUJyb2tl Q2xlYW5seSwgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBJbmxpbmVCaWRpUmVzb2x2ZXImIHJlc29sdmVyLCBWZWN0b3I8RmxvYXRXaXRoUmVjdD4m IGZsb2F0cywgdW5zaWduZWQmIG51bUNsZWFuRmxvYXRzLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCYgdXNlUmVwYWludEJvdW5kcywgaW50 JiByZXBhaW50VG9wLCBpbnQmIHJlcGFpbnRCb3R0b20pCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sJiB1c2VSZXBhaW50Qm91bmRzLCBpbnQm IHJlcGFpbnRMb2dpY2FsVG9wLCBpbnQmIHJlcGFpbnRMb2dpY2FsQm90dG9tKQogewogICAgIFJv b3RJbmxpbmVCb3gqIGN1cnIgPSAwOwogICAgIFJvb3RJbmxpbmVCb3gqIGxhc3QgPSAwOwpAQCAt OTM1LDggKzkzNSw4IEBAIFJvb3RJbmxpbmVCb3gqIFJlbmRlckJsb2NrOjpkZXRlcm1pbmVTdGEK ICAgICAgICAgICAgICAgICAgICAgaWYgKCF1c2VSZXBhaW50Qm91bmRzKQogICAgICAgICAgICAg ICAgICAgICAgICAgdXNlUmVwYWludEJvdW5kcyA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAg ICAgICAKLSAgICAgICAgICAgICAgICAgICAgcmVwYWludFRvcCA9IG1pbihyZXBhaW50VG9wLCBj dXJyLT50b3BWaXNpYmxlT3ZlcmZsb3coKSArIG1pbihwYWdpbmF0aW9uRGVsdGEsIDApKTsKLSAg ICAgICAgICAgICAgICAgICAgcmVwYWludEJvdHRvbSA9IG1heChyZXBhaW50Qm90dG9tLCBjdXJy LT5ib3R0b21WaXNpYmxlT3ZlcmZsb3coKSArIG1heChwYWdpbmF0aW9uRGVsdGEsIDApKTsKKyAg ICAgICAgICAgICAgICAgICAgcmVwYWludExvZ2ljYWxUb3AgPSBtaW4ocmVwYWludExvZ2ljYWxU b3AsIGJlZm9yZVNpZGVWaXNpYmxlT3ZlcmZsb3dGb3JMaW5lKGN1cnIpICsgbWluKHBhZ2luYXRp b25EZWx0YSwgMCkpOworICAgICAgICAgICAgICAgICAgICByZXBhaW50TG9naWNhbEJvdHRvbSA9 IG1heChyZXBhaW50TG9naWNhbEJvdHRvbSwgYWZ0ZXJTaWRlVmlzaWJsZU92ZXJmbG93Rm9yTGlu ZShjdXJyKSArIG1heChwYWdpbmF0aW9uRGVsdGEsIDApKTsKICAgICAgICAgICAgICAgICAgICAg Y3Vyci0+YWRqdXN0UG9zaXRpb24oMCwgcGFnaW5hdGlvbkRlbHRhKTsKICAgICAgICAgICAgICAg ICB9ICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgfQpAQCAtOTU1LDkgKzk1NSwxMSBAQCBS b290SW5saW5lQm94KiBSZW5kZXJCbG9jazo6ZGV0ZXJtaW5lU3RhCiAgICAgICAgICAgICAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAg ICBpZiAoZmxvYXRzW2Zsb2F0SW5kZXhdLnJlY3Quc2l6ZSgpICE9IG5ld1NpemUpIHsKLSAgICAg ICAgICAgICAgICAgICAgICAgIGludCBmbG9hdFRvcCA9IGZsb2F0c1tmbG9hdEluZGV4XS5yZWN0 LnkoKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGludCBmbG9hdFRvcCA9IHN0eWxlKCktPmlz SG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBmbG9hdHNbZmxvYXRJbmRleF0ucmVjdC55KCkgOiBm bG9hdHNbZmxvYXRJbmRleF0ucmVjdC54KCk7CisgICAgICAgICAgICAgICAgICAgICAgICBpbnQg ZmxvYXRIZWlnaHQgPSBzdHlsZSgpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gbWF4KGZs b2F0c1tmbG9hdEluZGV4XS5yZWN0LmhlaWdodCgpLCBuZXdTaXplLmhlaWdodCgpKSAKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgOiBtYXgoZmxvYXRzW2Zsb2F0SW5kZXhdLnJlY3Qud2lkdGgoKSwgbmV3 U2l6ZS53aWR0aCgpKTsKICAgICAgICAgICAgICAgICAgICAgICAgIGN1cnItPm1hcmtEaXJ0eSgp OwotICAgICAgICAgICAgICAgICAgICAgICAgbWFya0xpbmVzRGlydHlJbkJsb2NrUmFuZ2UoY3Vy ci0+YmxvY2tMb2dpY2FsSGVpZ2h0KCksIGZsb2F0VG9wICsgbWF4KGZsb2F0c1tmbG9hdEluZGV4 XS5yZWN0LmhlaWdodCgpLCBuZXdTaXplLmhlaWdodCgpKSwgY3Vycik7CisgICAgICAgICAgICAg ICAgICAgICAgICBtYXJrTGluZXNEaXJ0eUluQmxvY2tSYW5nZShjdXJyLT5ibG9ja0xvZ2ljYWxI ZWlnaHQoKSwgZmxvYXRUb3AgKyBmbG9hdEhlaWdodCwgY3Vycik7CiAgICAgICAgICAgICAgICAg ICAgICAgICBmbG9hdHNbZmxvYXRJbmRleF0ucmVjdC5zZXRTaXplKG5ld1NpemUpOwogICAgICAg ICAgICAgICAgICAgICAgICAgZGlydGllZEJ5RmxvYXQgPSB0cnVlOwogICAgICAgICAgICAgICAg ICAgICB9CkBAIC0xMDA3LDcgKzEwMDksNyBAQCBSb290SW5saW5lQm94KiBSZW5kZXJCbG9jazo6 ZGV0ZXJtaW5lU3RhCiAKICAgICBudW1DbGVhbkZsb2F0cyA9IDA7CiAgICAgaWYgKCFmbG9hdHMu aXNFbXB0eSgpKSB7Ci0gICAgICAgIGludCBzYXZlZEhlaWdodCA9IGhlaWdodCgpOworICAgICAg ICBpbnQgc2F2ZWRMb2dpY2FsSGVpZ2h0ID0gbG9naWNhbEhlaWdodCgpOwogICAgICAgICAvLyBS ZXN0b3JlIGZsb2F0cyBmcm9tIGNsZWFuIGxpbmVzLgogICAgICAgICBSb290SW5saW5lQm94KiBs aW5lID0gZmlyc3RSb290Qm94KCk7CiAgICAgICAgIHdoaWxlIChsaW5lICE9IGN1cnIpIHsKQEAg LTEwMTUsNyArMTAxNyw3IEBAIFJvb3RJbmxpbmVCb3gqIFJlbmRlckJsb2NrOjpkZXRlcm1pbmVT dGEKICAgICAgICAgICAgICAgICBWZWN0b3I8UmVuZGVyQm94Kj46Oml0ZXJhdG9yIGVuZCA9IGNs ZWFuTGluZUZsb2F0cy0+ZW5kKCk7CiAgICAgICAgICAgICAgICAgZm9yIChWZWN0b3I8UmVuZGVy Qm94Kj46Oml0ZXJhdG9yIGYgPSBjbGVhbkxpbmVGbG9hdHMtPmJlZ2luKCk7IGYgIT0gZW5kOyAr K2YpIHsKICAgICAgICAgICAgICAgICAgICAgaW5zZXJ0RmxvYXRpbmdPYmplY3QoKmYpOwotICAg ICAgICAgICAgICAgICAgICBzZXRMb2dpY2FsSGVpZ2h0KCgqZiktPnkoKSAtICgqZiktPm1hcmdp blRvcCgpKTsKKyAgICAgICAgICAgICAgICAgICAgc2V0TG9naWNhbEhlaWdodChsb2dpY2FsVG9w Rm9yQ2hpbGQoKmYpIC0gbWFyZ2luQmVmb3JlRm9yQ2hpbGQoKmYpKTsKICAgICAgICAgICAgICAg ICAgICAgcG9zaXRpb25OZXdGbG9hdHMoKTsKICAgICAgICAgICAgICAgICAgICAgQVNTRVJUKGZs b2F0c1tudW1DbGVhbkZsb2F0c10ub2JqZWN0ID09ICpmKTsKICAgICAgICAgICAgICAgICAgICAg bnVtQ2xlYW5GbG9hdHMrKzsKQEAgLTEwMjMsNyArMTAyNSw3IEBAIFJvb3RJbmxpbmVCb3gqIFJl bmRlckJsb2NrOjpkZXRlcm1pbmVTdGEKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGxpbmUg PSBsaW5lLT5uZXh0Um9vdEJveCgpOwogICAgICAgICB9Ci0gICAgICAgIHNldExvZ2ljYWxIZWln aHQoc2F2ZWRIZWlnaHQpOworICAgICAgICBzZXRMb2dpY2FsSGVpZ2h0KHNhdmVkTG9naWNhbEhl aWdodCk7CiAgICAgfQogCiAgICAgZmlyc3RMaW5lID0gIWxhc3Q7CkBAIC0xMDU3LDcgKzEwNTks NyBAQCBSb290SW5saW5lQm94KiBSZW5kZXJCbG9jazo6ZGV0ZXJtaW5lU3RhCiAgICAgcmV0dXJu IGN1cnI7CiB9CiAKLVJvb3RJbmxpbmVCb3gqIFJlbmRlckJsb2NrOjpkZXRlcm1pbmVFbmRQb3Np dGlvbihSb290SW5saW5lQm94KiBzdGFydExpbmUsIElubGluZUl0ZXJhdG9yJiBjbGVhbkxpbmVT dGFydCwgQmlkaVN0YXR1cyYgY2xlYW5MaW5lQmlkaVN0YXR1cywgaW50JiB5UG9zKQorUm9vdElu bGluZUJveCogUmVuZGVyQmxvY2s6OmRldGVybWluZUVuZFBvc2l0aW9uKFJvb3RJbmxpbmVCb3gq IHN0YXJ0TGluZSwgSW5saW5lSXRlcmF0b3ImIGNsZWFuTGluZVN0YXJ0LCBCaWRpU3RhdHVzJiBj bGVhbkxpbmVCaWRpU3RhdHVzLCBpbnQmIGxvZ2ljYWxUb3ApCiB7CiAgICAgUm9vdElubGluZUJv eCogbGFzdCA9IDA7CiAgICAgaWYgKCFzdGFydExpbmUpCkBAIC0xMDc3LDcgKzEwNzksNyBAQCBS b290SW5saW5lQm94KiBSZW5kZXJCbG9jazo6ZGV0ZXJtaW5lRW5kCiAgICAgUm9vdElubGluZUJv eCogcHJldiA9IGxhc3QtPnByZXZSb290Qm94KCk7CiAgICAgY2xlYW5MaW5lU3RhcnQgPSBJbmxp bmVJdGVyYXRvcih0aGlzLCBwcmV2LT5saW5lQnJlYWtPYmooKSwgcHJldi0+bGluZUJyZWFrUG9z KCkpOwogICAgIGNsZWFuTGluZUJpZGlTdGF0dXMgPSBwcmV2LT5saW5lQnJlYWtCaWRpU3RhdHVz KCk7Ci0gICAgeVBvcyA9IHByZXYtPmJsb2NrTG9naWNhbEhlaWdodCgpOworICAgIGxvZ2ljYWxU b3AgPSBwcmV2LT5ibG9ja0xvZ2ljYWxIZWlnaHQoKTsKIAogICAgIGZvciAoUm9vdElubGluZUJv eCogbGluZSA9IGxhc3Q7IGxpbmU7IGxpbmUgPSBsaW5lLT5uZXh0Um9vdEJveCgpKQogICAgICAg ICBsaW5lLT5leHRyYWN0TGluZSgpOyAvLyBEaXNjb25uZWN0IGFsbCBsaW5lIGJveGVzIGZyb20g dGhlaXIgcmVuZGVyIG9iamVjdHMgd2hpbGUgcHJlc2VydmluZwpAQCAtMTA4NiwyNyArMTA4OCwy OCBAQCBSb290SW5saW5lQm94KiBSZW5kZXJCbG9jazo6ZGV0ZXJtaW5lRW5kCiAgICAgcmV0dXJu IGxhc3Q7CiB9CiAKLWJvb2wgUmVuZGVyQmxvY2s6Om1hdGNoZWRFbmRMaW5lKGNvbnN0IElubGlu ZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIsIGNvbnN0IElubGluZUl0ZXJhdG9yJiBlbmRMaW5lU3Rh cnQsIGNvbnN0IEJpZGlTdGF0dXMmIGVuZExpbmVTdGF0dXMsIFJvb3RJbmxpbmVCb3gqJiBlbmRM aW5lLCBpbnQmIGVuZFlQb3MsIGludCYgcmVwYWludEJvdHRvbSwgaW50JiByZXBhaW50VG9wKQor Ym9vbCBSZW5kZXJCbG9jazo6bWF0Y2hlZEVuZExpbmUoY29uc3QgSW5saW5lQmlkaVJlc29sdmVy JiByZXNvbHZlciwgY29uc3QgSW5saW5lSXRlcmF0b3ImIGVuZExpbmVTdGFydCwgY29uc3QgQmlk aVN0YXR1cyYgZW5kTGluZVN0YXR1cywgUm9vdElubGluZUJveComIGVuZExpbmUsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQmIGVuZExvZ2ljYWxUb3AsIGludCYgcmVwYWlu dExvZ2ljYWxCb3R0b20sIGludCYgcmVwYWludExvZ2ljYWxUb3ApCiB7CiAgICAgaWYgKHJlc29s dmVyLnBvc2l0aW9uKCkgPT0gZW5kTGluZVN0YXJ0KSB7CiAgICAgICAgIGlmIChyZXNvbHZlci5z dGF0dXMoKSAhPSBlbmRMaW5lU3RhdHVzKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0g ICAgICAgIGludCBkZWx0YSA9IGhlaWdodCgpIC0gZW5kWVBvczsKKyAgICAgICAgaW50IGRlbHRh ID0gbG9naWNhbEhlaWdodCgpIC0gZW5kTG9naWNhbFRvcDsKICAgICAgICAgaWYgKCFkZWx0YSB8 fCAhbV9mbG9hdGluZ09iamVjdHMpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgICAg ICAvLyBTZWUgaWYgYW55IGZsb2F0cyBlbmQgaW4gdGhlIHJhbmdlIGFsb25nIHdoaWNoIHdlIHdh bnQgdG8gc2hpZnQgdGhlIGxpbmVzIHZlcnRpY2FsbHkuCi0gICAgICAgIGludCB0b3AgPSBtaW4o aGVpZ2h0KCksIGVuZFlQb3MpOworICAgICAgICBpbnQgbG9naWNhbFRvcCA9IG1pbihsb2dpY2Fs SGVpZ2h0KCksIGVuZExvZ2ljYWxUb3ApOwogCiAgICAgICAgIFJvb3RJbmxpbmVCb3gqIGxhc3RM aW5lID0gZW5kTGluZTsKICAgICAgICAgd2hpbGUgKFJvb3RJbmxpbmVCb3gqIG5leHRMaW5lID0g bGFzdExpbmUtPm5leHRSb290Qm94KCkpCiAgICAgICAgICAgICBsYXN0TGluZSA9IG5leHRMaW5l OwogCi0gICAgICAgIGludCBib3R0b20gPSBsYXN0TGluZS0+YmxvY2tMb2dpY2FsSGVpZ2h0KCkg KyBhYnMoZGVsdGEpOworICAgICAgICBpbnQgbG9naWNhbEJvdHRvbSA9IGxhc3RMaW5lLT5ibG9j a0xvZ2ljYWxIZWlnaHQoKSArIGFicyhkZWx0YSk7CiAKICAgICAgICAgZm9yIChGbG9hdGluZ09i amVjdCogZiA9IG1fZmxvYXRpbmdPYmplY3RzLT5maXJzdCgpOyBmOyBmID0gbV9mbG9hdGluZ09i amVjdHMtPm5leHQoKSkgewotICAgICAgICAgICAgaWYgKGYtPmJvdHRvbSgpID49IHRvcCAmJiBm LT5ib3R0b20oKSA8IGJvdHRvbSkKKyAgICAgICAgICAgIGlmIChsb2dpY2FsQm90dG9tRm9yRmxv YXQoZikgPj0gbG9naWNhbFRvcCAmJiBsb2dpY2FsQm90dG9tRm9yRmxvYXQoZikgPCBsb2dpY2Fs Qm90dG9tKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQogCkBAIC0x MTI0LDIzICsxMTI3LDIzIEBAIGJvb2wgUmVuZGVyQmxvY2s6Om1hdGNoZWRFbmRMaW5lKGNvbnN0 IEkKICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7IC8vIC4uLmJ1dCB0aGUgYmlkaSBzdGF0 ZSBkb2Vzbid0IG1hdGNoLgogICAgICAgICAgICAgUm9vdElubGluZUJveCogcmVzdWx0ID0gbGlu ZS0+bmV4dFJvb3RCb3goKTsKIAotICAgICAgICAgICAgLy8gU2V0IG91ciB5UG9zIHRvIGJlIHRo ZSBibG9jayBoZWlnaHQgb2YgZW5kTGluZS4KKyAgICAgICAgICAgIC8vIFNldCBvdXIgbG9naWNh bCB0b3AgdG8gYmUgdGhlIGJsb2NrIGhlaWdodCBvZiBlbmRMaW5lLgogICAgICAgICAgICAgaWYg KHJlc3VsdCkKLSAgICAgICAgICAgICAgICBlbmRZUG9zID0gbGluZS0+YmxvY2tMb2dpY2FsSGVp Z2h0KCk7CisgICAgICAgICAgICAgICAgZW5kTG9naWNhbFRvcCA9IGxpbmUtPmJsb2NrTG9naWNh bEhlaWdodCgpOwogCi0gICAgICAgICAgICBpbnQgZGVsdGEgPSBoZWlnaHQoKSAtIGVuZFlQb3M7 CisgICAgICAgICAgICBpbnQgZGVsdGEgPSBsb2dpY2FsSGVpZ2h0KCkgLSBlbmRMb2dpY2FsVG9w OwogICAgICAgICAgICAgaWYgKGRlbHRhICYmIG1fZmxvYXRpbmdPYmplY3RzKSB7CiAgICAgICAg ICAgICAgICAgLy8gU2VlIGlmIGFueSBmbG9hdHMgZW5kIGluIHRoZSByYW5nZSBhbG9uZyB3aGlj aCB3ZSB3YW50IHRvIHNoaWZ0IHRoZSBsaW5lcyB2ZXJ0aWNhbGx5LgotICAgICAgICAgICAgICAg IGludCB0b3AgPSBtaW4oaGVpZ2h0KCksIGVuZFlQb3MpOworICAgICAgICAgICAgICAgIGludCBs b2dpY2FsVG9wID0gbWluKGxvZ2ljYWxIZWlnaHQoKSwgZW5kTG9naWNhbFRvcCk7CiAKICAgICAg ICAgICAgICAgICBSb290SW5saW5lQm94KiBsYXN0TGluZSA9IGVuZExpbmU7CiAgICAgICAgICAg ICAgICAgd2hpbGUgKFJvb3RJbmxpbmVCb3gqIG5leHRMaW5lID0gbGFzdExpbmUtPm5leHRSb290 Qm94KCkpCiAgICAgICAgICAgICAgICAgICAgIGxhc3RMaW5lID0gbmV4dExpbmU7CiAKLSAgICAg ICAgICAgICAgICBpbnQgYm90dG9tID0gbGFzdExpbmUtPmJsb2NrTG9naWNhbEhlaWdodCgpICsg YWJzKGRlbHRhKTsKKyAgICAgICAgICAgICAgICBpbnQgbG9naWNhbEJvdHRvbSA9IGxhc3RMaW5l LT5ibG9ja0xvZ2ljYWxIZWlnaHQoKSArIGFicyhkZWx0YSk7CiAKICAgICAgICAgICAgICAgICBm b3IgKEZsb2F0aW5nT2JqZWN0KiBmID0gbV9mbG9hdGluZ09iamVjdHMtPmZpcnN0KCk7IGY7IGYg PSBtX2Zsb2F0aW5nT2JqZWN0cy0+bmV4dCgpKSB7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChm LT5ib3R0b20oKSA+PSB0b3AgJiYgZi0+Ym90dG9tKCkgPCBib3R0b20pCisgICAgICAgICAgICAg ICAgICAgIGlmIChsb2dpY2FsQm90dG9tRm9yRmxvYXQoZikgPj0gbG9naWNhbFRvcCAmJiBsb2dp Y2FsQm90dG9tRm9yRmxvYXQoZikgPCBsb2dpY2FsQm90dG9tKQogICAgICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KQEAg LTExNDksOCArMTE1Miw4IEBAIGJvb2wgUmVuZGVyQmxvY2s6Om1hdGNoZWRFbmRMaW5lKGNvbnN0 IEkKICAgICAgICAgICAgIFJvb3RJbmxpbmVCb3gqIGJveFRvRGVsZXRlID0gZW5kTGluZTsKICAg ICAgICAgICAgIFJlbmRlckFyZW5hKiBhcmVuYSA9IHJlbmRlckFyZW5hKCk7CiAgICAgICAgICAg ICB3aGlsZSAoYm94VG9EZWxldGUgJiYgYm94VG9EZWxldGUgIT0gcmVzdWx0KSB7Ci0gICAgICAg ICAgICAgICAgcmVwYWludFRvcCA9IG1pbihyZXBhaW50VG9wLCBib3hUb0RlbGV0ZS0+dG9wVmlz aWJsZU92ZXJmbG93KCkpOwotICAgICAgICAgICAgICAgIHJlcGFpbnRCb3R0b20gPSBtYXgocmVw YWludEJvdHRvbSwgYm94VG9EZWxldGUtPmJvdHRvbVZpc2libGVPdmVyZmxvdygpKTsKKyAgICAg ICAgICAgICAgICByZXBhaW50TG9naWNhbFRvcCA9IG1pbihyZXBhaW50TG9naWNhbFRvcCwgYmVm b3JlU2lkZVZpc2libGVPdmVyZmxvd0ZvckxpbmUoYm94VG9EZWxldGUpKTsKKyAgICAgICAgICAg ICAgICByZXBhaW50TG9naWNhbEJvdHRvbSA9IG1heChyZXBhaW50TG9naWNhbEJvdHRvbSwgYWZ0 ZXJTaWRlVmlzaWJsZU92ZXJmbG93Rm9yTGluZShib3hUb0RlbGV0ZSkpOwogICAgICAgICAgICAg ICAgIFJvb3RJbmxpbmVCb3gqIG5leHQgPSBib3hUb0RlbGV0ZS0+bmV4dFJvb3RCb3goKTsKICAg ICAgICAgICAgICAgICBib3hUb0RlbGV0ZS0+ZGVsZXRlTGluZShhcmVuYSk7CiAgICAgICAgICAg ICAgICAgYm94VG9EZWxldGUgPSBuZXh0Owo=