58028 2011-04-07 04:56:53 -0700 Add functions to update left and right offsets to LineOffsets 2011-04-07 06:06:06 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 57779 1 rniwa webkit-unassigned commit-queue oldest_to_newest 381234 0 rniwa 2011-04-07 04:56:53 -0700 This is a cleanup. 381238 1 88608 rniwa 2011-04-07 05:04:15 -0700 Created attachment 88608 cleanup 381244 2 88608 eric 2011-04-07 05:16:03 -0700 Comment on attachment 88608 cleanup LGTM! 381264 3 88608 commit-queue 2011-04-07 06:05:59 -0700 Comment on attachment 88608 cleanup Clearing flags on attachment: 88608 Committed r83165: <http://trac.webkit.org/changeset/83165> 381265 4 commit-queue 2011-04-07 06:06:06 -0700 All reviewed patches have been landed. Closing bug. 88608 2011-04-07 05:04:15 -0700 2011-04-07 06:05:58 -0700 cleanup bug-58028-20110407150412.patch text/plain 10079 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzMTYxKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDQtMDcgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIGZ1bmN0aW9ucyB0byB1cGRhdGUgbGVmdCBhbmQgcmlnaHQg b2Zmc2V0cyB0byBMaW5lT2Zmc2V0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTgwMjgKKworICAgICAgICBBZGRlZCB1cGRhdGUoKSBhbmQgc2hyaW5r V2lkdGhGb3JOZXdGbG9hdElmTmVlZGVkKEZsb2F0aW5nT2JqZWN0KikgdG8gTGluZU9mZnNldHMs CisgICAgICAgIHdoaWNoIGFyZSB1c2VkIHRvIHVwZGF0ZSBtX2xlZnQgYW5kIG1fcmlnaHQuIEFs c28gYWRkZWQgbV9ibG9jayBhbmQgbV9pc0ZpcnN0TGluZQorICAgICAgICBtZW1iZXIgdmFyaWFi bGVzIHRvIExpbmVPZmZzZXRzIHNvIHRoYXQgdXNlcnMgb2YgTGluZU9mZnNldHMgZG9uJ3QgaGF2 ZSB0byBwYXNzIHRoZW0gYXJvdW5kLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2Nr Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6c2tpcExlYWRpbmdXaGl0ZXNwYWNlKTogTm8gbG9u Z2VyIHBhc3NlcyBmaXJzdExpbmUgdG8gcG9zaXRpb25OZXdGbG9hdE9uTGluZS4KKyAgICAgICAg KFdlYkNvcmU6OkxpbmVPZmZzZXRzOjpMaW5lT2Zmc2V0cyk6IFRha2VzIFJlbmRlckJsb2NrKiBh bmQgaXNGaXJzdExpbmUgaW5zdGVhZCBvZiBsZWZ0IGFuZCByaWdodCBvZmZzZXRzLgorICAgICAg ICAoV2ViQ29yZTo6TGluZU9mZnNldHM6OnVwZGF0ZSk6IEV4dHJhY3RlZCBmcm9tIGZpbmROZXh0 TGluZUJyZWFrIGFuZCBwb3NpdGlvbk5ld0Zsb2F0T25MaW5lLgorICAgICAgICAoV2ViQ29yZTo6 TGluZU9mZnNldHM6OnNocmlua1dpZHRoRm9yTmV3RmxvYXRJZk5lZWRlZCk6IEV4dHJhY3RlZCBm cm9tIHBvc2l0aW9uTmV3RmxvYXRPbkxpbmUuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9j azo6ZmluZE5leHRMaW5lQnJlYWspOiBDYWxscyBza2lwTGVhZGluZ1doaXRlc3BhY2UgYW5kIHBv c2l0aW9uTmV3RmxvYXRPbkxpbmUuCisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6cG9z aXRpb25OZXdGbG9hdE9uTGluZSk6IENhbGxzIHNocmlua1dpZHRoRm9yTmV3RmxvYXRJZk5lZWRl ZCBhbmQgdXBkYXRlIGFuZAorICAgICAgICBubyBsb25nZXIgcGFzc2VzIGZpcnN0TGluZSBhcm91 bmQuCisKIDIwMTEtMDQtMDcgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBCZW5qYW1pbiBQb3VsYWluLgpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgJKHJldmlzaW9uIDgzMTU5KQorKysgU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ5NCw3 ICs0OTQsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgICAgICAgICAgUm9vdElubGluZUJv eComIGVuZExpbmUsIGludCYgZW5kWVBvcywgaW50JiByZXBhaW50Qm90dG9tLCBpbnQmIHJlcGFp bnRUb3ApOwogCiAgICAgdm9pZCBza2lwVHJhaWxpbmdXaGl0ZXNwYWNlKElubGluZUl0ZXJhdG9y JiwgYm9vbCBpc0xpbmVFbXB0eSwgYm9vbCBwcmV2aW91c0xpbmVCcm9rZUNsZWFubHkpOwotICAg IHZvaWQgc2tpcExlYWRpbmdXaGl0ZXNwYWNlKElubGluZUJpZGlSZXNvbHZlciYsIGJvb2wgZmly c3RMaW5lLCBib29sIGlzTGluZUVtcHR5LCBib29sIHByZXZpb3VzTGluZUJyb2tlQ2xlYW5seSwg RmxvYXRpbmdPYmplY3QqIGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUsIExpbmVPZmZzZXRzJik7 CisgICAgdm9pZCBza2lwTGVhZGluZ1doaXRlc3BhY2UoSW5saW5lQmlkaVJlc29sdmVyJiwgYm9v bCBpc0xpbmVFbXB0eSwgYm9vbCBwcmV2aW91c0xpbmVCcm9rZUNsZWFubHksIEZsb2F0aW5nT2Jq ZWN0KiBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lLCBMaW5lT2Zmc2V0cyYpOwogICAgIHZvaWQg Zml0QmVsb3dGbG9hdHMoZmxvYXQgd2lkdGhUb0ZpdCwgZmxvYXQgdG90YWxPdmVyaGFuZ1dpZHRo LCBib29sIGZpcnN0TGluZSwgZmxvYXQmIGF2YWlsYWJsZVdpZHRoKTsKICAgICB0eXBlZGVmIHN0 ZDo6cGFpcjxSZW5kZXJUZXh0KiwgTGF6eUxpbmVCcmVha0l0ZXJhdG9yPiBMaW5lQnJlYWtJdGVy YXRvckluZm87CiAgICAgSW5saW5lSXRlcmF0b3IgZmluZE5leHRMaW5lQnJlYWsoSW5saW5lQmlk aVJlc29sdmVyJiwgYm9vbCBmaXJzdExpbmUsIGJvb2wmIGlzTGluZUVtcHR5LCBMaW5lQnJlYWtJ dGVyYXRvckluZm8mLCBib29sJiBwcmV2aW91c0xpbmVCcm9rZUNsZWFubHksIGJvb2wmIGh5cGhl bmF0ZWQsCkBAIC01MDksNyArNTA5LDcgQEAgcHJpdmF0ZToKIAogICAgIC8vIFBvc2l0aW9ucyBu ZXcgZmxvYXRzIGFuZCBhbHNvIGFkanVzdCBhbGwgZmxvYXRzIGVuY291bnRlcmVkIG9uIHRoZSBs aW5lIGlmIGFueSBvZiB0aGVtCiAgICAgLy8gaGF2ZSB0byBtb3ZlIHRvIHRoZSBuZXh0IHBhZ2Uv Y29sdW1uLgotICAgIGJvb2wgcG9zaXRpb25OZXdGbG9hdE9uTGluZShGbG9hdGluZ09iamVjdCog bmV3RmxvYXQsIEZsb2F0aW5nT2JqZWN0KiBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lLCBib29s IGZpcnN0TGluZSwgTGluZU9mZnNldHMmKTsKKyAgICBib29sIHBvc2l0aW9uTmV3RmxvYXRPbkxp bmUoRmxvYXRpbmdPYmplY3QqIG5ld0Zsb2F0LCBGbG9hdGluZ09iamVjdCogbGFzdEZsb2F0RnJv bVByZXZpb3VzTGluZSwgTGluZU9mZnNldHMmKTsKIAogICAgIC8vIEVuZCBvZiBmdW5jdGlvbnMg ZGVmaW5lZCBpbiBSZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwLgogCkBAIC03ODQsNiArNzg0LDcg QEAgcHJpdmF0ZToKICAgICAvLyBSZW5kZXJSdWJ5QmFzZSBvYmplY3RzIG5lZWQgdG8gYmUgYWJs ZSB0byBzcGxpdCBhbmQgbWVyZ2UsIG1vdmluZyB0aGVpciBjaGlsZHJlbiBhcm91bmQKICAgICAv LyAoY2FsbGluZyBtb3ZlQ2hpbGRUbywgbW92ZUFsbENoaWxkcmVuVG8sIGFuZCBtYWtlQ2hpbGRy ZW5Ob25JbmxpbmUpLgogICAgIGZyaWVuZCBjbGFzcyBSZW5kZXJSdWJ5QmFzZTsKKyAgICBmcmll bmQgY2xhc3MgTGluZU9mZnNldHM7IC8vIE5lZWRzIHRvIGtub3cgRmxvYXRpbmdPYmplY3QKIH07 CiAKIGlubGluZSBSZW5kZXJCbG9jayogdG9SZW5kZXJCbG9jayhSZW5kZXJPYmplY3QqIG9iamVj dCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xp bmVMYXlvdXQuY3BwCShyZXZpc2lvbiA4MzE1OSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNDUzLDEzICsx NDUzLDEzIEBAIHZvaWQgUmVuZGVyQmxvY2s6OnNraXBUcmFpbGluZ1doaXRlc3BhY2UKICAgICB9 CiB9CiAKLXZvaWQgUmVuZGVyQmxvY2s6OnNraXBMZWFkaW5nV2hpdGVzcGFjZShJbmxpbmVCaWRp UmVzb2x2ZXImIHJlc29sdmVyLCBib29sIGZpcnN0TGluZSwgYm9vbCBpc0xpbmVFbXB0eSwgYm9v bCBwcmV2aW91c0xpbmVCcm9rZUNsZWFubHksCit2b2lkIFJlbmRlckJsb2NrOjpza2lwTGVhZGlu Z1doaXRlc3BhY2UoSW5saW5lQmlkaVJlc29sdmVyJiByZXNvbHZlciwgYm9vbCBpc0xpbmVFbXB0 eSwgYm9vbCBwcmV2aW91c0xpbmVCcm9rZUNsZWFubHksCiAgICAgRmxvYXRpbmdPYmplY3QqIGxh c3RGbG9hdEZyb21QcmV2aW91c0xpbmUsIExpbmVPZmZzZXRzJiBsaW5lT2Zmc2V0cykKIHsKICAg ICB3aGlsZSAoIXJlc29sdmVyLnBvc2l0aW9uKCkuYXRFbmQoKSAmJiAhcmVxdWlyZXNMaW5lQm94 KHJlc29sdmVyLnBvc2l0aW9uKCksIGlzTGluZUVtcHR5LCBwcmV2aW91c0xpbmVCcm9rZUNsZWFu bHkpKSB7CiAgICAgICAgIFJlbmRlck9iamVjdCogb2JqZWN0ID0gcmVzb2x2ZXIucG9zaXRpb24o KS5tX29iajsKICAgICAgICAgaWYgKG9iamVjdC0+aXNGbG9hdGluZygpKQotICAgICAgICAgICAg cG9zaXRpb25OZXdGbG9hdE9uTGluZShpbnNlcnRGbG9hdGluZ09iamVjdCh0b1JlbmRlckJveChv YmplY3QpKSwgbGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZSwgZmlyc3RMaW5lLCBsaW5lT2Zmc2V0 cyk7CisgICAgICAgICAgICBwb3NpdGlvbk5ld0Zsb2F0T25MaW5lKGluc2VydEZsb2F0aW5nT2Jq ZWN0KHRvUmVuZGVyQm94KG9iamVjdCkpLCBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lLCBsaW5l T2Zmc2V0cyk7CiAgICAgICAgIGVsc2UgaWYgKG9iamVjdC0+aXNQb3NpdGlvbmVkKCkpCiAgICAg ICAgICAgICBzZXRTdGF0aWNQb3NpdGlvbnModGhpcywgdG9SZW5kZXJCb3gob2JqZWN0KSk7CiAg ICAgICAgIHJlc29sdmVyLmluY3JlbWVudCgpOwpAQCAtMTU2MiwxOSArMTU2Miw0NyBAQCBzdGF0 aWMgdm9pZCB0cnlIeXBoZW5hdGluZyhSZW5kZXJUZXh0KiB0CiAKIGNsYXNzIExpbmVPZmZzZXRz IHsKIHB1YmxpYzoKLSAgICBMaW5lT2Zmc2V0cyhpbnQgbGVmdE9mZnNldCwgaW50IHJpZ2h0T2Zm c2V0KQotICAgIDogbV9sZWZ0KGxlZnRPZmZzZXQpCi0gICAgLCBtX3JpZ2h0KHJpZ2h0T2Zmc2V0 KQotICAgIHsKLSAgICB9CisgICAgTGluZU9mZnNldHMoUmVuZGVyQmxvY2sqLCBib29sIGlzRmly c3RMaW5lKTsKICAgICBpbnQgd2lkdGgoKSBjb25zdCB7IHJldHVybiBtYXgoMCwgbV9yaWdodCAt IG1fbGVmdCk7IH0KLSAgICB2b2lkIHNldExlZnQoaW50IGxlZnQpIHsgbV9sZWZ0ID0gbGVmdDsg fQotICAgIHZvaWQgc2V0UmlnaHQoaW50IHJpZ2h0KSB7IG1fcmlnaHQgPSByaWdodDsgfQorICAg IHZvaWQgdXBkYXRlKCk7CisgICAgdm9pZCBzaHJpbmtXaWR0aEZvck5ld0Zsb2F0SWZOZWVkZWQo UmVuZGVyQmxvY2s6OkZsb2F0aW5nT2JqZWN0Kik7CisKIHByaXZhdGU6CisgICAgUmVuZGVyQmxv Y2sqIG1fYmxvY2s7CiAgICAgaW50IG1fbGVmdDsKICAgICBpbnQgbV9yaWdodDsKKyAgICBib29s IG1faXNGaXJzdExpbmU7CiB9OwogCitpbmxpbmUgTGluZU9mZnNldHM6OkxpbmVPZmZzZXRzKFJl bmRlckJsb2NrKiBibG9jaywgYm9vbCBpc0ZpcnN0TGluZSkKKyAgICA6IG1fYmxvY2soYmxvY2sp CisgICAgLCBtX2xlZnQoMCkKKyAgICAsIG1fcmlnaHQoMCkKKyAgICAsIG1faXNGaXJzdExpbmUo aXNGaXJzdExpbmUpCit7CisgICAgQVNTRVJUKGJsb2NrKTsKKyAgICB1cGRhdGUoKTsKK30KKwor aW5saW5lIHZvaWQgTGluZU9mZnNldHM6OnVwZGF0ZSgpCit7CisgICAgaW50IGhlaWdodCA9IG1f YmxvY2stPmxvZ2ljYWxIZWlnaHQoKTsKKyAgICBtX2xlZnQgPSBtX2Jsb2NrLT5sb2dpY2FsTGVm dE9mZnNldEZvckxpbmUoaGVpZ2h0LCBtX2lzRmlyc3RMaW5lKTsKKyAgICBtX3JpZ2h0ID0gbV9i bG9jay0+bG9naWNhbFJpZ2h0T2Zmc2V0Rm9yTGluZShoZWlnaHQsIG1faXNGaXJzdExpbmUpOwor fQorCitpbmxpbmUgdm9pZCBMaW5lT2Zmc2V0czo6c2hyaW5rV2lkdGhGb3JOZXdGbG9hdElmTmVl ZGVkKFJlbmRlckJsb2NrOjpGbG9hdGluZ09iamVjdCogbmV3RmxvYXQpCit7CisgICAgaW50IGhl aWdodCA9IG1fYmxvY2stPmxvZ2ljYWxIZWlnaHQoKTsKKyAgICBpZiAoaGVpZ2h0IDwgbV9ibG9j ay0+bG9naWNhbFRvcEZvckZsb2F0KG5ld0Zsb2F0KSB8fCBoZWlnaHQgPj0gbV9ibG9jay0+bG9n aWNhbEJvdHRvbUZvckZsb2F0KG5ld0Zsb2F0KSkKKyAgICAgICAgcmV0dXJuOworCisgICAgaWYg KG5ld0Zsb2F0LT50eXBlKCkgPT0gUmVuZGVyQmxvY2s6OkZsb2F0aW5nT2JqZWN0OjpGbG9hdExl ZnQpCisgICAgICAgIG1fbGVmdCA9IG1fYmxvY2stPmxvZ2ljYWxSaWdodEZvckZsb2F0KG5ld0Zs b2F0KTsKKyAgICBlbHNlCisgICAgICAgIG1fcmlnaHQgPSBtX2Jsb2NrLT5sb2dpY2FsTGVmdEZv ckZsb2F0KG5ld0Zsb2F0KTsKK30KKwogSW5saW5lSXRlcmF0b3IgUmVuZGVyQmxvY2s6OmZpbmRO ZXh0TGluZUJyZWFrKElubGluZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIsIGJvb2wgZmlyc3RMaW5l LCBib29sJiBpc0xpbmVFbXB0eSwgTGluZUJyZWFrSXRlcmF0b3JJbmZvJiBsaW5lQnJlYWtJdGVy YXRvckluZm8sIGJvb2wmIHByZXZpb3VzTGluZUJyb2tlQ2xlYW5seSwgCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYm9vbCYgaHlwaGVuYXRlZCwgRUNsZWFy KiBjbGVhciwgRmxvYXRpbmdPYmplY3QqIGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUsIFZlY3Rv cjxSZW5kZXJCb3gqPiYgcG9zaXRpb25lZEJveGVzKQogewpAQCAtMTU4MiwxMSArMTYxMCwxMCBA QCBJbmxpbmVJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lCiAKICAgICBib29sIGFw cGxpZWRTdGFydFdpZHRoID0gcmVzb2x2ZXIucG9zaXRpb24oKS5tX3BvcyA+IDA7CiAgICAgTGlu ZU1pZHBvaW50U3RhdGUmIGxpbmVNaWRwb2ludFN0YXRlID0gcmVzb2x2ZXIubWlkcG9pbnRTdGF0 ZSgpOwotICAgIAotICAgIGludCBibG9ja09mZnNldCA9IGxvZ2ljYWxIZWlnaHQoKTsKLSAgICBM aW5lT2Zmc2V0cyBsaW5lT2Zmc2V0cyhsb2dpY2FsTGVmdE9mZnNldEZvckxpbmUoYmxvY2tPZmZz ZXQsIGZpcnN0TGluZSksIGxvZ2ljYWxSaWdodE9mZnNldEZvckxpbmUoYmxvY2tPZmZzZXQsIGZp cnN0TGluZSkpOwogCi0gICAgc2tpcExlYWRpbmdXaGl0ZXNwYWNlKHJlc29sdmVyLCBmaXJzdExp bmUsIGlzTGluZUVtcHR5LCBwcmV2aW91c0xpbmVCcm9rZUNsZWFubHksIGxhc3RGbG9hdEZyb21Q cmV2aW91c0xpbmUsIGxpbmVPZmZzZXRzKTsKKyAgICBMaW5lT2Zmc2V0cyBsaW5lT2Zmc2V0cyh0 aGlzLCBmaXJzdExpbmUpOworCisgICAgc2tpcExlYWRpbmdXaGl0ZXNwYWNlKHJlc29sdmVyLCBp c0xpbmVFbXB0eSwgcHJldmlvdXNMaW5lQnJva2VDbGVhbmx5LCBsYXN0RmxvYXRGcm9tUHJldmlv dXNMaW5lLCBsaW5lT2Zmc2V0cyk7CiAKICAgICBmbG9hdCB3aWR0aCA9IGxpbmVPZmZzZXRzLndp ZHRoKCk7CiAgICAgZmxvYXQgdyA9IDA7CkBAIC0xNjgyLDcgKzE3MDksNyBAQCBJbmxpbmVJdGVy YXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lCiAgICAgICAgICAgICAgICAgLy8gSWYgaXQg ZG9lcywgcG9zaXRpb24gaXQgbm93LCBvdGhlcndpc2UsIHBvc2l0aW9uCiAgICAgICAgICAgICAg ICAgLy8gaXQgYWZ0ZXIgbW92aW5nIHRvIG5leHQgbGluZSAoaW4gbmV3TGluZSgpIGZ1bmMpCiAg ICAgICAgICAgICAgICAgaWYgKGZsb2F0c0ZpdE9uTGluZSAmJiBsb2dpY2FsV2lkdGhGb3JGbG9h dChmKSArIHcgKyB0bXBXIDw9IHdpZHRoKSB7Ci0gICAgICAgICAgICAgICAgICAgIHBvc2l0aW9u TmV3RmxvYXRPbkxpbmUoZiwgbGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZSwgZmlyc3RMaW5lLCBs aW5lT2Zmc2V0cyk7CisgICAgICAgICAgICAgICAgICAgIHBvc2l0aW9uTmV3RmxvYXRPbkxpbmUo ZiwgbGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZSwgbGluZU9mZnNldHMpOwogICAgICAgICAgICAg ICAgICAgICB3aWR0aCA9IGxpbmVPZmZzZXRzLndpZHRoKCkgKyB0b3RhbE92ZXJoYW5nV2lkdGg7 CiAgICAgICAgICAgICAgICAgICAgIGlmIChsQnJlYWsubV9vYmogPT0gbykgewogICAgICAgICAg ICAgICAgICAgICAgICAgQVNTRVJUKCFsQnJlYWsubV9wb3MpOwpAQCAtMjI2OSwyMiArMjI5Niwx NSBAQCB2b2lkIFJlbmRlckJsb2NrOjpjaGVja0xpbmVzRm9yVGV4dE92ZXJmCiAgICAgfQogfQog Ci1ib29sIFJlbmRlckJsb2NrOjpwb3NpdGlvbk5ld0Zsb2F0T25MaW5lKEZsb2F0aW5nT2JqZWN0 KiBuZXdGbG9hdCwgRmxvYXRpbmdPYmplY3QqIGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUsIGJv b2wgZmlyc3RMaW5lLCBMaW5lT2Zmc2V0cyYgbGluZU9mZnNldHMpCitib29sIFJlbmRlckJsb2Nr Ojpwb3NpdGlvbk5ld0Zsb2F0T25MaW5lKEZsb2F0aW5nT2JqZWN0KiBuZXdGbG9hdCwgRmxvYXRp bmdPYmplY3QqIGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUsIExpbmVPZmZzZXRzJiBsaW5lT2Zm c2V0cykKIHsKLSAgICBib29sIGRpZFBvc2l0aW9uID0gcG9zaXRpb25OZXdGbG9hdHMoKTsKLSAg ICBpZiAoIWRpZFBvc2l0aW9uKQotICAgICAgICByZXR1cm4gZGlkUG9zaXRpb247Ci0KLSAgICBp bnQgYmxvY2tPZmZzZXQgPSBsb2dpY2FsSGVpZ2h0KCk7Ci0gICAgaWYgKGJsb2NrT2Zmc2V0ID49 IGxvZ2ljYWxUb3BGb3JGbG9hdChuZXdGbG9hdCkgJiYgYmxvY2tPZmZzZXQgPCBsb2dpY2FsQm90 dG9tRm9yRmxvYXQobmV3RmxvYXQpKSB7Ci0gICAgICAgIGlmIChuZXdGbG9hdC0+dHlwZSgpID09 IEZsb2F0aW5nT2JqZWN0OjpGbG9hdExlZnQpCi0gICAgICAgICAgICBsaW5lT2Zmc2V0cy5zZXRM ZWZ0KGxvZ2ljYWxSaWdodEZvckZsb2F0KG5ld0Zsb2F0KSk7Ci0gICAgICAgIGVsc2UKLSAgICAg ICAgICAgIGxpbmVPZmZzZXRzLnNldFJpZ2h0KGxvZ2ljYWxMZWZ0Rm9yRmxvYXQobmV3RmxvYXQp KTsKLSAgICB9CisgICAgaWYgKCFwb3NpdGlvbk5ld0Zsb2F0cygpKQorICAgICAgICByZXR1cm4g ZmFsc2U7CisKKyAgICBsaW5lT2Zmc2V0cy5zaHJpbmtXaWR0aEZvck5ld0Zsb2F0SWZOZWVkZWQo bmV3RmxvYXQpOwogCiAgICAgaWYgKCFuZXdGbG9hdC0+bV9wYWdpbmF0aW9uU3RydXQpCi0gICAg ICAgIHJldHVybiBkaWRQb3NpdGlvbjsKKyAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBGbG9h dGluZ09iamVjdFNldCYgZmxvYXRpbmdPYmplY3RTZXQgPSBtX2Zsb2F0aW5nT2JqZWN0cy0+c2V0 KCk7CiAgICAgQVNTRVJUKGZsb2F0aW5nT2JqZWN0U2V0Lmxhc3QoKSA9PSBuZXdGbG9hdCk7CkBA IC0yMjkzLDcgKzIzMTMsNyBAQCBib29sIFJlbmRlckJsb2NrOjpwb3NpdGlvbk5ld0Zsb2F0T25M aW5lCiAgICAgaW50IHBhZ2luYXRpb25TdHJ1dCA9IG5ld0Zsb2F0LT5tX3BhZ2luYXRpb25TdHJ1 dDsKIAogICAgIGlmIChmbG9hdExvZ2ljYWxUb3AgLSBwYWdpbmF0aW9uU3RydXQgIT0gbG9naWNh bEhlaWdodCgpKQotICAgICAgICByZXR1cm4gZGlkUG9zaXRpb247CisgICAgICAgIHJldHVybiB0 cnVlOwogCiAgICAgRmxvYXRpbmdPYmplY3RTZXRJdGVyYXRvciBpdCA9IGZsb2F0aW5nT2JqZWN0 U2V0LmVuZCgpOwogICAgIC0taXQ7IC8vIExhc3QgZmxvYXQgaXMgbmV3RmxvYXQsIHNraXAgdGhh dCBvbmUuCkBAIC0yMzE1LDExICsyMzM1LDEwIEBAIGJvb2wgUmVuZGVyQmxvY2s6OnBvc2l0aW9u TmV3RmxvYXRPbkxpbmUKICAgICAgICAgfQogICAgIH0KIAotICAgIHNldExvZ2ljYWxIZWlnaHQo YmxvY2tPZmZzZXQgKyBwYWdpbmF0aW9uU3RydXQpOwotICAgIGxpbmVPZmZzZXRzLnNldExlZnQo bG9naWNhbExlZnRPZmZzZXRGb3JMaW5lKGxvZ2ljYWxIZWlnaHQoKSwgZmlyc3RMaW5lKSk7Ci0g ICAgbGluZU9mZnNldHMuc2V0UmlnaHQobG9naWNhbFJpZ2h0T2Zmc2V0Rm9yTGluZShsb2dpY2Fs SGVpZ2h0KCksIGZpcnN0TGluZSkpOworICAgIHNldExvZ2ljYWxIZWlnaHQobG9naWNhbEhlaWdo dCgpICsgcGFnaW5hdGlvblN0cnV0KTsKKyAgICBsaW5lT2Zmc2V0cy51cGRhdGUoKTsKIAotICAg IHJldHVybiBkaWRQb3NpdGlvbjsKKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAogfQo=