60117 2011-05-03 19:17:40 -0700 Cleanup conditionals in findNextLineBreak 2011-05-04 06:03:47 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 57779 1 rniwa rniwa commit-queue eric hyatt mitz oldest_to_newest 397634 0 rniwa 2011-05-03 19:17:40 -0700 This is a cleanup 397640 1 92187 rniwa 2011-05-03 19:23:41 -0700 Created attachment 92187 cleanup 397653 2 92187 eric 2011-05-03 19:57:59 -0700 Comment on attachment 92187 cleanup Looks reasonable. So long as it passes the tests. 397852 3 92187 commit-queue 2011-05-04 06:03:42 -0700 Comment on attachment 92187 cleanup Clearing flags on attachment: 92187 Committed r85737: <http://trac.webkit.org/changeset/85737> 397853 4 commit-queue 2011-05-04 06:03:47 -0700 All reviewed patches have been landed. Closing bug. 92187 2011-05-03 19:23:41 -0700 2011-05-04 06:03:42 -0700 cleanup bug-60117-20110503192340.patch text/plain 9398 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1NzA1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDUtMDMgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQ2xlYW51cCBjb25kaXRpb25hbHMgaW4gZmluZE5leHRMaW5lQnJl YWsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYwMTE3 CisKKyAgICAgICAgU2ltcGxpZmllZCBjb25kaXRpb25hbCBzdGF0ZW1lbnRzIGluIGZpbmROZXh0 TGluZUJyZWFrLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lQnJlYWspOgor CiAyMDExLTA1LTAzICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAkocmV2aXNpb24gODU2OTcpCisrKyBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTg3Niw0OCArMTg3Niw0NSBAQCBJbmxpbmVJdGVyYXRvciBSZW5kZXJCbG9j azo6ZmluZE5leHRMaW5lCiAgICAgICAgICAgICBnb3RvIGVuZDsKICAgICAgICAgfQogCi0gICAg ICAgIGlmIChjdXJyZW50Lm1fb2JqLT5pc0Zsb2F0aW5nT3JQb3NpdGlvbmVkKCkpIHsKLSAgICAg ICAgICAgIC8vIGFkZCB0byBzcGVjaWFsIG9iamVjdHMuLi4KLSAgICAgICAgICAgIGlmIChjdXJy ZW50Lm1fb2JqLT5pc0Zsb2F0aW5nKCkpIHsKLSAgICAgICAgICAgICAgICBSZW5kZXJCb3gqIGZs b2F0Qm94ID0gdG9SZW5kZXJCb3goY3VycmVudC5tX29iaik7Ci0gICAgICAgICAgICAgICAgRmxv YXRpbmdPYmplY3QqIGYgPSBpbnNlcnRGbG9hdGluZ09iamVjdChmbG9hdEJveCk7Ci0gICAgICAg ICAgICAgICAgLy8gY2hlY2sgaWYgaXQgZml0cyBpbiB0aGUgY3VycmVudCBsaW5lLgotICAgICAg ICAgICAgICAgIC8vIElmIGl0IGRvZXMsIHBvc2l0aW9uIGl0IG5vdywgb3RoZXJ3aXNlLCBwb3Np dGlvbgotICAgICAgICAgICAgICAgIC8vIGl0IGFmdGVyIG1vdmluZyB0byBuZXh0IGxpbmUgKGlu IG5ld0xpbmUoKSBmdW5jKQotICAgICAgICAgICAgICAgIGlmIChmbG9hdHNGaXRPbkxpbmUgJiYg d2lkdGguZml0c09uTGluZShsb2dpY2FsV2lkdGhGb3JGbG9hdChmKSkpIHsKLSAgICAgICAgICAg ICAgICAgICAgcG9zaXRpb25OZXdGbG9hdE9uTGluZShmLCBsYXN0RmxvYXRGcm9tUHJldmlvdXNM aW5lLCB3aWR0aCk7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChsQnJlYWsubV9vYmogPT0gY3Vy cmVudC5tX29iaikgewotICAgICAgICAgICAgICAgICAgICAgICAgQVNTRVJUKCFsQnJlYWsubV9w b3MpOwotICAgICAgICAgICAgICAgICAgICAgICAgbEJyZWFrLmluY3JlbWVudCgpOwotICAgICAg ICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAg ICAgIGZsb2F0c0ZpdE9uTGluZSA9IGZhbHNlOwotICAgICAgICAgICAgfSBlbHNlIGlmIChjdXJy ZW50Lm1fb2JqLT5pc1Bvc2l0aW9uZWQoKSkgewotICAgICAgICAgICAgICAgIC8vIElmIG91ciBv cmlnaW5hbCBkaXNwbGF5IHdhc24ndCBhbiBpbmxpbmUgdHlwZSwgdGhlbiB3ZSBjYW4KLSAgICAg ICAgICAgICAgICAvLyBnbyBhaGVhZCBhbmQgZGV0ZXJtaW5lIG91ciBzdGF0aWMgaW5saW5lIHBv c2l0aW9uIG5vdy4KLSAgICAgICAgICAgICAgICBSZW5kZXJCb3gqIGJveCA9IHRvUmVuZGVyQm94 KGN1cnJlbnQubV9vYmopOwotICAgICAgICAgICAgICAgIGJvb2wgaXNJbmxpbmVUeXBlID0gYm94 LT5zdHlsZSgpLT5pc09yaWdpbmFsRGlzcGxheUlubGluZVR5cGUoKTsKLSAgICAgICAgICAgICAg ICBpZiAoIWlzSW5saW5lVHlwZSkKLSAgICAgICAgICAgICAgICAgICAgYm94LT5sYXllcigpLT5z ZXRTdGF0aWNJbmxpbmVQb3NpdGlvbihib3JkZXJBbmRQYWRkaW5nU3RhcnQoKSk7Ci0gICAgICAg ICAgICAgICAgZWxzZSAgewotICAgICAgICAgICAgICAgICAgICAvLyBJZiBvdXIgb3JpZ2luYWwg ZGlzcGxheSB3YXMgYW4gSU5MSU5FIHR5cGUsIHRoZW4gd2UgY2FuIGdvIGFoZWFkCi0gICAgICAg ICAgICAgICAgICAgIC8vIGFuZCBkZXRlcm1pbmUgb3VyIHN0YXRpYyB5IHBvc2l0aW9uIG5vdy4K LSAgICAgICAgICAgICAgICAgICAgYm94LT5sYXllcigpLT5zZXRTdGF0aWNCbG9ja1Bvc2l0aW9u KGxvZ2ljYWxIZWlnaHQoKSk7Ci0gICAgICAgICAgICAgICAgfQotCi0gICAgICAgICAgICAgICAg Ly8gSWYgd2UncmUgaWdub3Jpbmcgc3BhY2VzLCB3ZSBoYXZlIHRvIHN0b3AgYW5kIGluY2x1ZGUg dGhpcyBvYmplY3QgYW5kCi0gICAgICAgICAgICAgICAgLy8gdGhlbiBzdGFydCBpZ25vcmluZyBz cGFjZXMgYWdhaW4uCi0gICAgICAgICAgICAgICAgaWYgKGlzSW5saW5lVHlwZSB8fCBjdXJyZW50 Lm1fb2JqLT5jb250YWluZXIoKS0+aXNSZW5kZXJJbmxpbmUoKSkgewotICAgICAgICAgICAgICAg ICAgICBpZiAoaWdub3JpbmdTcGFjZXMpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlnbm9y ZVN0YXJ0Lm1fb2JqID0gY3VycmVudC5tX29iajsKLSAgICAgICAgICAgICAgICAgICAgICAgIGln bm9yZVN0YXJ0Lm1fcG9zID0gMDsKLSAgICAgICAgICAgICAgICAgICAgICAgIGFkZE1pZHBvaW50 KGxpbmVNaWRwb2ludFN0YXRlLCBpZ25vcmVTdGFydCk7IC8vIFN0b3AgaWdub3Jpbmcgc3BhY2Vz LgotICAgICAgICAgICAgICAgICAgICAgICAgYWRkTWlkcG9pbnQobGluZU1pZHBvaW50U3RhdGUs IGlnbm9yZVN0YXJ0KTsgLy8gU3RhcnQgaWdub3JpbmcgYWdhaW4uCi0gICAgICAgICAgICAgICAg ICAgIH0KLSAgICAgICAgICAgICAgICAgICAgdHJhaWxpbmdPYmplY3RzLmFwcGVuZEJveElmTmVl ZGVkKGJveCk7Ci0gICAgICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICAgICAgICAgIHBv c2l0aW9uZWRCb3hlcy5hcHBlbmQoYm94KTsKKyAgICAgICAgaWYgKGN1cnJlbnQubV9vYmotPmlz RmxvYXRpbmcoKSkgeworICAgICAgICAgICAgUmVuZGVyQm94KiBmbG9hdEJveCA9IHRvUmVuZGVy Qm94KGN1cnJlbnQubV9vYmopOworICAgICAgICAgICAgRmxvYXRpbmdPYmplY3QqIGYgPSBpbnNl cnRGbG9hdGluZ09iamVjdChmbG9hdEJveCk7CisgICAgICAgICAgICAvLyBjaGVjayBpZiBpdCBm aXRzIGluIHRoZSBjdXJyZW50IGxpbmUuCisgICAgICAgICAgICAvLyBJZiBpdCBkb2VzLCBwb3Np dGlvbiBpdCBub3csIG90aGVyd2lzZSwgcG9zaXRpb24KKyAgICAgICAgICAgIC8vIGl0IGFmdGVy IG1vdmluZyB0byBuZXh0IGxpbmUgKGluIG5ld0xpbmUoKSBmdW5jKQorICAgICAgICAgICAgaWYg KGZsb2F0c0ZpdE9uTGluZSAmJiB3aWR0aC5maXRzT25MaW5lKGxvZ2ljYWxXaWR0aEZvckZsb2F0 KGYpKSkgeworICAgICAgICAgICAgICAgIHBvc2l0aW9uTmV3RmxvYXRPbkxpbmUoZiwgbGFzdEZs b2F0RnJvbVByZXZpb3VzTGluZSwgd2lkdGgpOworICAgICAgICAgICAgICAgIGlmIChsQnJlYWsu bV9vYmogPT0gY3VycmVudC5tX29iaikgeworICAgICAgICAgICAgICAgICAgICBBU1NFUlQoIWxC cmVhay5tX3Bvcyk7CisgICAgICAgICAgICAgICAgICAgIGxCcmVhay5pbmNyZW1lbnQoKTsKKyAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAgICBmbG9h dHNGaXRPbkxpbmUgPSBmYWxzZTsKKyAgICAgICAgfSBlbHNlIGlmIChjdXJyZW50Lm1fb2JqLT5p c1Bvc2l0aW9uZWQoKSkgeworICAgICAgICAgICAgLy8gSWYgb3VyIG9yaWdpbmFsIGRpc3BsYXkg d2Fzbid0IGFuIGlubGluZSB0eXBlLCB0aGVuIHdlIGNhbgorICAgICAgICAgICAgLy8gZ28gYWhl YWQgYW5kIGRldGVybWluZSBvdXIgc3RhdGljIGlubGluZSBwb3NpdGlvbiBub3cuCisgICAgICAg ICAgICBSZW5kZXJCb3gqIGJveCA9IHRvUmVuZGVyQm94KGN1cnJlbnQubV9vYmopOworICAgICAg ICAgICAgYm9vbCBpc0lubGluZVR5cGUgPSBib3gtPnN0eWxlKCktPmlzT3JpZ2luYWxEaXNwbGF5 SW5saW5lVHlwZSgpOworICAgICAgICAgICAgaWYgKCFpc0lubGluZVR5cGUpCisgICAgICAgICAg ICAgICAgYm94LT5sYXllcigpLT5zZXRTdGF0aWNJbmxpbmVQb3NpdGlvbihib3JkZXJBbmRQYWRk aW5nU3RhcnQoKSk7CisgICAgICAgICAgICBlbHNlICB7CisgICAgICAgICAgICAgICAgLy8gSWYg b3VyIG9yaWdpbmFsIGRpc3BsYXkgd2FzIGFuIElOTElORSB0eXBlLCB0aGVuIHdlIGNhbiBnbyBh aGVhZAorICAgICAgICAgICAgICAgIC8vIGFuZCBkZXRlcm1pbmUgb3VyIHN0YXRpYyB5IHBvc2l0 aW9uIG5vdy4KKyAgICAgICAgICAgICAgICBib3gtPmxheWVyKCktPnNldFN0YXRpY0Jsb2NrUG9z aXRpb24obG9naWNhbEhlaWdodCgpKTsKICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgLy8g SWYgd2UncmUgaWdub3Jpbmcgc3BhY2VzLCB3ZSBoYXZlIHRvIHN0b3AgYW5kIGluY2x1ZGUgdGhp cyBvYmplY3QgYW5kCisgICAgICAgICAgICAvLyB0aGVuIHN0YXJ0IGlnbm9yaW5nIHNwYWNlcyBh Z2Fpbi4KKyAgICAgICAgICAgIGlmIChpc0lubGluZVR5cGUgfHwgY3VycmVudC5tX29iai0+Y29u dGFpbmVyKCktPmlzUmVuZGVySW5saW5lKCkpIHsKKyAgICAgICAgICAgICAgICBpZiAoaWdub3Jp bmdTcGFjZXMpIHsKKyAgICAgICAgICAgICAgICAgICAgaWdub3JlU3RhcnQubV9vYmogPSBjdXJy ZW50Lm1fb2JqOworICAgICAgICAgICAgICAgICAgICBpZ25vcmVTdGFydC5tX3BvcyA9IDA7Cisg ICAgICAgICAgICAgICAgICAgIGFkZE1pZHBvaW50KGxpbmVNaWRwb2ludFN0YXRlLCBpZ25vcmVT dGFydCk7IC8vIFN0b3AgaWdub3Jpbmcgc3BhY2VzLgorICAgICAgICAgICAgICAgICAgICBhZGRN aWRwb2ludChsaW5lTWlkcG9pbnRTdGF0ZSwgaWdub3JlU3RhcnQpOyAvLyBTdGFydCBpZ25vcmlu ZyBhZ2Fpbi4KKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgdHJhaWxpbmdPYmpl Y3RzLmFwcGVuZEJveElmTmVlZGVkKGJveCk7CisgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAg ICAgICAgICBwb3NpdGlvbmVkQm94ZXMuYXBwZW5kKGJveCk7CiAgICAgICAgIH0gZWxzZSBpZiAo Y3VycmVudC5tX29iai0+aXNSZW5kZXJJbmxpbmUoKSkgewogICAgICAgICAgICAgLy8gUmlnaHQg bm93LCB3ZSBzaG91bGQgb25seSBlbmNvdW50ZXIgZW1wdHkgaW5saW5lcyBoZXJlLgogICAgICAg ICAgICAgQVNTRVJUKCFjdXJyZW50Lm1fb2JqLT5maXJzdENoaWxkKCkpOwpAQCAtMjIyNSw3ICsy MjIyLDcgQEAgSW5saW5lSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZQogICAgICAg ICAgICAgICAgIGlmIChjYW5IeXBoZW5hdGUpCiAgICAgICAgICAgICAgICAgICAgIHRyeUh5cGhl bmF0aW5nKHQsIGYsIHN0eWxlLT5sb2NhbGUoKSwgc3R5bGUtPmh5cGhlbmF0aW9uTGltaXRCZWZv cmUoKSwgc3R5bGUtPmh5cGhlbmF0aW9uTGltaXRBZnRlcigpLCBsYXN0U3BhY2UsIGN1cnJlbnQu bV9wb3MsIHdpZHRoLmN1cnJlbnRXaWR0aCgpIC0gYWRkaXRpb25hbFRtcFcsIHdpZHRoLmF2YWls YWJsZVdpZHRoKCksIGlzRml4ZWRQaXRjaCwgY29sbGFwc2VXaGl0ZVNwYWNlLCBsYXN0U3BhY2VX b3JkU3BhY2luZywgbEJyZWFrLCBjdXJyZW50Lm1fbmV4dEJyZWFrYWJsZVBvc2l0aW9uLCBoeXBo ZW5hdGVkKTsKIAotICAgICAgICAgICAgICAgIGlmICghaHlwaGVuYXRlZCAmJiBsQnJlYWsubV9v YmogJiYgbEJyZWFrLm1fcG9zICYmIGxCcmVhay5tX29iai0+aXNUZXh0KCkgJiYgdG9SZW5kZXJU ZXh0KGxCcmVhay5tX29iaiktPnRleHRMZW5ndGgoKSAmJiB0b1JlbmRlclRleHQobEJyZWFrLm1f b2JqKS0+Y2hhcmFjdGVycygpW2xCcmVhay5tX3BvcyAtIDFdID09IHNvZnRIeXBoZW4gJiYgc3R5 bGUtPmh5cGhlbnMoKSAhPSBIeXBoZW5zTm9uZSkKKyAgICAgICAgICAgICAgICBpZiAoIWh5cGhl bmF0ZWQgJiYgbEJyZWFrLnByZXZpb3VzSW5TYW1lTm9kZSgpID09IHNvZnRIeXBoZW4gJiYgc3R5 bGUtPmh5cGhlbnMoKSAhPSBIeXBoZW5zTm9uZSkKICAgICAgICAgICAgICAgICAgICAgaHlwaGVu YXRlZCA9IHRydWU7CiAKICAgICAgICAgICAgICAgICBpZiAoaHlwaGVuYXRlZCkKQEAgLTIyMzcs MzEgKzIyMzQsMjcgQEAgSW5saW5lSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmROZXh0TGluZQog ICAgICAgICBib29sIGNoZWNrRm9yQnJlYWsgPSBhdXRvV3JhcDsKICAgICAgICAgaWYgKHdpZHRo LmNvbW1pdHRlZFdpZHRoKCkgJiYgIXdpZHRoLmZpdHNPbkxpbmUoKSAmJiBsQnJlYWsubV9vYmog JiYgY3VycldTID09IE5PV1JBUCkKICAgICAgICAgICAgIGNoZWNrRm9yQnJlYWsgPSB0cnVlOwot ICAgICAgICBlbHNlIGlmIChuZXh0ICYmIGN1cnJlbnQubV9vYmotPmlzVGV4dCgpICYmIG5leHQt PmlzVGV4dCgpICYmICFuZXh0LT5pc0JSKCkpIHsKLSAgICAgICAgICAgIGlmIChhdXRvV3JhcCB8 fCAobmV4dC0+c3R5bGUoKS0+YXV0b1dyYXAoKSkpIHsKLSAgICAgICAgICAgICAgICBpZiAoY3Vy cmVudENoYXJhY3RlcklzU3BhY2UpCisgICAgICAgIGVsc2UgaWYgKG5leHQgJiYgY3VycmVudC5t X29iai0+aXNUZXh0KCkgJiYgbmV4dC0+aXNUZXh0KCkgJiYgIW5leHQtPmlzQlIoKSAmJiAoYXV0 b1dyYXAgfHwgKG5leHQtPnN0eWxlKCktPmF1dG9XcmFwKCkpKSkgeworICAgICAgICAgICAgaWYg KGN1cnJlbnRDaGFyYWN0ZXJJc1NwYWNlKQorICAgICAgICAgICAgICAgIGNoZWNrRm9yQnJlYWsg PSB0cnVlOworICAgICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgICAgUmVuZGVyVGV4dCog bmV4dFRleHQgPSB0b1JlbmRlclRleHQobmV4dCk7CisgICAgICAgICAgICAgICAgaWYgKG5leHRU ZXh0LT50ZXh0TGVuZ3RoKCkpIHsKKyAgICAgICAgICAgICAgICAgICAgVUNoYXIgYyA9IG5leHRU ZXh0LT5jaGFyYWN0ZXJzKClbMF07CisgICAgICAgICAgICAgICAgICAgIGNoZWNrRm9yQnJlYWsg PSAoYyA9PSAnICcgfHwgYyA9PSAnXHQnIHx8IChjID09ICdcbicgJiYgIW5leHQtPnByZXNlcnZl c05ld2xpbmUoKSkpOworICAgICAgICAgICAgICAgICAgICAvLyBJZiB0aGUgbmV4dCBpdGVtIG9u IHRoZSBsaW5lIGlzIHRleHQsIGFuZCBpZiB3ZSBkaWQgbm90IGVuZCB3aXRoCisgICAgICAgICAg ICAgICAgICAgIC8vIGEgc3BhY2UsIHRoZW4gdGhlIG5leHQgdGV4dCBydW4gY29udGludWVzIG91 ciB3b3JkIChhbmQgc28gaXQgbmVlZHMgdG8KKyAgICAgICAgICAgICAgICAgICAgLy8ga2VlcCBh ZGRpbmcgdG8gfHRtcFd8LiBKdXN0IHVwZGF0ZSBhbmQgY29udGludWUuCisgICAgICAgICAgICAg ICAgfSBlbHNlIGlmIChuZXh0VGV4dC0+aXNXb3JkQnJlYWsoKSkKICAgICAgICAgICAgICAgICAg ICAgY2hlY2tGb3JCcmVhayA9IHRydWU7Ci0gICAgICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAg ICAgICAgICAgICAgIGNoZWNrRm9yQnJlYWsgPSBmYWxzZTsKLSAgICAgICAgICAgICAgICAgICAg UmVuZGVyVGV4dCogbmV4dFRleHQgPSB0b1JlbmRlclRleHQobmV4dCk7Ci0gICAgICAgICAgICAg ICAgICAgIGlmIChuZXh0VGV4dC0+dGV4dExlbmd0aCgpKSB7Ci0gICAgICAgICAgICAgICAgICAg ICAgICBVQ2hhciBjID0gbmV4dFRleHQtPmNoYXJhY3RlcnMoKVswXTsKLSAgICAgICAgICAgICAg ICAgICAgICAgIGlmIChjID09ICcgJyB8fCBjID09ICdcdCcgfHwgKGMgPT0gJ1xuJyAmJiAhbmV4 dC0+cHJlc2VydmVzTmV3bGluZSgpKSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBJ ZiB0aGUgbmV4dCBpdGVtIG9uIHRoZSBsaW5lIGlzIHRleHQsIGFuZCBpZiB3ZSBkaWQgbm90IGVu ZCB3aXRoCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gYSBzcGFjZSwgdGhlbiB0aGUg bmV4dCB0ZXh0IHJ1biBjb250aW51ZXMgb3VyIHdvcmQgKGFuZCBzbyBpdCBuZWVkcyB0bwotICAg ICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGtlZXAgYWRkaW5nIHRvIHx0bXBXfC4gIEp1c3Qg dXBkYXRlIGFuZCBjb250aW51ZS4KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaGVja0Zv ckJyZWFrID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChuZXh0VGV4dC0+ aXNXb3JkQnJlYWsoKSkKLSAgICAgICAgICAgICAgICAgICAgICAgIGNoZWNrRm9yQnJlYWsgPSB0 cnVlOwogCi0gICAgICAgICAgICAgICAgICAgIGlmICghd2lkdGguZml0c09uTGluZSgpICYmICF3 aWR0aC5jb21taXR0ZWRXaWR0aCgpKQotICAgICAgICAgICAgICAgICAgICAgICAgd2lkdGguZml0 QmVsb3dGbG9hdHMoKTsKKyAgICAgICAgICAgICAgICBpZiAoIXdpZHRoLmZpdHNPbkxpbmUoKSAm JiAhd2lkdGguY29tbWl0dGVkV2lkdGgoKSkKKyAgICAgICAgICAgICAgICAgICAgd2lkdGguZml0 QmVsb3dGbG9hdHMoKTsKIAotICAgICAgICAgICAgICAgICAgICBib29sIGNhblBsYWNlT25MaW5l ID0gd2lkdGguZml0c09uTGluZSgpIHx8ICFhdXRvV3JhcFdhc0V2ZXJUcnVlT25MaW5lOwotICAg ICAgICAgICAgICAgICAgICBpZiAoY2FuUGxhY2VPbkxpbmUgJiYgY2hlY2tGb3JCcmVhaykgewot ICAgICAgICAgICAgICAgICAgICAgICAgd2lkdGguY29tbWl0KCk7Ci0gICAgICAgICAgICAgICAg ICAgICAgICBsQnJlYWsubW92ZVRvU3RhcnRPZihuZXh0KTsKLSAgICAgICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgICAgIGJvb2wgY2FuUGxhY2VPbkxpbmUgPSB3aWR0aC5maXRzT25MaW5l KCkgfHwgIWF1dG9XcmFwV2FzRXZlclRydWVPbkxpbmU7CisgICAgICAgICAgICAgICAgaWYgKGNh blBsYWNlT25MaW5lICYmIGNoZWNrRm9yQnJlYWspIHsKKyAgICAgICAgICAgICAgICAgICAgd2lk dGguY29tbWl0KCk7CisgICAgICAgICAgICAgICAgICAgIGxCcmVhay5tb3ZlVG9TdGFydE9mKG5l eHQpOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgIH0KICAgICAgICAgfQo=