62144 2011-06-06 13:41:26 -0700 Convert hitTest to IntPoint 2011-06-06 15:13:25 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 62145 1 eae eae ap eric leviw simon.fraser webkit.review.bot oldest_to_newest 415980 0 eae 2011-06-06 13:41:26 -0700 Ongoing tx, ty removal. 416018 1 96125 eae 2011-06-06 14:40:32 -0700 Created attachment 96125 Patch 416051 2 96125 webkit.review.bot 2011-06-06 15:13:20 -0700 Comment on attachment 96125 Patch Clearing flags on attachment: 96125 Committed r88195: <http://trac.webkit.org/changeset/88195> 416052 3 webkit.review.bot 2011-06-06 15:13:25 -0700 All reviewed patches have been landed. Closing bug. 96125 2011-06-06 14:40:32 -0700 2011-06-06 15:13:20 -0700 Patch bug-62144-20110606144031.patch text/plain 12545 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4MTkwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzIgQEAKKzIwMTEtMDYtMDYgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIENvbnZlcnQgaGl0VGVzdCB0byBJbnRQb2ludAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjIxNDQKKworICAgICAgICBD b3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcmVuZGVyaW5nL0lubGluZUJv eC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVCb3g6Om5vZGVBdFBvaW50KToKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy QmxvY2s6OmhpdFRlc3RGbG9hdHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6Omhp dFRlc3RDb250ZW50cyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJJbmxpbmU6Om5vZGVBdFBvaW50KToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6 OmhpdFRlc3RDb250ZW50cyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmg6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cmVuZGVyQm94TG9jYXRpb24pOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnJlbmRlckJveFgpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyTGF5ZXI6OnJlbmRlckJveFkpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMaW5l Qm94TGlzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMaW5lQm94TGlzdDo6aGl0VGVz dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxpbmVCb3hMaXN0Lmg6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmpl Y3Q6OmhpdFRlc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuaDoKKwogMjAx MS0wNi0wNiAgTGV2aSBXZWludHJhdWIgIDxsZXZpd0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv SW5saW5lQm94LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5s aW5lQm94LmNwcAkocmV2aXNpb24gODgxODYpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv SW5saW5lQm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI1LDcgKzIyNSw3IEBAIGJvb2wgSW5s aW5lQm94Ojpub2RlQXRQb2ludChjb25zdCBIaXRUZXMKICAgICAvLyBIaXQgdGVzdCBhbGwgcGhh c2VzIG9mIHJlcGxhY2VkIGVsZW1lbnRzIGF0b21pY2FsbHksIGFzIHRob3VnaCB0aGUgcmVwbGFj ZWQgZWxlbWVudCBlc3RhYmxpc2hlZCBpdHMKICAgICAvLyBvd24gc3RhY2tpbmcgY29udGV4dC4g IChTZWUgQXBwZW5kaXggRS4yLCBzZWN0aW9uIDYuNCBvbiBpbmxpbmUgYmxvY2svdGFibGUgZWxl bWVudHMgaW4gdGhlIENTUzIuMQogICAgIC8vIHNwZWNpZmljYXRpb24uKQotICAgIHJldHVybiBy ZW5kZXJlcigpLT5oaXRUZXN0KHJlcXVlc3QsIHJlc3VsdCwgcG9pbnRJbkNvbnRhaW5lciwgdHgs IHR5KTsKKyAgICByZXR1cm4gcmVuZGVyZXIoKS0+aGl0VGVzdChyZXF1ZXN0LCByZXN1bHQsIHBv aW50SW5Db250YWluZXIsIEludFBvaW50KHR4LCB0eSkpOwogfQogCiBjb25zdCBSb290SW5saW5l Qm94KiBJbmxpbmVCb3g6OnJvb3QoKSBjb25zdApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiA4ODE4NikKKysrIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM5NzUsNyArMzk3NSw3 IEBAIGJvb2wgUmVuZGVyQmxvY2s6OmhpdFRlc3RGbG9hdHMoY29uc3QgSGkKICAgICAgICAgICAg IGludCB4T2Zmc2V0ID0geFBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4oZmxvYXRpbmdP YmplY3QpIC0gZmxvYXRpbmdPYmplY3QtPm1fcmVuZGVyZXItPngoKTsKICAgICAgICAgICAgIGlu dCB5T2Zmc2V0ID0geVBvc2l0aW9uRm9yRmxvYXRJbmNsdWRpbmdNYXJnaW4oZmxvYXRpbmdPYmpl Y3QpIC0gZmxvYXRpbmdPYmplY3QtPm1fcmVuZGVyZXItPnkoKTsKICAgICAgICAgICAgIEludFBv aW50IGNoaWxkUG9pbnQgPSBmbGlwRmxvYXRGb3JXcml0aW5nTW9kZShmbG9hdGluZ09iamVjdCwg SW50UG9pbnQodHggKyB4T2Zmc2V0LCB0eSArIHlPZmZzZXQpKTsKLSAgICAgICAgICAgIGlmIChm bG9hdGluZ09iamVjdC0+bV9yZW5kZXJlci0+aGl0VGVzdChyZXF1ZXN0LCByZXN1bHQsIHBvaW50 SW5Db250YWluZXIsIGNoaWxkUG9pbnQueCgpLCBjaGlsZFBvaW50LnkoKSkpIHsKKyAgICAgICAg ICAgIGlmIChmbG9hdGluZ09iamVjdC0+bV9yZW5kZXJlci0+aGl0VGVzdChyZXF1ZXN0LCByZXN1 bHQsIHBvaW50SW5Db250YWluZXIsIGNoaWxkUG9pbnQpKSB7CiAgICAgICAgICAgICAgICAgdXBk YXRlSGl0VGVzdFJlc3VsdChyZXN1bHQsIHBvaW50SW5Db250YWluZXIgLSB0b1NpemUoY2hpbGRQ b2ludCkpOwogICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICAgICAgfQpAQCAt NDAzNiw3ICs0MDM2LDcgQEAgYm9vbCBSZW5kZXJCbG9jazo6aGl0VGVzdENvbnRlbnRzKGNvbnN0 IAogewogICAgIGlmIChjaGlsZHJlbklubGluZSgpICYmICFpc1RhYmxlKCkpIHsKICAgICAgICAg Ly8gV2UgaGF2ZSB0byBoaXQtdGVzdCBvdXIgbGluZSBib3hlcy4KLSAgICAgICAgaWYgKG1fbGlu ZUJveGVzLmhpdFRlc3QodGhpcywgcmVxdWVzdCwgcmVzdWx0LCBwb2ludEluQ29udGFpbmVyLCB0 eCwgdHksIGhpdFRlc3RBY3Rpb24pKQorICAgICAgICBpZiAobV9saW5lQm94ZXMuaGl0VGVzdCh0 aGlzLCByZXF1ZXN0LCByZXN1bHQsIHBvaW50SW5Db250YWluZXIsIEludFBvaW50KHR4LCB0eSks IGhpdFRlc3RBY3Rpb24pKQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfSBlbHNlIHsK ICAgICAgICAgLy8gSGl0IHRlc3Qgb3VyIGNoaWxkcmVuLgpJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAJKHJldmlzaW9uIDg4MTg2KQorKysgU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcxNCw3 ICs3MTQsNyBAQCBjb25zdCBjaGFyKiBSZW5kZXJJbmxpbmU6OnJlbmRlck5hbWUoKSBjCiBib29s IFJlbmRlcklubGluZTo6bm9kZUF0UG9pbnQoY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVlc3Qs IEhpdFRlc3RSZXN1bHQmIHJlc3VsdCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgSW50UG9pbnQmIHBvaW50SW5Db250YWluZXIsIGludCB0eCwgaW50IHR5LCBIaXRUZXN0 QWN0aW9uIGhpdFRlc3RBY3Rpb24pCiB7Ci0gICAgcmV0dXJuIG1fbGluZUJveGVzLmhpdFRlc3Qo dGhpcywgcmVxdWVzdCwgcmVzdWx0LCBwb2ludEluQ29udGFpbmVyLCB0eCwgdHksIGhpdFRlc3RB Y3Rpb24pOworICAgIHJldHVybiBtX2xpbmVCb3hlcy5oaXRUZXN0KHRoaXMsIHJlcXVlc3QsIHJl c3VsdCwgcG9pbnRJbkNvbnRhaW5lciwgSW50UG9pbnQodHgsIHR5KSwgaGl0VGVzdEFjdGlvbik7 CiB9CiAKIFZpc2libGVQb3NpdGlvbiBSZW5kZXJJbmxpbmU6OnBvc2l0aW9uRm9yUG9pbnQoY29u c3QgSW50UG9pbnQmIHBvaW50KQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXIuY3BwCShyZXZpc2lvbiA4ODE4NikKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJMYXllci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxMzcsOCArMzEzNyw3IEBAIFJlbmRl ckxheWVyKiBSZW5kZXJMYXllcjo6aGl0VGVzdExheWVyKFIKIGJvb2wgUmVuZGVyTGF5ZXI6Omhp dFRlc3RDb250ZW50cyhjb25zdCBIaXRUZXN0UmVxdWVzdCYgcmVxdWVzdCwgSGl0VGVzdFJlc3Vs dCYgcmVzdWx0LCBjb25zdCBJbnRSZWN0JiBsYXllckJvdW5kcywgY29uc3QgSW50UG9pbnQmIGhp dFRlc3RQb2ludCwgSGl0VGVzdEZpbHRlciBoaXRUZXN0RmlsdGVyKSBjb25zdAogewogICAgIGlm ICghcmVuZGVyZXIoKS0+aGl0VGVzdChyZXF1ZXN0LCByZXN1bHQsIGhpdFRlc3RQb2ludCwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICBsYXllckJvdW5kcy54KCkgLSByZW5kZXJCb3hYKCks Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgbGF5ZXJCb3VuZHMueSgpIC0gcmVuZGVyQm94 WSgpLCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB0b1BvaW50KGxheWVyQm91bmRzLmxv Y2F0aW9uKCkgLSByZW5kZXJCb3hMb2NhdGlvbigpKSwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBoaXRUZXN0RmlsdGVyKSkgewogICAgICAgICAvLyBJdCdzIHdyb25nIHRvIHNldCBpbm5l ck5vZGUsIGJ1dCB0aGVuIGNsYWltIHRoYXQgeW91IGRpZG4ndCBoaXQgYW55dGhpbmcsIHVubGVz cyBpdCBpcwogICAgICAgICAvLyBhIHJlY3QtYmFzZWQgdGVzdC4KSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllci5oCShyZXZpc2lvbiA4ODE4NikKKysrIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCSh3b3JraW5nIGNvcHkpCkBAIC00NTksOCArNDU5 LDkgQEAgcHJpdmF0ZToKICAgICB2b2lkIHNldEZpcnN0Q2hpbGQoUmVuZGVyTGF5ZXIqIGZpcnN0 KSB7IG1fZmlyc3QgPSBmaXJzdDsgfQogICAgIHZvaWQgc2V0TGFzdENoaWxkKFJlbmRlckxheWVy KiBsYXN0KSB7IG1fbGFzdCA9IGxhc3Q7IH0KIAotICAgIGludCByZW5kZXJCb3hYKCkgY29uc3Qg eyByZXR1cm4gcmVuZGVyZXIoKS0+aXNCb3goKSA/IHRvUmVuZGVyQm94KHJlbmRlcmVyKCkpLT54 KCkgOiAwOyB9Ci0gICAgaW50IHJlbmRlckJveFkoKSBjb25zdCB7IHJldHVybiByZW5kZXJlcigp LT5pc0JveCgpID8gdG9SZW5kZXJCb3gocmVuZGVyZXIoKSktPnkoKSA6IDA7IH0KKyAgICBJbnRQ b2ludCByZW5kZXJCb3hMb2NhdGlvbigpIGNvbnN0IHsgcmV0dXJuIHJlbmRlcmVyKCktPmlzQm94 KCkgPyB0b1JlbmRlckJveChyZW5kZXJlcigpKS0+bG9jYXRpb24oKSA6IEludFBvaW50KCk7IH0K KyAgICBpbnQgcmVuZGVyQm94WCgpIGNvbnN0IHsgcmV0dXJuIHJlbmRlckJveExvY2F0aW9uKCku eCgpOyB9CisgICAgaW50IHJlbmRlckJveFkoKSBjb25zdCB7IHJldHVybiByZW5kZXJCb3hMb2Nh dGlvbigpLnkoKTsgfQogCiAgICAgdm9pZCBjb2xsZWN0TGF5ZXJzKFZlY3RvcjxSZW5kZXJMYXll cio+KiYsIFZlY3RvcjxSZW5kZXJMYXllcio+KiYpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGluZUJveExpc3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMaW5lQm94TGlzdC5jcHAJKHJldmlzaW9uIDg4MTg2KQorKysg U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpbmVCb3hMaXN0LmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjc0LDcgKzI3NCw3IEBAIHZvaWQgUmVuZGVyTGluZUJveExpc3Q6OnBhaW50KFJl bmRlckJveE0KIH0KIAogCi1ib29sIFJlbmRlckxpbmVCb3hMaXN0OjpoaXRUZXN0KFJlbmRlckJv eE1vZGVsT2JqZWN0KiByZW5kZXJlciwgY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVlc3QsIEhp dFRlc3RSZXN1bHQmIHJlc3VsdCwgY29uc3QgSW50UG9pbnQmIHBvaW50SW5Db250YWluZXIsIGlu dCB0eCwgaW50IHR5LCBIaXRUZXN0QWN0aW9uIGhpdFRlc3RBY3Rpb24pIGNvbnN0Citib29sIFJl bmRlckxpbmVCb3hMaXN0OjpoaXRUZXN0KFJlbmRlckJveE1vZGVsT2JqZWN0KiByZW5kZXJlciwg Y29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVlc3QsIEhpdFRlc3RSZXN1bHQmIHJlc3VsdCwgY29u c3QgSW50UG9pbnQmIHBvaW50SW5Db250YWluZXIsIGNvbnN0IEludFBvaW50JiBhY2N1bXVsYXRl ZE9mZnNldCwgSGl0VGVzdEFjdGlvbiBoaXRUZXN0QWN0aW9uKSBjb25zdAogewogICAgIGlmICho aXRUZXN0QWN0aW9uICE9IEhpdFRlc3RGb3JlZ3JvdW5kKQogICAgICAgICByZXR1cm4gZmFsc2U7 CkBAIC0yODksNyArMjg5LDcgQEAgYm9vbCBSZW5kZXJMaW5lQm94TGlzdDo6aGl0VGVzdChSZW5k ZXJCbwogICAgICAgICBJbnRSZWN0KHBvaW50SW5Db250YWluZXIueCgpLCBwb2ludEluQ29udGFp bmVyLnkoKSAtIHJlc3VsdC50b3BQYWRkaW5nKCksIDEsIHJlc3VsdC50b3BQYWRkaW5nKCkgKyBy ZXN1bHQuYm90dG9tUGFkZGluZygpICsgMSkgOgogICAgICAgICBJbnRSZWN0KHBvaW50SW5Db250 YWluZXIueCgpIC0gcmVzdWx0LmxlZnRQYWRkaW5nKCksIHBvaW50SW5Db250YWluZXIueSgpLCBy ZXN1bHQucmlnaHRQYWRkaW5nKCkgKyByZXN1bHQubGVmdFBhZGRpbmcoKSArIDEsIDEpOwogCi0g ICAgaWYgKCFhbnlMaW5lSW50ZXJzZWN0c1JlY3QocmVuZGVyZXIsIHJlY3QsIEludFBvaW50KHR4 LCB0eSkpKQorICAgIGlmICghYW55TGluZUludGVyc2VjdHNSZWN0KHJlbmRlcmVyLCByZWN0LCBh Y2N1bXVsYXRlZE9mZnNldCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIFNlZSBp ZiBvdXIgcm9vdCBsaW5lcyBjb250YWluIHRoZSBwb2ludC4gIElmIHNvLCB0aGVuIHdlIGhpdCB0 ZXN0CkBAIC0yOTcsMTAgKzI5NywxMCBAQCBib29sIFJlbmRlckxpbmVCb3hMaXN0OjpoaXRUZXN0 KFJlbmRlckJvCiAgICAgLy8gYmFzZWQgb2ZmIHBvc2l0aW9ucyBvZiBvdXIgZmlyc3QgbGluZSBi b3ggb3Igb3VyIGxhc3QgbGluZSBib3guCiAgICAgZm9yIChJbmxpbmVGbG93Qm94KiBjdXJyID0g bGFzdExpbmVCb3goKTsgY3VycjsgY3VyciA9IGN1cnItPnByZXZMaW5lQm94KCkpIHsKICAgICAg ICAgUm9vdElubGluZUJveCogcm9vdCA9IGN1cnItPnJvb3QoKTsKLSAgICAgICAgaWYgKHJhbmdl SW50ZXJzZWN0c1JlY3QocmVuZGVyZXIsIGN1cnItPmxvZ2ljYWxUb3BWaXN1YWxPdmVyZmxvdyhy b290LT5saW5lVG9wKCkpLCBjdXJyLT5sb2dpY2FsQm90dG9tVmlzdWFsT3ZlcmZsb3cocm9vdC0+ bGluZUJvdHRvbSgpKSwgcmVjdCwgSW50UG9pbnQodHgsIHR5KSkpIHsKLSAgICAgICAgICAgIGJv b2wgaW5zaWRlID0gY3Vyci0+bm9kZUF0UG9pbnQocmVxdWVzdCwgcmVzdWx0LCBwb2ludEluQ29u dGFpbmVyLCB0eCwgdHksIHJvb3QtPmxpbmVUb3AoKSwgcm9vdC0+bGluZUJvdHRvbSgpKTsKKyAg ICAgICAgaWYgKHJhbmdlSW50ZXJzZWN0c1JlY3QocmVuZGVyZXIsIGN1cnItPmxvZ2ljYWxUb3BW aXN1YWxPdmVyZmxvdyhyb290LT5saW5lVG9wKCkpLCBjdXJyLT5sb2dpY2FsQm90dG9tVmlzdWFs T3ZlcmZsb3cocm9vdC0+bGluZUJvdHRvbSgpKSwgcmVjdCwgYWNjdW11bGF0ZWRPZmZzZXQpKSB7 CisgICAgICAgICAgICBib29sIGluc2lkZSA9IGN1cnItPm5vZGVBdFBvaW50KHJlcXVlc3QsIHJl c3VsdCwgcG9pbnRJbkNvbnRhaW5lciwgYWNjdW11bGF0ZWRPZmZzZXQueCgpLCBhY2N1bXVsYXRl ZE9mZnNldC55KCksIHJvb3QtPmxpbmVUb3AoKSwgcm9vdC0+bGluZUJvdHRvbSgpKTsKICAgICAg ICAgICAgIGlmIChpbnNpZGUpIHsKLSAgICAgICAgICAgICAgICByZW5kZXJlci0+dXBkYXRlSGl0 VGVzdFJlc3VsdChyZXN1bHQsIHBvaW50SW5Db250YWluZXIgLSBJbnRTaXplKHR4LCB0eSkpOwor ICAgICAgICAgICAgICAgIHJlbmRlcmVyLT51cGRhdGVIaXRUZXN0UmVzdWx0KHJlc3VsdCwgdG9Q b2ludChwb2ludEluQ29udGFpbmVyIC0gYWNjdW11bGF0ZWRPZmZzZXQpKTsKICAgICAgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpbmVCb3hMaXN0LmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpbmVCb3hMaXN0LmgJKHJldmlzaW9uIDg4MTg2 KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpbmVCb3hMaXN0LmgJKHdvcmtp bmcgY29weSkKQEAgLTY0LDcgKzY0LDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlydHlMaW5lc0Zy b21DaGFuZ2VkQ2hpbGQoUmVuZGVyT2JqZWN0KiBwYXJlbnQsIFJlbmRlck9iamVjdCogY2hpbGQp OwogCiAgICAgdm9pZCBwYWludChSZW5kZXJCb3hNb2RlbE9iamVjdCosIFBhaW50SW5mbyYsIGlu dCB4LCBpbnQgeSkgY29uc3Q7Ci0gICAgYm9vbCBoaXRUZXN0KFJlbmRlckJveE1vZGVsT2JqZWN0 KiwgY29uc3QgSGl0VGVzdFJlcXVlc3QmLCBIaXRUZXN0UmVzdWx0JiwgY29uc3QgSW50UG9pbnQm IHBvaW50SW5Db250YWluZXIsIGludCB0eCwgaW50IHR5LCBIaXRUZXN0QWN0aW9uKSBjb25zdDsK KyAgICBib29sIGhpdFRlc3QoUmVuZGVyQm94TW9kZWxPYmplY3QqLCBjb25zdCBIaXRUZXN0UmVx dWVzdCYsIEhpdFRlc3RSZXN1bHQmLCBjb25zdCBJbnRQb2ludCYgcG9pbnRJbkNvbnRhaW5lciwg Y29uc3QgSW50UG9pbnQmIGFjY3VtdWxhdGVkT2Zmc2V0LCBIaXRUZXN0QWN0aW9uKSBjb25zdDsK ICAgICAKIHByaXZhdGU6CiAgICAgYm9vbCBhbnlMaW5lSW50ZXJzZWN0c1JlY3QoUmVuZGVyQm94 TW9kZWxPYmplY3QqLCBjb25zdCBJbnRSZWN0JiwgY29uc3QgSW50UG9pbnQmLCBib29sIHVzZVBy aW50UmVjdCA9IGZhbHNlLCBpbnQgb3V0bGluZVNpemUgPSAwKSBjb25zdDsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCShyZXZpc2lvbiA4ODE4NikKKysr IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yMTQyLDI1ICsyMTQyLDI1IEBAIHZvaWQgUmVuZGVyT2JqZWN0Ojp1cGRhdGVEcmFnU3Rh dGUoYm9vbCAKICAgICAgICAgY3Vyci0+dXBkYXRlRHJhZ1N0YXRlKGRyYWdPbik7CiB9CiAKLWJv b2wgUmVuZGVyT2JqZWN0OjpoaXRUZXN0KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiByZXF1ZXN0LCBI aXRUZXN0UmVzdWx0JiByZXN1bHQsIGNvbnN0IEludFBvaW50JiBwb2ludEluQ29udGFpbmVyLCBp bnQgdHgsIGludCB0eSwgSGl0VGVzdEZpbHRlciBoaXRUZXN0RmlsdGVyKQorYm9vbCBSZW5kZXJP YmplY3Q6OmhpdFRlc3QoY29uc3QgSGl0VGVzdFJlcXVlc3QmIHJlcXVlc3QsIEhpdFRlc3RSZXN1 bHQmIHJlc3VsdCwgY29uc3QgSW50UG9pbnQmIHBvaW50SW5Db250YWluZXIsIGNvbnN0IEludFBv aW50JiBhY2N1bXVsYXRlZE9mZnNldCwgSGl0VGVzdEZpbHRlciBoaXRUZXN0RmlsdGVyKQogewog ICAgIGJvb2wgaW5zaWRlID0gZmFsc2U7CiAgICAgaWYgKGhpdFRlc3RGaWx0ZXIgIT0gSGl0VGVz dFNlbGYpIHsKICAgICAgICAgLy8gRmlyc3QgdGVzdCB0aGUgZm9yZWdyb3VuZCBsYXllciAobGlu ZXMgYW5kIGlubGluZXMpLgotICAgICAgICBpbnNpZGUgPSBub2RlQXRQb2ludChyZXF1ZXN0LCBy ZXN1bHQsIHBvaW50SW5Db250YWluZXIsIHR4LCB0eSwgSGl0VGVzdEZvcmVncm91bmQpOworICAg ICAgICBpbnNpZGUgPSBub2RlQXRQb2ludChyZXF1ZXN0LCByZXN1bHQsIHBvaW50SW5Db250YWlu ZXIsIGFjY3VtdWxhdGVkT2Zmc2V0LngoKSwgYWNjdW11bGF0ZWRPZmZzZXQueSgpLCBIaXRUZXN0 Rm9yZWdyb3VuZCk7CiAKICAgICAgICAgLy8gVGVzdCBmbG9hdHMgbmV4dC4KICAgICAgICAgaWYg KCFpbnNpZGUpCi0gICAgICAgICAgICBpbnNpZGUgPSBub2RlQXRQb2ludChyZXF1ZXN0LCByZXN1 bHQsIHBvaW50SW5Db250YWluZXIsIHR4LCB0eSwgSGl0VGVzdEZsb2F0KTsKKyAgICAgICAgICAg IGluc2lkZSA9IG5vZGVBdFBvaW50KHJlcXVlc3QsIHJlc3VsdCwgcG9pbnRJbkNvbnRhaW5lciwg YWNjdW11bGF0ZWRPZmZzZXQueCgpLCBhY2N1bXVsYXRlZE9mZnNldC55KCksIEhpdFRlc3RGbG9h dCk7CiAKICAgICAgICAgLy8gRmluYWxseSB0ZXN0IHRvIHNlZSBpZiB0aGUgbW91c2UgaXMgaW4g dGhlIGJhY2tncm91bmQgKHdpdGhpbiBhIGNoaWxkIGJsb2NrJ3MgYmFja2dyb3VuZCkuCiAgICAg ICAgIGlmICghaW5zaWRlKQotICAgICAgICAgICAgaW5zaWRlID0gbm9kZUF0UG9pbnQocmVxdWVz dCwgcmVzdWx0LCBwb2ludEluQ29udGFpbmVyLCB0eCwgdHksIEhpdFRlc3RDaGlsZEJsb2NrQmFj a2dyb3VuZHMpOworICAgICAgICAgICAgaW5zaWRlID0gbm9kZUF0UG9pbnQocmVxdWVzdCwgcmVz dWx0LCBwb2ludEluQ29udGFpbmVyLCBhY2N1bXVsYXRlZE9mZnNldC54KCksIGFjY3VtdWxhdGVk T2Zmc2V0LnkoKSwgSGl0VGVzdENoaWxkQmxvY2tCYWNrZ3JvdW5kcyk7CiAgICAgfQogCiAgICAg Ly8gU2VlIGlmIHRoZSBtb3VzZSBpcyBpbnNpZGUgdXMgYnV0IG5vdCBhbnkgb2Ygb3VyIGRlc2Nl bmRhbnRzCiAgICAgaWYgKGhpdFRlc3RGaWx0ZXIgIT0gSGl0VGVzdERlc2NlbmRhbnRzICYmICFp bnNpZGUpCi0gICAgICAgIGluc2lkZSA9IG5vZGVBdFBvaW50KHJlcXVlc3QsIHJlc3VsdCwgcG9p bnRJbkNvbnRhaW5lciwgdHgsIHR5LCBIaXRUZXN0QmxvY2tCYWNrZ3JvdW5kKTsKKyAgICAgICAg aW5zaWRlID0gbm9kZUF0UG9pbnQocmVxdWVzdCwgcmVzdWx0LCBwb2ludEluQ29udGFpbmVyLCBh Y2N1bXVsYXRlZE9mZnNldC54KCksIGFjY3VtdWxhdGVkT2Zmc2V0LnkoKSwgSGl0VGVzdEJsb2Nr QmFja2dyb3VuZCk7CiAKICAgICByZXR1cm4gaW5zaWRlOwogfQpJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAkocmV2aXNpb24gODgxODYpCisrKyBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTU0NSw3ICs1 NDUsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBjb2xsZWN0RGFzaGJvYXJkUmVnaW9ucyhWZWN0b3I8 RGFzaGJvYXJkUmVnaW9uVmFsdWU+Jik7CiAjZW5kaWYKIAotICAgIGJvb2wgaGl0VGVzdChjb25z dCBIaXRUZXN0UmVxdWVzdCYsIEhpdFRlc3RSZXN1bHQmLCBjb25zdCBJbnRQb2ludCYsIGludCB0 eCwgaW50IHR5LCBIaXRUZXN0RmlsdGVyID0gSGl0VGVzdEFsbCk7CisgICAgYm9vbCBoaXRUZXN0 KGNvbnN0IEhpdFRlc3RSZXF1ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNvbnN0IEludFBvaW50JiBw b2ludEluQ29udGFpbmVyLCBjb25zdCBJbnRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQsIEhpdFRl c3RGaWx0ZXIgPSBIaXRUZXN0QWxsKTsKICAgICB2aXJ0dWFsIGJvb2wgbm9kZUF0UG9pbnQoY29u c3QgSGl0VGVzdFJlcXVlc3QmLCBIaXRUZXN0UmVzdWx0JiwgY29uc3QgSW50UG9pbnQmIHBvaW50 SW5Db250YWluZXIsIGludCB0eCwgaW50IHR5LCBIaXRUZXN0QWN0aW9uKTsKICAgICB2aXJ0dWFs IHZvaWQgdXBkYXRlSGl0VGVzdFJlc3VsdChIaXRUZXN0UmVzdWx0JiwgY29uc3QgSW50UG9pbnQm KTsKIAo=