83148 2012-04-04 04:59:57 -0700 Best zoomable area does not balance intersection with target area. 2012-04-04 05:48:13 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 allan.jensen allan.jensen webkit.review.bot oldest_to_newest 595425 0 allan.jensen 2012-04-04 04:59:57 -0700 The algorithm for best zoomable area currently chooses the area with the largest intersection, and if more than one area has the same intersection area, chooses the smallest target area. This correctly chooses the smallest area when a touch is fully contained in the target area. But in cases where a small part of the touch is outside the targeted area, it will end up picking the background instead. To fix this, change the algorithm from a two step sort to one step sort that picks the best target using a formula that balances the smallest area and the largest intersection with each other. 595429 1 135561 allan.jensen 2012-04-04 05:03:34 -0700 Created attachment 135561 Patch 595431 2 135562 allan.jensen 2012-04-04 05:12:17 -0700 Created attachment 135562 Patch 595459 3 135562 webkit.review.bot 2012-04-04 05:48:09 -0700 Comment on attachment 135562 Patch Clearing flags on attachment: 135562 Committed r113179: <http://trac.webkit.org/changeset/113179> 595460 4 webkit.review.bot 2012-04-04 05:48:13 -0700 All reviewed patches have been landed. Closing bug. 135561 2012-04-04 05:03:34 -0700 2012-04-04 05:12:11 -0700 Patch bug-83148-20120404140355.patch text/plain 7017 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDc5MGMxODg2MTIyYmJm NzI5ZDQ3OTVjM2VlZTU1NDhlMTFkMjQ5Mi4uZTE2YTg1OGM1ODYwYTc5M2U3MmE2Mjk2MzIyNDRj YjE3MTJiNWI4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA0LTA0ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIEJl c3Qgem9vbWFibGUgYXJlYSBkb2VzIG5vdCBiYWxhbmNlIGludGVyc2VjdGlvbiB3aXRoIHRhcmdl dCBhcmVhLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODMxNDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBD aGFuZ2UgdGhlIHR3byBzdGVwIHNvcnQgdG8gc2ltcGx5IHBpY2tpbmcgdGhlIGJlc3QgcXVvdGll bnQgb2YgdG91Y2ggaW50ZXJzZWN0aW9uIHdpdGggdGFyZ2V0IGFyZWEuCisKKyAgICAgICAgKiBw YWdlL1RvdWNoQWRqdXN0bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpUb3VjaEFkanVzdG1l bnQ6OmRpc3RhbmNlU3F1YXJlZFRvVGFyZ2V0Q2VudGVyTGluZSk6CisgICAgICAgIChUb3VjaEFk anVzdG1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6VG91Y2hBZGp1c3RtZW50Ojp6b29tYWJsZUlu dGVyc2VjdGlvblF1b3RpZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlRvdWNoQWRqdXN0bWVudDo6 ZmluZE5vZGVXaXRoTG93ZXN0RGlzdGFuY2VNZXRyaWMpOgorICAgICAgICAoV2ViQ29yZTo6Zmlu ZEJlc3RDbGlja2FibGVDYW5kaWRhdGUpOgorICAgICAgICAoV2ViQ29yZTo6ZmluZEJlc3Rab29t YWJsZUFyZWEpOgorCiAyMDEyLTA0LTAyICBBbGxhbiBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5q ZW5zZW5Abm9raWEuY29tPgogCiAgICAgICAgIEFzc2VydHMgaW4gWE1MSHR0cFJlcXVlc3RQcm9n cmVzc0V2ZW50VGhyb3R0bGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVG91Y2hB ZGp1c3RtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVG91Y2hBZGp1c3RtZW50LmNwcApp bmRleCA5YTFlZmJiNTM0MzMzY2NjZGRlOTI4NzQxOTA2N2Q5NGNjMWI4NGM1Li41YTFiZjJiYjA2 ZTRmMmRhOTg5ZDgxNDg4YmYyZmIzMjRlOTU1MTE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wYWdlL1RvdWNoQWRqdXN0bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Ub3Vj aEFkanVzdG1lbnQuY3BwCkBAIC0yMTksMjMgKzIxOSwzMSBAQCBmbG9hdCBkaXN0YW5jZVNxdWFy ZWRUb1RhcmdldENlbnRlckxpbmUoY29uc3QgSW50UG9pbnQmIHRvdWNoSG90c3BvdCwgY29uc3Qg SW50UgogICAgIHJldHVybiByZWN0LmRpc3RhbmNlU3F1YXJlZEZyb21DZW50ZXJMaW5lVG9Qb2lu dCh0b3VjaEhvdHNwb3QpOwogfQogCi1mbG9hdCBhcmVhT2ZJbnRlcnNlY3Rpb24oY29uc3QgSW50 UG9pbnQmIHRvdWNoSG90c3BvdCwgY29uc3QgSW50UmVjdCYgdG91Y2hBcmVhLCBjb25zdCBTdWJ0 YXJnZXRHZW9tZXRyeSYgc3VidGFyZ2V0KQorCisvLyBUaGlzIHJldHVybnMgcXVvdGllbnQgb2Yg dGhlIHRhcmdldCBhcmVhIGFuZCBpdHMgaW50ZXJzZWN0aW9uIHdpdGggdGhlIHRvdWNoIGFyZWEu CisvLyBUaGlzIHdpbGwgcHJpb3JpdGl6ZSBsYXJnZXN0IGludGVyc2VjdGlvbiBhbmQgc21hbGxl c3QgYXJlYSwgd2hpbGUgYmFsYW5jaW5nIHRoZSB0d28gYWdhaW5zdCBlYWNoIG90aGVyLgorZmxv YXQgem9vbWFibGVJbnRlcnNlY3Rpb25RdW90aWVudChjb25zdCBJbnRQb2ludCYgdG91Y2hIb3Rz cG90LCBjb25zdCBJbnRSZWN0JiB0b3VjaEFyZWEsIGNvbnN0IFN1YnRhcmdldEdlb21ldHJ5JiBz dWJ0YXJnZXQpCiB7Ci0gICAgVU5VU0VEX1BBUkFNKHRvdWNoSG90c3BvdCk7CiAgICAgSW50UmVj dCByZWN0ID0gc3VidGFyZ2V0LmJvdW5kaW5nQm94KCk7CiAKICAgICAvLyBDb252ZXJ0IGZyb20g ZnJhbWUgY29vcmRpbmF0ZXMgdG8gd2luZG93IGNvb3JkaW5hdGVzLgogICAgIHJlY3QgPSBzdWJ0 YXJnZXQubm9kZSgpLT5kb2N1bWVudCgpLT52aWV3KCktPmNvbnRlbnRzVG9XaW5kb3cocmVjdCk7 Ci0gICAgcmVjdC5pbnRlcnNlY3QodG91Y2hBcmVhKTsKIAotICAgIHJldHVybiByZWN0LnNpemUo KS5hcmVhKCk7CisgICAgLy8gQ2hlY2sgdGhlIHJlY3RhbmdsZSBpcyBtZWFuaW5nZnVsIHpvb20g dGFyZ2V0LiBJdCBzaG91bGQgYXQgbGVhc3QgY29udGFpbiB0aGUgaG90c3BvdC4KKyAgICBpZiAo IXJlY3QuY29udGFpbnModG91Y2hIb3RzcG90KSkKKyAgICAgICAgcmV0dXJuIElORklOSVRZOwor ICAgIEludFJlY3QgaW50ZXJzZWN0aW9uID0gcmVjdDsKKyAgICBpbnRlcnNlY3Rpb24uaW50ZXJz ZWN0KHRvdWNoQXJlYSk7CisKKyAgICAvLyBSZXR1cm4gdGhlIHF1b3RpZW50IG9mIHRoZSBpbnRl cnNlY3Rpb24uCisgICAgcmV0dXJuIHJlY3Quc2l6ZSgpLmFyZWEoKSAvIChmbG9hdClpbnRlcnNl Y3Rpb24uc2l6ZSgpLmFyZWEoKTsKIH0KIAogCiAvLyBBIGdlbmVyaWMgZnVuY3Rpb24gZm9yIGZp bmRpbmcgdGhlIHRhcmdldCBub2RlIHdpdGggdGhlIGxvd2VzdCBkaXN0YW5jZSBtZXRyaWMuIEEg ZGlzdGFuY2UgbWV0cmljIGhlcmUgaXMgdGhlIHJlc3VsdAogLy8gb2YgYSBkaXN0YW5jZS1saWtl IGZ1bmN0aW9uLCB0aGF0IGNvbXB1dGVzIGhvdyB3ZWxsIHRoZSB0b3VjaCBoaXRzIHRoZSBub2Rl LgogLy8gRGlzdGFuY2UgZnVuY3Rpb25zIGNvdWxkIGZvciBpbnN0YW5jZSBiZSBkaXN0YW5jZSBz cXVhcmVkIG9yIGFyZWEgb2YgaW50ZXJzZWN0aW9uLgotYm9vbCBmaW5kTm9kZVdpdGhMb3dlc3RE aXN0YW5jZU1ldHJpYyhOb2RlKiYgdGFyZ2V0Tm9kZSwgSW50UG9pbnQmIHRhcmdldFBvaW50LCBj b25zdCBJbnRQb2ludCYgdG91Y2hIb3RzcG90LCBjb25zdCBJbnRSZWN0JiB0b3VjaEFyZWEsIFN1 YnRhcmdldEdlb21ldHJ5TGlzdCYgc3VidGFyZ2V0cywgRGlzdGFuY2VGdW5jdGlvbiBkaXN0YW5j ZUZ1bmN0aW9uKQorYm9vbCBmaW5kTm9kZVdpdGhMb3dlc3REaXN0YW5jZU1ldHJpYyhOb2RlKiYg dGFyZ2V0Tm9kZSwgSW50UG9pbnQmIHRhcmdldFBvaW50LCBJbnRSZWN0JiB0YXJnZXRBcmVhLCBj b25zdCBJbnRQb2ludCYgdG91Y2hIb3RzcG90LCBjb25zdCBJbnRSZWN0JiB0b3VjaEFyZWEsIFN1 YnRhcmdldEdlb21ldHJ5TGlzdCYgc3VidGFyZ2V0cywgRGlzdGFuY2VGdW5jdGlvbiBkaXN0YW5j ZUZ1bmN0aW9uKQogewogICAgIHRhcmdldE5vZGUgPSAwOwogICAgIGZsb2F0IGJlc3REaXN0YW5j ZU1ldHJpYyA9IElORklOSVRZOwpAQCAtMjQ2LDQwICsyNTQsMTQgQEAgYm9vbCBmaW5kTm9kZVdp dGhMb3dlc3REaXN0YW5jZU1ldHJpYyhOb2RlKiYgdGFyZ2V0Tm9kZSwgSW50UG9pbnQmIHRhcmdl dFBvaW50LAogICAgICAgICBmbG9hdCBkaXN0YW5jZU1ldHJpYyA9IGRpc3RhbmNlRnVuY3Rpb24o dG91Y2hIb3RzcG90LCB0b3VjaEFyZWEsICppdCk7CiAgICAgICAgIGlmIChkaXN0YW5jZU1ldHJp YyA8IGJlc3REaXN0YW5jZU1ldHJpYykgewogICAgICAgICAgICAgdGFyZ2V0UG9pbnQgPSByb3Vu ZGVkSW50UG9pbnQoaXQtPnF1YWQoKS5jZW50ZXIoKSk7CisgICAgICAgICAgICB0YXJnZXRBcmVh ID0gaXQtPmJvdW5kaW5nQm94KCk7CiAgICAgICAgICAgICB0YXJnZXROb2RlID0gbm9kZTsKICAg ICAgICAgICAgIGJlc3REaXN0YW5jZU1ldHJpYyA9IGRpc3RhbmNlTWV0cmljOwogICAgICAgICB9 IGVsc2UgaWYgKGRpc3RhbmNlTWV0cmljID09IGJlc3REaXN0YW5jZU1ldHJpYykgewogICAgICAg ICAgICAgLy8gVHJ5IHRvIGFsd2F5cyByZXR1cm4gdGhlIGlubmVyLW1vc3QgZWxlbWVudC4KLSAg ICAgICAgICAgIGlmIChub2RlLT5pc0Rlc2NlbmRhbnRPZih0YXJnZXROb2RlKSkKKyAgICAgICAg ICAgIGlmIChub2RlLT5pc0Rlc2NlbmRhbnRPZih0YXJnZXROb2RlKSkgewogICAgICAgICAgICAg ICAgIHRhcmdldE5vZGUgPSBub2RlOwotICAgICAgICB9Ci0gICAgfQotCi0gICAgcmV0dXJuICh0 YXJnZXROb2RlKTsKLX0KLQotLy8gU2ltaWxhciBnZW5lcmljIGZ1bmN0aW9uIGFzIGZpbmROb2Rl V2l0aExvd2VzdERpc3RhbmNlTWV0cmljLCBleGNlcHQgdGhpcyBmaW5kcyB0aGUgaW5uZXJtb3N0 IGFyZWEgd2l0aCB0aGUgbGFyZ2VzdCBpbnRlcnNlY3Rpb24uCi1ib29sIGZpbmRBcmVhV2l0aExh cmdlc3RJbnRlcnNlY3Rpb24oTm9kZSomIHRhcmdldE5vZGUsIEludFJlY3QmIHRhcmdldEFyZWEs IGNvbnN0IEludFBvaW50JiB0b3VjaEhvdHNwb3QsIGNvbnN0IEludFJlY3QmIHRvdWNoQXJlYSwg U3VidGFyZ2V0R2VvbWV0cnlMaXN0JiBzdWJ0YXJnZXRzKQotewotICAgIHRhcmdldE5vZGUgPSAw OwotICAgIGZsb2F0IGJlc3REaXN0YW5jZU1ldHJpYyA9IDAuOwotICAgIFN1YnRhcmdldEdlb21l dHJ5TGlzdDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBzdWJ0YXJnZXRzLmJlZ2luKCk7Ci0gICAgY29u c3QgU3VidGFyZ2V0R2VvbWV0cnlMaXN0Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBzdWJ0YXJnZXRz LmVuZCgpOwotICAgIGZvciAoOyBpdCAhPSBlbmQ7ICsraXQpIHsKLSAgICAgICAgTm9kZSogbm9k ZSA9IGl0LT5ub2RlKCk7Ci0gICAgICAgIGZsb2F0IGRpc3RhbmNlTWV0cmljID0gYXJlYU9mSW50 ZXJzZWN0aW9uKHRvdWNoSG90c3BvdCwgdG91Y2hBcmVhLCAqaXQpOwotICAgICAgICBpZiAoZGlz dGFuY2VNZXRyaWMgPiBiZXN0RGlzdGFuY2VNZXRyaWMpIHsKLSAgICAgICAgICAgIHRhcmdldEFy ZWEgPSBpdC0+Ym91bmRpbmdCb3goKTsKLSAgICAgICAgICAgIHRhcmdldE5vZGUgPSBub2RlOwot ICAgICAgICAgICAgYmVzdERpc3RhbmNlTWV0cmljID0gZGlzdGFuY2VNZXRyaWM7Ci0gICAgICAg IH0gZWxzZSBpZiAoZGlzdGFuY2VNZXRyaWMgPT0gYmVzdERpc3RhbmNlTWV0cmljKSB7Ci0gICAg ICAgICAgICAvLyBUcnkgdG8gcmV0dXJuIHRoZSBzbWFsbGVzdCBpbm5lci1tb3N0IHN1YnRhcmdl dC4KLSAgICAgICAgICAgIGlmIChub2RlID09IHRhcmdldE5vZGUpIHsKLSAgICAgICAgICAgICAg ICBpZiAoaXQtPmJvdW5kaW5nQm94KCkuc2l6ZSgpLmFyZWEoKSA8IHRhcmdldEFyZWEuc2l6ZSgp LmFyZWEoKSkKLSAgICAgICAgICAgICAgICAgICAgdGFyZ2V0QXJlYSA9IGl0LT5ib3VuZGluZ0Jv eCgpOwotICAgICAgICAgICAgfSBlbHNlIGlmIChub2RlLT5pc0Rlc2NlbmRhbnRPZih0YXJnZXRO b2RlKSkgewogICAgICAgICAgICAgICAgIHRhcmdldEFyZWEgPSBpdC0+Ym91bmRpbmdCb3goKTsK LSAgICAgICAgICAgICAgICB0YXJnZXROb2RlID0gbm9kZTsKICAgICAgICAgICAgIH0KICAgICAg ICAgfQogICAgIH0KQEAgLTI4NywyMSArMjY5LDIyIEBAIGJvb2wgZmluZEFyZWFXaXRoTGFyZ2Vz dEludGVyc2VjdGlvbihOb2RlKiYgdGFyZ2V0Tm9kZSwgSW50UmVjdCYgdGFyZ2V0QXJlYSwgY29u CiAgICAgcmV0dXJuICh0YXJnZXROb2RlKTsKIH0KIAotCiB9IC8vIG5hbWVzcGFjZSBUb3VjaEFk anVzdG1lbnQKIAogYm9vbCBmaW5kQmVzdENsaWNrYWJsZUNhbmRpZGF0ZShOb2RlKiYgdGFyZ2V0 Tm9kZSwgSW50UG9pbnQgJnRhcmdldFBvaW50LCBjb25zdCBJbnRQb2ludCAmdG91Y2hIb3RzcG90 LCBjb25zdCBJbnRSZWN0ICZ0b3VjaEFyZWEsIGNvbnN0IE5vZGVMaXN0JiBub2RlTGlzdCkKIHsK KyAgICBJbnRSZWN0IHRhcmdldEFyZWE7CiAgICAgVG91Y2hBZGp1c3RtZW50OjpTdWJ0YXJnZXRH ZW9tZXRyeUxpc3Qgc3VidGFyZ2V0czsKICAgICBUb3VjaEFkanVzdG1lbnQ6OmNvbXBpbGVTdWJ0 YXJnZXRMaXN0KG5vZGVMaXN0LCBzdWJ0YXJnZXRzLCBUb3VjaEFkanVzdG1lbnQ6Om5vZGVSZXNw b25kc1RvVGFwR2VzdHVyZSk7Ci0gICAgcmV0dXJuIFRvdWNoQWRqdXN0bWVudDo6ZmluZE5vZGVX aXRoTG93ZXN0RGlzdGFuY2VNZXRyaWModGFyZ2V0Tm9kZSwgdGFyZ2V0UG9pbnQsIHRvdWNoSG90 c3BvdCwgdG91Y2hBcmVhLCBzdWJ0YXJnZXRzLCBUb3VjaEFkanVzdG1lbnQ6OmRpc3RhbmNlU3F1 YXJlZFRvVGFyZ2V0Q2VudGVyTGluZSk7CisgICAgcmV0dXJuIFRvdWNoQWRqdXN0bWVudDo6Zmlu ZE5vZGVXaXRoTG93ZXN0RGlzdGFuY2VNZXRyaWModGFyZ2V0Tm9kZSwgdGFyZ2V0UG9pbnQsIHRh cmdldEFyZWEsIHRvdWNoSG90c3BvdCwgdG91Y2hBcmVhLCBzdWJ0YXJnZXRzLCBUb3VjaEFkanVz dG1lbnQ6OmRpc3RhbmNlU3F1YXJlZFRvVGFyZ2V0Q2VudGVyTGluZSk7CiB9CiAKIGJvb2wgZmlu ZEJlc3Rab29tYWJsZUFyZWEoTm9kZSomIHRhcmdldE5vZGUsIEludFJlY3QmIHRhcmdldEFyZWEs IGNvbnN0IEludFBvaW50JiB0b3VjaEhvdHNwb3QsIGNvbnN0IEludFJlY3QmIHRvdWNoQXJlYSwg Y29uc3QgTm9kZUxpc3QmIG5vZGVMaXN0KQogeworICAgIEludFBvaW50IHRhcmdldFBvaW50Owog ICAgIFRvdWNoQWRqdXN0bWVudDo6U3VidGFyZ2V0R2VvbWV0cnlMaXN0IHN1YnRhcmdldHM7CiAg ICAgVG91Y2hBZGp1c3RtZW50Ojpjb21waWxlWm9vbWFibGVTdWJ0YXJnZXRzKG5vZGVMaXN0LCBz dWJ0YXJnZXRzKTsKLSAgICByZXR1cm4gVG91Y2hBZGp1c3RtZW50OjpmaW5kQXJlYVdpdGhMYXJn ZXN0SW50ZXJzZWN0aW9uKHRhcmdldE5vZGUsIHRhcmdldEFyZWEsIHRvdWNoSG90c3BvdCwgdG91 Y2hBcmVhLCBzdWJ0YXJnZXRzKTsKKyAgICByZXR1cm4gVG91Y2hBZGp1c3RtZW50OjpmaW5kTm9k ZVdpdGhMb3dlc3REaXN0YW5jZU1ldHJpYyh0YXJnZXROb2RlLCB0YXJnZXRQb2ludCwgdGFyZ2V0 QXJlYSwgdG91Y2hIb3RzcG90LCB0b3VjaEFyZWEsIHN1YnRhcmdldHMsIFRvdWNoQWRqdXN0bWVu dDo6em9vbWFibGVJbnRlcnNlY3Rpb25RdW90aWVudCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUK 135562 2012-04-04 05:12:17 -0700 2012-04-04 05:48:09 -0700 Patch bug-83148-20120404141238.patch text/plain 10262 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDc5MGMxODg2MTIyYmJm NzI5ZDQ3OTVjM2VlZTU1NDhlMTFkMjQ5Mi4uMWUyOTFkYmQ4NzU1NmVmZWU5NTI2NzQyODcyNGM0 NGJmM2Q2NDliYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA0LTA0ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIEJl c3Qgem9vbWFibGUgYXJlYSBkb2VzIG5vdCBiYWxhbmNlIGludGVyc2VjdGlvbiB3aXRoIHRhcmdl dCBhcmVhLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODMxNDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBD aGFuZ2UgdGhlIHR3byBzdGVwIHNvcnQgdG8gc2ltcGx5IHBpY2tpbmcgdGhlIGJlc3QgcXVvdGll bnQgb2YgdG91Y2ggaW50ZXJzZWN0aW9uIHdpdGggdGFyZ2V0IGFyZWEuCisKKyAgICAgICAgVGVz dDogdG91Y2hhZGp1c3RtZW50L3pvb20tZmF0ZmluZ2VyLmh0bWwKKworICAgICAgICAqIHBhZ2Uv VG91Y2hBZGp1c3RtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRvdWNoQWRqdXN0bWVudDo6 ZGlzdGFuY2VTcXVhcmVkVG9UYXJnZXRDZW50ZXJMaW5lKToKKyAgICAgICAgKFRvdWNoQWRqdXN0 bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpUb3VjaEFkanVzdG1lbnQ6Onpvb21hYmxlSW50ZXJz ZWN0aW9uUXVvdGllbnQpOgorICAgICAgICAoV2ViQ29yZTo6VG91Y2hBZGp1c3RtZW50OjpmaW5k Tm9kZVdpdGhMb3dlc3REaXN0YW5jZU1ldHJpYyk6CisgICAgICAgIChXZWJDb3JlOjpmaW5kQmVz dENsaWNrYWJsZUNhbmRpZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpmaW5kQmVzdFpvb21hYmxl QXJlYSk6CisKIDIwMTItMDQtMDIgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNl bkBub2tpYS5jb20+CiAKICAgICAgICAgQXNzZXJ0cyBpbiBYTUxIdHRwUmVxdWVzdFByb2dyZXNz RXZlbnRUaHJvdHRsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Ub3VjaEFkanVz dG1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Ub3VjaEFkanVzdG1lbnQuY3BwCmluZGV4 IDlhMWVmYmI1MzQzMzNjY2NkZGU5Mjg3NDE5MDY3ZDk0Y2MxYjg0YzUuLjVhMWJmMmJiMDZlNGYy ZGE5ODlkODE0ODhiZjJmYjMyNGU5NTUxMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvVG91Y2hBZGp1c3RtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RvdWNoQWRq dXN0bWVudC5jcHAKQEAgLTIxOSwyMyArMjE5LDMxIEBAIGZsb2F0IGRpc3RhbmNlU3F1YXJlZFRv VGFyZ2V0Q2VudGVyTGluZShjb25zdCBJbnRQb2ludCYgdG91Y2hIb3RzcG90LCBjb25zdCBJbnRS CiAgICAgcmV0dXJuIHJlY3QuZGlzdGFuY2VTcXVhcmVkRnJvbUNlbnRlckxpbmVUb1BvaW50KHRv dWNoSG90c3BvdCk7CiB9CiAKLWZsb2F0IGFyZWFPZkludGVyc2VjdGlvbihjb25zdCBJbnRQb2lu dCYgdG91Y2hIb3RzcG90LCBjb25zdCBJbnRSZWN0JiB0b3VjaEFyZWEsIGNvbnN0IFN1YnRhcmdl dEdlb21ldHJ5JiBzdWJ0YXJnZXQpCisKKy8vIFRoaXMgcmV0dXJucyBxdW90aWVudCBvZiB0aGUg dGFyZ2V0IGFyZWEgYW5kIGl0cyBpbnRlcnNlY3Rpb24gd2l0aCB0aGUgdG91Y2ggYXJlYS4KKy8v IFRoaXMgd2lsbCBwcmlvcml0aXplIGxhcmdlc3QgaW50ZXJzZWN0aW9uIGFuZCBzbWFsbGVzdCBh cmVhLCB3aGlsZSBiYWxhbmNpbmcgdGhlIHR3byBhZ2FpbnN0IGVhY2ggb3RoZXIuCitmbG9hdCB6 b29tYWJsZUludGVyc2VjdGlvblF1b3RpZW50KGNvbnN0IEludFBvaW50JiB0b3VjaEhvdHNwb3Qs IGNvbnN0IEludFJlY3QmIHRvdWNoQXJlYSwgY29uc3QgU3VidGFyZ2V0R2VvbWV0cnkmIHN1YnRh cmdldCkKIHsKLSAgICBVTlVTRURfUEFSQU0odG91Y2hIb3RzcG90KTsKICAgICBJbnRSZWN0IHJl Y3QgPSBzdWJ0YXJnZXQuYm91bmRpbmdCb3goKTsKIAogICAgIC8vIENvbnZlcnQgZnJvbSBmcmFt ZSBjb29yZGluYXRlcyB0byB3aW5kb3cgY29vcmRpbmF0ZXMuCiAgICAgcmVjdCA9IHN1YnRhcmdl dC5ub2RlKCktPmRvY3VtZW50KCktPnZpZXcoKS0+Y29udGVudHNUb1dpbmRvdyhyZWN0KTsKLSAg ICByZWN0LmludGVyc2VjdCh0b3VjaEFyZWEpOwogCi0gICAgcmV0dXJuIHJlY3Quc2l6ZSgpLmFy ZWEoKTsKKyAgICAvLyBDaGVjayB0aGUgcmVjdGFuZ2xlIGlzIG1lYW5pbmdmdWwgem9vbSB0YXJn ZXQuIEl0IHNob3VsZCBhdCBsZWFzdCBjb250YWluIHRoZSBob3RzcG90LgorICAgIGlmICghcmVj dC5jb250YWlucyh0b3VjaEhvdHNwb3QpKQorICAgICAgICByZXR1cm4gSU5GSU5JVFk7CisgICAg SW50UmVjdCBpbnRlcnNlY3Rpb24gPSByZWN0OworICAgIGludGVyc2VjdGlvbi5pbnRlcnNlY3Qo dG91Y2hBcmVhKTsKKworICAgIC8vIFJldHVybiB0aGUgcXVvdGllbnQgb2YgdGhlIGludGVyc2Vj dGlvbi4KKyAgICByZXR1cm4gcmVjdC5zaXplKCkuYXJlYSgpIC8gKGZsb2F0KWludGVyc2VjdGlv bi5zaXplKCkuYXJlYSgpOwogfQogCiAKIC8vIEEgZ2VuZXJpYyBmdW5jdGlvbiBmb3IgZmluZGlu ZyB0aGUgdGFyZ2V0IG5vZGUgd2l0aCB0aGUgbG93ZXN0IGRpc3RhbmNlIG1ldHJpYy4gQSBkaXN0 YW5jZSBtZXRyaWMgaGVyZSBpcyB0aGUgcmVzdWx0CiAvLyBvZiBhIGRpc3RhbmNlLWxpa2UgZnVu Y3Rpb24sIHRoYXQgY29tcHV0ZXMgaG93IHdlbGwgdGhlIHRvdWNoIGhpdHMgdGhlIG5vZGUuCiAv LyBEaXN0YW5jZSBmdW5jdGlvbnMgY291bGQgZm9yIGluc3RhbmNlIGJlIGRpc3RhbmNlIHNxdWFy ZWQgb3IgYXJlYSBvZiBpbnRlcnNlY3Rpb24uCi1ib29sIGZpbmROb2RlV2l0aExvd2VzdERpc3Rh bmNlTWV0cmljKE5vZGUqJiB0YXJnZXROb2RlLCBJbnRQb2ludCYgdGFyZ2V0UG9pbnQsIGNvbnN0 IEludFBvaW50JiB0b3VjaEhvdHNwb3QsIGNvbnN0IEludFJlY3QmIHRvdWNoQXJlYSwgU3VidGFy Z2V0R2VvbWV0cnlMaXN0JiBzdWJ0YXJnZXRzLCBEaXN0YW5jZUZ1bmN0aW9uIGRpc3RhbmNlRnVu Y3Rpb24pCitib29sIGZpbmROb2RlV2l0aExvd2VzdERpc3RhbmNlTWV0cmljKE5vZGUqJiB0YXJn ZXROb2RlLCBJbnRQb2ludCYgdGFyZ2V0UG9pbnQsIEludFJlY3QmIHRhcmdldEFyZWEsIGNvbnN0 IEludFBvaW50JiB0b3VjaEhvdHNwb3QsIGNvbnN0IEludFJlY3QmIHRvdWNoQXJlYSwgU3VidGFy Z2V0R2VvbWV0cnlMaXN0JiBzdWJ0YXJnZXRzLCBEaXN0YW5jZUZ1bmN0aW9uIGRpc3RhbmNlRnVu Y3Rpb24pCiB7CiAgICAgdGFyZ2V0Tm9kZSA9IDA7CiAgICAgZmxvYXQgYmVzdERpc3RhbmNlTWV0 cmljID0gSU5GSU5JVFk7CkBAIC0yNDYsNDAgKzI1NCwxNCBAQCBib29sIGZpbmROb2RlV2l0aExv d2VzdERpc3RhbmNlTWV0cmljKE5vZGUqJiB0YXJnZXROb2RlLCBJbnRQb2ludCYgdGFyZ2V0UG9p bnQsCiAgICAgICAgIGZsb2F0IGRpc3RhbmNlTWV0cmljID0gZGlzdGFuY2VGdW5jdGlvbih0b3Vj aEhvdHNwb3QsIHRvdWNoQXJlYSwgKml0KTsKICAgICAgICAgaWYgKGRpc3RhbmNlTWV0cmljIDwg YmVzdERpc3RhbmNlTWV0cmljKSB7CiAgICAgICAgICAgICB0YXJnZXRQb2ludCA9IHJvdW5kZWRJ bnRQb2ludChpdC0+cXVhZCgpLmNlbnRlcigpKTsKKyAgICAgICAgICAgIHRhcmdldEFyZWEgPSBp dC0+Ym91bmRpbmdCb3goKTsKICAgICAgICAgICAgIHRhcmdldE5vZGUgPSBub2RlOwogICAgICAg ICAgICAgYmVzdERpc3RhbmNlTWV0cmljID0gZGlzdGFuY2VNZXRyaWM7CiAgICAgICAgIH0gZWxz ZSBpZiAoZGlzdGFuY2VNZXRyaWMgPT0gYmVzdERpc3RhbmNlTWV0cmljKSB7CiAgICAgICAgICAg ICAvLyBUcnkgdG8gYWx3YXlzIHJldHVybiB0aGUgaW5uZXItbW9zdCBlbGVtZW50LgotICAgICAg ICAgICAgaWYgKG5vZGUtPmlzRGVzY2VuZGFudE9mKHRhcmdldE5vZGUpKQorICAgICAgICAgICAg aWYgKG5vZGUtPmlzRGVzY2VuZGFudE9mKHRhcmdldE5vZGUpKSB7CiAgICAgICAgICAgICAgICAg dGFyZ2V0Tm9kZSA9IG5vZGU7Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICByZXR1cm4gKHRhcmdl dE5vZGUpOwotfQotCi0vLyBTaW1pbGFyIGdlbmVyaWMgZnVuY3Rpb24gYXMgZmluZE5vZGVXaXRo TG93ZXN0RGlzdGFuY2VNZXRyaWMsIGV4Y2VwdCB0aGlzIGZpbmRzIHRoZSBpbm5lcm1vc3QgYXJl YSB3aXRoIHRoZSBsYXJnZXN0IGludGVyc2VjdGlvbi4KLWJvb2wgZmluZEFyZWFXaXRoTGFyZ2Vz dEludGVyc2VjdGlvbihOb2RlKiYgdGFyZ2V0Tm9kZSwgSW50UmVjdCYgdGFyZ2V0QXJlYSwgY29u c3QgSW50UG9pbnQmIHRvdWNoSG90c3BvdCwgY29uc3QgSW50UmVjdCYgdG91Y2hBcmVhLCBTdWJ0 YXJnZXRHZW9tZXRyeUxpc3QmIHN1YnRhcmdldHMpCi17Ci0gICAgdGFyZ2V0Tm9kZSA9IDA7Ci0g ICAgZmxvYXQgYmVzdERpc3RhbmNlTWV0cmljID0gMC47Ci0gICAgU3VidGFyZ2V0R2VvbWV0cnlM aXN0Ojpjb25zdF9pdGVyYXRvciBpdCA9IHN1YnRhcmdldHMuYmVnaW4oKTsKLSAgICBjb25zdCBT dWJ0YXJnZXRHZW9tZXRyeUxpc3Q6OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IHN1YnRhcmdldHMuZW5k KCk7Ci0gICAgZm9yICg7IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAgICBOb2RlKiBub2RlID0g aXQtPm5vZGUoKTsKLSAgICAgICAgZmxvYXQgZGlzdGFuY2VNZXRyaWMgPSBhcmVhT2ZJbnRlcnNl Y3Rpb24odG91Y2hIb3RzcG90LCB0b3VjaEFyZWEsICppdCk7Ci0gICAgICAgIGlmIChkaXN0YW5j ZU1ldHJpYyA+IGJlc3REaXN0YW5jZU1ldHJpYykgewotICAgICAgICAgICAgdGFyZ2V0QXJlYSA9 IGl0LT5ib3VuZGluZ0JveCgpOwotICAgICAgICAgICAgdGFyZ2V0Tm9kZSA9IG5vZGU7Ci0gICAg ICAgICAgICBiZXN0RGlzdGFuY2VNZXRyaWMgPSBkaXN0YW5jZU1ldHJpYzsKLSAgICAgICAgfSBl bHNlIGlmIChkaXN0YW5jZU1ldHJpYyA9PSBiZXN0RGlzdGFuY2VNZXRyaWMpIHsKLSAgICAgICAg ICAgIC8vIFRyeSB0byByZXR1cm4gdGhlIHNtYWxsZXN0IGlubmVyLW1vc3Qgc3VidGFyZ2V0Lgot ICAgICAgICAgICAgaWYgKG5vZGUgPT0gdGFyZ2V0Tm9kZSkgewotICAgICAgICAgICAgICAgIGlm IChpdC0+Ym91bmRpbmdCb3goKS5zaXplKCkuYXJlYSgpIDwgdGFyZ2V0QXJlYS5zaXplKCkuYXJl YSgpKQotICAgICAgICAgICAgICAgICAgICB0YXJnZXRBcmVhID0gaXQtPmJvdW5kaW5nQm94KCk7 Ci0gICAgICAgICAgICB9IGVsc2UgaWYgKG5vZGUtPmlzRGVzY2VuZGFudE9mKHRhcmdldE5vZGUp KSB7CiAgICAgICAgICAgICAgICAgdGFyZ2V0QXJlYSA9IGl0LT5ib3VuZGluZ0JveCgpOwotICAg ICAgICAgICAgICAgIHRhcmdldE5vZGUgPSBub2RlOwogICAgICAgICAgICAgfQogICAgICAgICB9 CiAgICAgfQpAQCAtMjg3LDIxICsyNjksMjIgQEAgYm9vbCBmaW5kQXJlYVdpdGhMYXJnZXN0SW50 ZXJzZWN0aW9uKE5vZGUqJiB0YXJnZXROb2RlLCBJbnRSZWN0JiB0YXJnZXRBcmVhLCBjb24KICAg ICByZXR1cm4gKHRhcmdldE5vZGUpOwogfQogCi0KIH0gLy8gbmFtZXNwYWNlIFRvdWNoQWRqdXN0 bWVudAogCiBib29sIGZpbmRCZXN0Q2xpY2thYmxlQ2FuZGlkYXRlKE5vZGUqJiB0YXJnZXROb2Rl LCBJbnRQb2ludCAmdGFyZ2V0UG9pbnQsIGNvbnN0IEludFBvaW50ICZ0b3VjaEhvdHNwb3QsIGNv bnN0IEludFJlY3QgJnRvdWNoQXJlYSwgY29uc3QgTm9kZUxpc3QmIG5vZGVMaXN0KQogeworICAg IEludFJlY3QgdGFyZ2V0QXJlYTsKICAgICBUb3VjaEFkanVzdG1lbnQ6OlN1YnRhcmdldEdlb21l dHJ5TGlzdCBzdWJ0YXJnZXRzOwogICAgIFRvdWNoQWRqdXN0bWVudDo6Y29tcGlsZVN1YnRhcmdl dExpc3Qobm9kZUxpc3QsIHN1YnRhcmdldHMsIFRvdWNoQWRqdXN0bWVudDo6bm9kZVJlc3BvbmRz VG9UYXBHZXN0dXJlKTsKLSAgICByZXR1cm4gVG91Y2hBZGp1c3RtZW50OjpmaW5kTm9kZVdpdGhM b3dlc3REaXN0YW5jZU1ldHJpYyh0YXJnZXROb2RlLCB0YXJnZXRQb2ludCwgdG91Y2hIb3RzcG90 LCB0b3VjaEFyZWEsIHN1YnRhcmdldHMsIFRvdWNoQWRqdXN0bWVudDo6ZGlzdGFuY2VTcXVhcmVk VG9UYXJnZXRDZW50ZXJMaW5lKTsKKyAgICByZXR1cm4gVG91Y2hBZGp1c3RtZW50OjpmaW5kTm9k ZVdpdGhMb3dlc3REaXN0YW5jZU1ldHJpYyh0YXJnZXROb2RlLCB0YXJnZXRQb2ludCwgdGFyZ2V0 QXJlYSwgdG91Y2hIb3RzcG90LCB0b3VjaEFyZWEsIHN1YnRhcmdldHMsIFRvdWNoQWRqdXN0bWVu dDo6ZGlzdGFuY2VTcXVhcmVkVG9UYXJnZXRDZW50ZXJMaW5lKTsKIH0KIAogYm9vbCBmaW5kQmVz dFpvb21hYmxlQXJlYShOb2RlKiYgdGFyZ2V0Tm9kZSwgSW50UmVjdCYgdGFyZ2V0QXJlYSwgY29u c3QgSW50UG9pbnQmIHRvdWNoSG90c3BvdCwgY29uc3QgSW50UmVjdCYgdG91Y2hBcmVhLCBjb25z dCBOb2RlTGlzdCYgbm9kZUxpc3QpCiB7CisgICAgSW50UG9pbnQgdGFyZ2V0UG9pbnQ7CiAgICAg VG91Y2hBZGp1c3RtZW50OjpTdWJ0YXJnZXRHZW9tZXRyeUxpc3Qgc3VidGFyZ2V0czsKICAgICBU b3VjaEFkanVzdG1lbnQ6OmNvbXBpbGVab29tYWJsZVN1YnRhcmdldHMobm9kZUxpc3QsIHN1YnRh cmdldHMpOwotICAgIHJldHVybiBUb3VjaEFkanVzdG1lbnQ6OmZpbmRBcmVhV2l0aExhcmdlc3RJ bnRlcnNlY3Rpb24odGFyZ2V0Tm9kZSwgdGFyZ2V0QXJlYSwgdG91Y2hIb3RzcG90LCB0b3VjaEFy ZWEsIHN1YnRhcmdldHMpOworICAgIHJldHVybiBUb3VjaEFkanVzdG1lbnQ6OmZpbmROb2RlV2l0 aExvd2VzdERpc3RhbmNlTWV0cmljKHRhcmdldE5vZGUsIHRhcmdldFBvaW50LCB0YXJnZXRBcmVh LCB0b3VjaEhvdHNwb3QsIHRvdWNoQXJlYSwgc3VidGFyZ2V0cywgVG91Y2hBZGp1c3RtZW50Ojp6 b29tYWJsZUludGVyc2VjdGlvblF1b3RpZW50KTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCmluZGV4IDEyNDU5MzMwMmE1OTYxZTdkODMyNDQ4ODBmYTA4MGE4OTc3ZmExYjYuLjlmNDM4 ODAyMTE0MjFmNzEyNGQxMDU4ODMxMGFiZWFhMmM5MzVjNTUgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBA QAorMjAxMi0wNC0wNCAgQWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVuc2VuQG5va2lh LmNvbT4KKworICAgICAgICBCZXN0IHpvb21hYmxlIGFyZWEgZG9lcyBub3QgYmFsYW5jZSBpbnRl cnNlY3Rpb24gd2l0aCB0YXJnZXQgYXJlYS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTgzMTQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiB0b3VjaGFkanVzdG1lbnQvem9vbS1mYXRmaW5nZXItZXhwZWN0 ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiB0b3VjaGFkanVzdG1lbnQvem9vbS1mYXRmaW5nZXIu aHRtbDogQWRkZWQuCisKIDIwMTItMDQtMDIgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFu LmplbnNlbkBub2tpYS5jb20+CiAKICAgICAgICAgQXNzZXJ0cyBpbiBYTUxIdHRwUmVxdWVzdFBy b2dyZXNzRXZlbnRUaHJvdHRsZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvdG91Y2hhZGp1c3Rt ZW50L3pvb20tZmF0ZmluZ2VyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3RvdWNoYWRqdXN0 bWVudC96b29tLWZhdGZpbmdlci1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMWIwZTkzNWYyMWU4 NTA3OWIxMjhiOTY2ZDdkYmMyY2Q0NjUyZDE5NwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL3RvdWNoYWRqdXN0bWVudC96b29tLWZhdGZpbmdlci1leHBlY3RlZC50eHQKQEAgLTAsMCAr MSwxMyBAQAorVGVzdCB0aGF0IHRhcmdldHRlZCBhcmVhIGlzIHBpY2tlZCBldmVuIGlmIHRoZSB0 b3VjaCBhcmVhIGlzIG5vdCBmdWxseSBjb250YWluZWQuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxs IHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBM RVRFIi4KKworCitQQVNTIHpvb21hYmxlQXJlYS50b3AgaXMgMTAwCitQQVNTIHpvb21hYmxlQXJl YS5sZWZ0IGlzIDEwMAorUEFTUyB6b29tYWJsZUFyZWEud2lkdGggaXMgMjAwCitQQVNTIHpvb21h YmxlQXJlYS5oZWlnaHQgaXMgMjAKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKwor VEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy90b3VjaGFkanVzdG1lbnQv em9vbS1mYXRmaW5nZXIuaHRtbCBiL0xheW91dFRlc3RzL3RvdWNoYWRqdXN0bWVudC96b29tLWZh dGZpbmdlci5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjY1ZjAzOTRlZDYwYjJhMWRjMjVkNTdkZDNkYWJkY2Q0 YmRiYmVkNzUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy90b3VjaGFkanVzdG1lbnQv em9vbS1mYXRmaW5nZXIuaHRtbApAQCAtMCwwICsxLDUwIEBACis8aHRtbD4KKzxoZWFkPgorICAg IDxzY3JpcHQgc3JjPSIuLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3Jp cHQ+CisgICAgPHN0eWxlPgorICAgICAgICAjZGl2MSB7IHBvc2l0aW9uOiBhYnNvbHV0ZTsgbGVm dDogMTAwcHg7IHRvcDogMTAwCitweDsgd2lkdGg6IDIwMHB4OyBoZWlnaHQ6IDIwcHg7IH0KKyAg ICA8L3N0eWxlPgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJydW5UZXN0cygpIj4KKworPGRpdiBp ZD1kaXYxPjwvZGl2PgorCis8cCBpZD0nZGVzY3JpcHRpb24nPjwvcD4KKzxkaXYgaWQ9J2NvbnNv bGUnPjwvZGl2PgorCis8c2NyaXB0PgorICAgIGZ1bmN0aW9uIHRlc3RSb3VuZFRvdWNoKHgsIHks IHJhZGl1cykKKyAgICB7CisgICAgICAgIHZhciB4ID0geCAtIHJhZGl1czsKKyAgICAgICAgdmFy IHkgPSB5IC0gcmFkaXVzOworICAgICAgICB2YXIgd2lkdGggPSByYWRpdXMgKiAyOworICAgICAg ICB2YXIgaGVpZ2h0ID0gcmFkaXVzICogMjsKKyAgICAgICAgdmFyIHpvb21hYmxlUmVjdCA9IGlu dGVybmFscy5iZXN0Wm9vbWFibGVBcmVhRm9yVG91Y2hQb2ludCh4LCB5LCB3aWR0aCwgaGVpZ2h0 LCBkb2N1bWVudCk7CisgICAgICAgIHJldHVybiB6b29tYWJsZVJlY3Q7CisgICAgfQorCisgICAg ZnVuY3Rpb24gdGVzdERpcmVjdFRvdWNoZXMoKQorICAgIHsKKyAgICAgICAgem9vbWFibGVBcmVh ID0gdGVzdFJvdW5kVG91Y2goMjAwLCAxMTAsIDIwKTsKKyAgICAgICAgc2hvdWxkRXZhbHVhdGVU bygnem9vbWFibGVBcmVhLnRvcCcsIDEwMCk7CisgICAgICAgIHNob3VsZEV2YWx1YXRlVG8oJ3pv b21hYmxlQXJlYS5sZWZ0JywgMTAwKTsKKyAgICAgICAgc2hvdWxkRXZhbHVhdGVUbygnem9vbWFi bGVBcmVhLndpZHRoJywgMjAwKTsKKyAgICAgICAgc2hvdWxkRXZhbHVhdGVUbygnem9vbWFibGVB cmVhLmhlaWdodCcsIDIwKTsKKworICAgIH0KKworICAgIGZ1bmN0aW9uIHJ1blRlc3RzKCkKKyAg ICB7CisgICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIgJiYgd2luZG93Lmlu dGVybmFscyAmJiBpbnRlcm5hbHMuYmVzdFpvb21hYmxlQXJlYUZvclRvdWNoUG9pbnQpIHsKKyAg ICAgICAgICAgIGRlc2NyaXB0aW9uKCdUZXN0IHRoYXQgdGFyZ2V0dGVkIGFyZWEgaXMgcGlja2Vk IGV2ZW4gaWYgdGhlIHRvdWNoIGFyZWEgaXMgbm90IGZ1bGx5IGNvbnRhaW5lZC4nKTsKKyAgICAg ICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKyAgICAgICAgICAgIGxh eW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKyAgICAgICAgICAgIHRlc3REaXJl Y3RUb3VjaGVzKCk7CisgICAgICAgICAgICBpc1N1Y2Nlc3NmdWxseVBhcnNlZCgpOworICAgICAg ICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOworICAgICAgICB9CisgICAg fQorPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmls ZQo=