122804 2013-10-14 18:46:14 -0700 EventPath::updateTouchLists traverses through EventPath thrice 2013-10-14 21:06:37 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa benjamin commit-queue darin eflews.bot enrica esprehn+autocc gyuyoung.kim kangil.han kling koivisto sam oldest_to_newest 939787 0 rniwa 2013-10-14 18:46:14 -0700 EventPath::updateTouchLists goes through m_path thrice by calling updateTouchListsInEventPath. Given that nodes tend to be scattered across multiple pages, this is a very inefficient operation. It's much better to loop over touch lists or touch objects while the outer loop traverses through EventPath. 939790 1 214219 rniwa 2013-10-14 18:54:54 -0700 Created attachment 214219 Cleanup 939791 2 214219 eflews.bot 2013-10-14 18:58:26 -0700 Comment on attachment 214219 Cleanup Attachment 214219 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/4039023 939792 3 214219 eflews.bot 2013-10-14 18:59:15 -0700 Comment on attachment 214219 Cleanup Attachment 214219 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/4039022 939793 4 214220 rniwa 2013-10-14 19:05:53 -0700 Created attachment 214220 Fixed builds 939794 5 214220 eflews.bot 2013-10-14 19:09:07 -0700 Comment on attachment 214220 Fixed builds Attachment 214220 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/4041023 939795 6 214220 eflews.bot 2013-10-14 19:10:54 -0700 Comment on attachment 214220 Fixed builds Attachment 214220 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/4001046 939796 7 214220 benjamin 2013-10-14 19:12:37 -0700 Comment on attachment 214220 Fixed builds View in context: https://bugs.webkit.org/attachment.cgi?id=214220&action=review > Source/WebCore/dom/EventDispatcher.cpp:444 > + const size_t touchNodeCount = touchEvent.touches()->length() + touchEvent.targetTouches()->length() + touchEvent.changedTouches()->length(); No need for the const. I think "touchNode" is confusing. Use totalTouchesCount instead? 939805 8 214222 rniwa 2013-10-14 20:01:25 -0700 Created attachment 214222 Patch for landing 939806 9 214222 rniwa 2013-10-14 20:01:35 -0700 Comment on attachment 214222 Patch for landing Wait for EWS. 939820 10 214222 eflews.bot 2013-10-14 20:25:04 -0700 Comment on attachment 214222 Patch for landing Attachment 214222 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/3914093 939821 11 214222 eflews.bot 2013-10-14 20:26:00 -0700 Comment on attachment 214222 Patch for landing Attachment 214222 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/4039038 939827 12 214225 rniwa 2013-10-14 20:41:40 -0700 Created attachment 214225 Another build fix attempt 939834 13 rniwa 2013-10-14 21:06:37 -0700 Committed r157441: <http://trac.webkit.org/changeset/157441> 214219 2013-10-14 18:54:54 -0700 2013-10-14 19:05:49 -0700 Cleanup bug-122804-20131014185454.patch text/plain 7414 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzQzNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTEwLTE0ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEV2ZW50UGF0aDo6dXBkYXRlVG91 Y2hMaXN0cyB0cmF2ZXJzZXMgdGhyb3VnaCBFdmVudFBhdGggdGhyaWNlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI4MDQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIHRyYXZlcnNpbmcg dGhyb3VnaCBFdmVudFBhdGggZm9yIGVhY2ggVG91Y2hMaXN0LCB0cmF2ZXJzZSB0aHJvdWdoIFRv dWNoTGlzdCBmb3IgZXZlcnkgRXZlbnRDb250ZXh0LgorICAgICAgICBUaGlzIHBhdmVzIG91ciB3 YXkgdG8gaGF2ZSBvbmUtcGFzcyB0cmF2ZXJzYWwgb3ZlciBFdmVudFBhdGgsIGFuZCBldmV0dWFs bHkgdG8gcmVtb3ZlIEV2ZW50Q29udGV4dCBhbHRvZ2V0aGVyLgorCisgICAgICAgIFRoaXMgY2hh bmdlIHNob3VsZCBhbHNvIGltcHJvdmUgdGhlIGNhY2hlIGhpdCByYXRlIHNpbmNlIGFsbCBUb3Vj aCBvYmplY3RzIHRlbmQgdG8gYmUgYWxsb2NhdGVkIGF0IHRoZSBzYW1lIHRpbWUKKyAgICAgICAg YnV0IHRoaXMgcGVyZm9ybWFuY2UgaW1wcm92ZW1lbnQgaXMgcHJvYmFibHkgbm90IG9ic2VydmFi bGUuCisKKyAgICAgICAgKiBkb20vRXZlbnRDb250ZXh0Lmg6CisgICAgICAgICogZG9tL0V2ZW50 RGlzcGF0Y2hlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudFJlbGF0ZWROb2RlUmVzb2x2 ZXI6OkV2ZW50UmVsYXRlZE5vZGVSZXNvbHZlcik6IEFkZGVkIGEgbmV3IGNvbnN0cnVjdG9yIHRo YXQgdGFrZXMgVG91Y2ggYW5kCisgICAgICAgIGFuZCBUb3VjaExpc3RUeXBlLiBXZSBuZWVkIHRv IHN0b3JlIHRoZXNlIHR3byB2YWx1ZXMgaW4gb3JkZXIgdG8gdXBkYXRlIEV2ZW50Q29udGV4dCBs YXRlci4KKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50UmVsYXRlZE5vZGVSZXNvbHZlcjo6dG91Y2gp OiBBZGRlZCwKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50UmVsYXRlZE5vZGVSZXNvbHZlcjo6dG91 Y2hMaXN0VHlwZSk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6YWRkUmVsYXRlZE5vZGVSZXNv bHZlcnNGb3JUb3VjaExpc3QpOiBFeHRyYWN0ZWQgZnJvbSB1cGRhdGVUb3VjaExpc3RzSW5FdmVu dFBhdGguCisgICAgICAgIChXZWJDb3JlOjpFdmVudFBhdGg6OnVwZGF0ZVRvdWNoTGlzdHMpOiBN b3ZlZCB0aGUgbG9vcCBvdmVyIG1fcGF0aCBoZXJlLiBOb3RpY2UgdGhhdCB0aGUgb3V0ZXIgbG9v cCBpdGVyYXRlcworICAgICAgICBvdmVyIG1fcGF0aCBpbnN0ZWFkIG9mIHRvdWNoTGlzdCBhcyBk b25lIGluIHVwZGF0ZVRvdWNoTGlzdHNJbkV2ZW50UGF0aC4gVGhlIGlubmVyIGxvb3AgZ29lcyB0 aHJvdWdoIHJlc29sdmVycworICAgICAgICBhbmQgYWRkcyBUb3VjaCBvYmplY3RzIGVhY2ggRXZl bnRDb250ZXh0IGFzIG5lZWRlZC4KKwogMjAxMy0xMC0xNCAgU2FtdWVsIFdoaXRlICA8c2FtdWVs X3doaXRlQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogZmllbGRzZXQgc2hvdWxkIGhhdmUgR3Jv dXBSb2xlIGFuZCBsZWdlbmQgc2hvdWxkIGJlIGRlc2NyaXB0aW9uLgpJbmRleDogU291cmNlL1dl YkNvcmUvZG9tL0V2ZW50Q29udGV4dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Rv bS9FdmVudENvbnRleHQuaAkocmV2aXNpb24gMTU3NDM2KQorKysgU291cmNlL1dlYkNvcmUvZG9t L0V2ZW50Q29udGV4dC5oCSh3b3JraW5nIGNvcHkpCkBAIC04NSwxMyArODUsMTQgQEAgaW5saW5l IE1vdXNlT3JGb2N1c0V2ZW50Q29udGV4dCYgdG9Nb3VzZQogI2lmIEVOQUJMRShUT1VDSF9FVkVO VFMpCiBjbGFzcyBUb3VjaEV2ZW50Q29udGV4dCBGSU5BTCA6IHB1YmxpYyBFdmVudENvbnRleHQg ewogcHVibGljOgorICAgIGVudW0gVG91Y2hMaXN0VHlwZSB7IFRvdWNoZXMsIFRhcmdldFRvdWNo ZXMsIENoYW5nZWRUb3VjaGVzLCBOb3RUb3VjaExpc3QgfTsKKwogICAgIFRvdWNoRXZlbnRDb250 ZXh0KFBhc3NSZWZQdHI8Tm9kZT4sIFBhc3NSZWZQdHI8RXZlbnRUYXJnZXQ+IGN1cnJlbnRUYXJn ZXQsIFBhc3NSZWZQdHI8RXZlbnRUYXJnZXQ+IHRhcmdldCk7CiAgICAgdmlydHVhbCB+VG91Y2hF dmVudENvbnRleHQoKTsKIAogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVMb2NhbEV2ZW50cyhFdmVu dCYpIGNvbnN0IE9WRVJSSURFOwogICAgIHZpcnR1YWwgYm9vbCBpc1RvdWNoRXZlbnRDb250ZXh0 KCkgY29uc3QgT1ZFUlJJREU7CiAKLSAgICBlbnVtIFRvdWNoTGlzdFR5cGUgeyBUb3VjaGVzLCBU YXJnZXRUb3VjaGVzLCBDaGFuZ2VkVG91Y2hlcywgfTsKICAgICBUb3VjaExpc3QqIHRvdWNoTGlz dChUb3VjaExpc3RUeXBlIHR5cGUpCiAgICAgewogICAgICAgICBzd2l0Y2ggKHR5cGUpIHsKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9FdmVudERpc3BhdGNoZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2RvbS9FdmVudERpc3BhdGNoZXIuY3BwCShyZXZpc2lvbiAxNTc0MzYp CisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRXZlbnREaXNwYXRjaGVyLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTA5LDYgKzEwOSw4IEBAIHByaXZhdGU6CiAgICAgVmVjdG9yPHN0ZDo6dW5pcXVlX3B0 cjxFdmVudENvbnRleHQ+LCAzMj4gbV9wYXRoOwogfTsKIAorY2xhc3MgVG91Y2g7CisKIGNsYXNz IEV2ZW50UmVsYXRlZE5vZGVSZXNvbHZlciB7CiBwdWJsaWM6CiAgICAgRXZlbnRSZWxhdGVkTm9k ZVJlc29sdmVyKE5vZGUmIHJlbGF0ZWROb2RlKQpAQCAtMTE2LDkgKzExOCwzMCBAQCBwdWJsaWM6 CiAgICAgICAgICwgbV9yZWxhdGVkTm9kZVRyZWVTY29wZShyZWxhdGVkTm9kZS50cmVlU2NvcGUo KSkKICAgICAgICAgLCBtX3JlbGF0ZWROb2RlSW5DdXJyZW50VHJlZVNjb3BlKG51bGxwdHIpCiAg ICAgICAgICwgbV9jdXJyZW50VHJlZVNjb3BlKG51bGxwdHIpCisjaWYgRU5BQkxFKFRPVUNIX0VW RU5UUykKKyAgICAgICAgLCBtX3RvdWNoKDApCisgICAgICAgICwgbV90b3VjaExpc3RUeXBlKE5v dFRvdWNoTGlzdCkKKyNlbmRpZgogICAgIHsKICAgICB9CiAKKyNpZiBFTkFCTEUoVE9VQ0hfRVZF TlRTKQorICAgIEV2ZW50UmVsYXRlZE5vZGVSZXNvbHZlcihUb3VjaCYgdG91Y2gsIFRvdWNoRXZl bnRDb250ZXh0OjpUb3VjaExpc3RUeXBlIHRvdWNoTGlzdFR5cGUpCisgICAgICAgIDogbV9yZWxh dGVkTm9kZSh0b3VjaC50YXJnZXQoKS0+dG9Ob2RlKCkpCisgICAgICAgICwgbV9yZWxhdGVkTm9k ZVRyZWVTY29wZShtX3JlbGF0ZWROb2RlLT50cmVlU2NvcGUoKSkKKyAgICAgICAgLCBtX3JlbGF0 ZWROb2RlSW5DdXJyZW50VHJlZVNjb3BlKG51bGxwdHIpCisgICAgICAgICwgbV9jdXJyZW50VHJl ZVNjb3BlKG51bGxwdHIpCisgICAgICAgICwgbV90b3VjaCgmdG91Y2gpCisgICAgICAgICwgbV90 b3VjaExpc3RUeXBlKHRvdWNoTGlzdFR5cGUpCisgICAgeworICAgIH0KKyNlbmRpZgorCisjaWYg RU5BQkxFKFRPVUNIX0VWRU5UUykKKyAgICBUb3VjaCogdG91Y2goKSBjb25zdCB7IHJldHVybiBt X3RvdWNoOyB9CisgICAgVG91Y2hFdmVudENvbnRleHQ6OlRvdWNoTGlzdFR5cGUgdG91Y2hMaXN0 VHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1fdG91Y2hMaXN0VHlwZTsgfQorI2VuZGlmCisKICAgICBO b2RlKiBtb3ZlVG9QYXJlbnRPclNoYWRvd0hvc3QoTm9kZSYgbmV3VGFyZ2V0KQogICAgIHsKICAg ICAgICAgVHJlZVNjb3BlJiBuZXdUcmVlU2NvcGUgPSBuZXdUYXJnZXQudHJlZVNjb3BlKCk7CkBA IC0xNDgsNiArMTcxLDEwIEBAIHByaXZhdGU6CiAgICAgY29uc3QgVHJlZVNjb3BlJiBtX3JlbGF0 ZWROb2RlVHJlZVNjb3BlOwogICAgIE5vZGUqIG1fcmVsYXRlZE5vZGVJbkN1cnJlbnRUcmVlU2Nv cGU7CiAgICAgVHJlZVNjb3BlKiBtX2N1cnJlbnRUcmVlU2NvcGU7CisjaWYgRU5BQkxFKFRPVUNI X0VWRU5UUykKKyAgICBUb3VjaCogdG91Y2g7CisgICAgVG91Y2hFdmVudENvbnRleHQ6OlRvdWNo TGlzdFR5cGUgbV90b3VjaExpc3RUeXBlOworI2VuZGlmCiB9OwogCiBpbmxpbmUgRXZlbnRUYXJn ZXQmIGV2ZW50VGFyZ2V0UmVzcGVjdGluZ1RhcmdldFJ1bGVzKE5vZGUmIHJlZmVyZW5jZU5vZGUp CkBAIC00MDUsMjkgKzQzMiwzNCBAQCBFdmVudFBhdGg6OkV2ZW50UGF0aChOb2RlJiB0YXJnZXRO b2RlLCBFCiB9CiAKICNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQotdm9pZCBFdmVudFBhdGg6OnVw ZGF0ZVRvdWNoTGlzdHNJbkV2ZW50UGF0aChjb25zdCBUb3VjaExpc3QqIHRvdWNoTGlzdCwgVG91 Y2hFdmVudENvbnRleHQ6OlRvdWNoTGlzdFR5cGUgdG91Y2hMaXN0VHlwZSkKK3N0YXRpYyBhZGRS ZWxhdGVkTm9kZVJlc29sdmVyc0ZvclRvdWNoTGlzdChWZWN0b3I8RXZlbnRSZWxhdGVkTm9kZVJl c29sdmVyLCAxNj4mIHRvdWNoVGFyZ2V0UmVzb2x2ZXJzLCBjb25zdCBUb3VjaExpc3QqIHRvdWNo TGlzdCwgVG91Y2hFdmVudENvbnRleHQ6OlRvdWNoTGlzdFR5cGUgdHlwZSkKIHsKLSAgICBpZiAo IXRvdWNoTGlzdCkKLSAgICAgICAgcmV0dXJuOwotICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwg dG91Y2hMaXN0LT5sZW5ndGgoKTsgKytpKSB7Ci0gICAgICAgIGNvbnN0IFRvdWNoJiB0b3VjaCA9 ICp0b3VjaExpc3QtPml0ZW0oaSk7Ci0KLSAgICAgICAgQVNTRVJUKHRvdWNoLnRhcmdldCgpLT50 b05vZGUoKSk7Ci0gICAgICAgIEV2ZW50UmVsYXRlZE5vZGVSZXNvbHZlciByZXNvbHZlcigqdG91 Y2gudGFyZ2V0KCktPnRvTm9kZSgpKTsKLSAgICAgICAgc2l6ZV90IGV2ZW50UGF0aFNpemUgPSBt X3BhdGguc2l6ZSgpOwotICAgICAgICBmb3IgKHNpemVfdCBqID0gMDsgaiA8IGV2ZW50UGF0aFNp emU7ICsraikgewotICAgICAgICAgICAgRXZlbnRDb250ZXh0JiBjb250ZXh0ID0gKm1fcGF0aFtp XTsKLSAgICAgICAgICAgIE5vZGUqIG5vZGVJbkN1cnJlbnRUcmVlU2NvcGUgPSByZXNvbHZlci5t b3ZlVG9QYXJlbnRPclNoYWRvd0hvc3QoKmNvbnRleHQubm9kZSgpKTsKLSAgICAgICAgICAgIHRv VG91Y2hFdmVudENvbnRleHQoY29udGV4dCkudG91Y2hMaXN0KHRvdWNoTGlzdFR5cGUpLT5hcHBl bmQodG91Y2guY2xvbmVXaXRoTmV3VGFyZ2V0KG5vZGVJbkN1cnJlbnRUcmVlU2NvcGUpKTsKLSAg ICAgICAgfQotICAgIH0KKyAgICBjb25zdCBzaXplX3QgdG91Y2hMaXN0U2l6ZSA9IHRvdWNoTGlz dC0+bGVuZ3RoKCk7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB0b3VjaExpc3RTaXplOyAr K2kpCisgICAgICAgIHRvdWNoVGFyZ2V0UmVzb2x2ZXJzW2ldLmFwcGVuZChFdmVudFJlbGF0ZWRO b2RlUmVzb2x2ZXIoKnRvdWNoTGlzdC0+aXRlbShpKSwgdHlwZSkpOwogfQogCiB2b2lkIEV2ZW50 UGF0aDo6dXBkYXRlVG91Y2hMaXN0cyhjb25zdCBUb3VjaEV2ZW50JiB0b3VjaEV2ZW50KQogewot ICAgIHVwZGF0ZVRvdWNoTGlzdHNJbkV2ZW50UGF0aCh0b3VjaEV2ZW50LnRvdWNoZXMoKSwgVG91 Y2hFdmVudENvbnRleHQ6OlRvdWNoZXMpOwotICAgIHVwZGF0ZVRvdWNoTGlzdHNJbkV2ZW50UGF0 aCh0b3VjaEV2ZW50LnRhcmdldFRvdWNoZXMoKSwgVG91Y2hFdmVudENvbnRleHQ6OlRhcmdldFRv dWNoZXMpOwotICAgIHVwZGF0ZVRvdWNoTGlzdHNJbkV2ZW50UGF0aCh0b3VjaEV2ZW50LmNoYW5n ZWRUb3VjaGVzKCksIFRvdWNoRXZlbnRDb250ZXh0OjpDaGFuZ2VkVG91Y2hlcyk7CisgICAgVmVj dG9yPEV2ZW50UmVsYXRlZE5vZGVSZXNvbHZlciwgMTY+IHRvdWNoVGFyZ2V0UmVzb2x2ZXJzOwor ICAgIGNvbnN0IHNpemVfdCB0b3VjaE5vZGVDb3VudCA9IHRvdWNoRXZlbnQudG91Y2hlcygpLT5s ZW5ndGgoKSArIHRvdWNoRXZlbnQudGFyZ2V0VG91Y2hlcygpLT5sZW5ndGgoKSArIHRvdWNoRXZl bnQuY2hhbmdlZFRvdWNoZXMoKS0+bGVuZ3RoKCk7CisgICAgdG91Y2hUYXJnZXRSZXNvbHZlcnMu cmVzZXJ2ZUluaXRpYWxDYXBhY2l0eSh0b3VjaE5vZGVDb3VudCk7CisKKyAgICBhZGRSZWxhdGVk Tm9kZVJlc29sdmVyc0ZvclRvdWNoTGlzdCh0b3VjaFRhcmdldFJlc29sdmVycywgdG91Y2hFdmVu dC50b3VjaGVzKCksIFRvdWNoRXZlbnRDb250ZXh0OjpUb3VjaGVzKTsKKyAgICBhZGRSZWxhdGVk Tm9kZVJlc29sdmVyc0ZvclRvdWNoTGlzdCh0b3VjaFRhcmdldFJlc29sdmVycywgdG91Y2hFdmVu dC50YXJnZXRUb3VjaGVzKCksIFRvdWNoRXZlbnRDb250ZXh0OjpUYXJnZXRUb3VjaGVzKTsKKyAg ICBhZGRSZWxhdGVkTm9kZVJlc29sdmVyc0ZvclRvdWNoTGlzdCh0b3VjaFRhcmdldFJlc29sdmVy cywgdG91Y2hFdmVudC5jaGFuZ2VkVG91Y2hlcygpLCBUb3VjaEV2ZW50Q29udGV4dDo6Q2hhbmdl ZFRvdWNoZXMpOworCisgICAgQVNTRVJUKHRvdWNoVGFyZ2V0UmVzb2x2ZXJzLnNpemUoKSA9PSB0 b3VjaE5vZGVDb3VudCk7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBldmVudFBhdGhTaXpl OyArK2kpIHsKKyAgICAgICAgVG91Y2hFdmVudENvbnRleHQmIGNvbnRleHQgPSB0b1RvdWNoRXZl bnRDb250ZXh0KCptX3BhdGhbaV0pOworICAgICAgICBOb2RlJiBub2RlVG9Nb3ZlVG8gPSAqY29u dGV4dC5ub2RlKCk7CisgICAgICAgIGZvciAoc2l6ZV90IHJlc29sdmVySW5kZXggPSAwOyByZXNv bHZlckluZGV4IDwgdG91Y2hOb2RlQ291bnQ7ICsrcmVzb2x2ZXJJbmRleCkgeworICAgICAgICAg ICAgRXZlbnRSZWxhdGVkTm9kZVJlc29sdmVyJiBjdXJyZW50UmVzb2x2ZXIgPSB0b3VjaFRhcmdl dFJlc29sdmVyc1tyZXNvbHZlckluZGV4XTsKKyAgICAgICAgICAgIE5vZGUqIG5vZGVJbkN1cnJl bnRUcmVlU2NvcGUgPSBjdXJyZW50UmVzb2x2ZXIubW92ZVRvUGFyZW50T3JTaGFkb3dIb3N0KG5v ZGVUb01vdmVUbyk7CisgICAgICAgICAgICBBU1NFUlQoY3VycmVudFJlc29sdmVyLnRvdWNoKCkp OworICAgICAgICAgICAgY29udGV4dC50b3VjaExpc3QoY3VycmVudFJlc29sdmVyLnRvdWNoTGlz dFR5cGUoKSktPmFwcGVuZChjdXJyZW50UmVzb2x2ZXIudG91Y2goKS0+Y2xvbmVXaXRoTmV3VGFy Z2V0KG5vZGVJbkN1cnJlbnRUcmVlU2NvcGUpKTsKKyAgICAgICAgfQorICAgIH0KIH0KICNlbmRp ZgogCg== 214220 2013-10-14 19:05:53 -0700 2013-10-14 20:01:19 -0700 Fixed builds bug-122804-20131014190552.patch text/plain 7228 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzQzNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTEwLTE0ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEV2ZW50UGF0aDo6dXBkYXRlVG91 Y2hMaXN0cyB0cmF2ZXJzZXMgdGhyb3VnaCBFdmVudFBhdGggdGhyaWNlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI4MDQKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIHRyYXZlcnNpbmcg dGhyb3VnaCBFdmVudFBhdGggZm9yIGVhY2ggVG91Y2hMaXN0LCB0cmF2ZXJzZSB0aHJvdWdoIFRv dWNoTGlzdCBmb3IgZXZlcnkgRXZlbnRDb250ZXh0LgorICAgICAgICBUaGlzIHBhdmVzIG91ciB3 YXkgdG8gaGF2ZSBvbmUtcGFzcyB0cmF2ZXJzYWwgb3ZlciBFdmVudFBhdGgsIGFuZCBldmV0dWFs bHkgdG8gcmVtb3ZlIEV2ZW50Q29udGV4dCBhbHRvZ2V0aGVyLgorCisgICAgICAgIFRoaXMgY2hh bmdlIHNob3VsZCBhbHNvIGltcHJvdmUgdGhlIGNhY2hlIGhpdCByYXRlIHNpbmNlIGFsbCBUb3Vj aCBvYmplY3RzIHRlbmQgdG8gYmUgYWxsb2NhdGVkIGF0IHRoZSBzYW1lIHRpbWUKKyAgICAgICAg YnV0IHRoaXMgcGVyZm9ybWFuY2UgaW1wcm92ZW1lbnQgaXMgcHJvYmFibHkgbm90IG9ic2VydmFi bGUuCisKKyAgICAgICAgKiBkb20vRXZlbnRDb250ZXh0Lmg6CisgICAgICAgICogZG9tL0V2ZW50 RGlzcGF0Y2hlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudFJlbGF0ZWROb2RlUmVzb2x2 ZXI6OkV2ZW50UmVsYXRlZE5vZGVSZXNvbHZlcik6IEFkZGVkIGEgbmV3IGNvbnN0cnVjdG9yIHRo YXQgdGFrZXMgVG91Y2ggYW5kCisgICAgICAgIGFuZCBUb3VjaExpc3RUeXBlLiBXZSBuZWVkIHRv IHN0b3JlIHRoZXNlIHR3byB2YWx1ZXMgaW4gb3JkZXIgdG8gdXBkYXRlIEV2ZW50Q29udGV4dCBs YXRlci4KKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50UmVsYXRlZE5vZGVSZXNvbHZlcjo6dG91Y2gp OiBBZGRlZCwKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50UmVsYXRlZE5vZGVSZXNvbHZlcjo6dG91 Y2hMaXN0VHlwZSk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6YWRkUmVsYXRlZE5vZGVSZXNv bHZlcnNGb3JUb3VjaExpc3QpOiBFeHRyYWN0ZWQgZnJvbSB1cGRhdGVUb3VjaExpc3RzSW5FdmVu dFBhdGguCisgICAgICAgIChXZWJDb3JlOjpFdmVudFBhdGg6OnVwZGF0ZVRvdWNoTGlzdHMpOiBN b3ZlZCB0aGUgbG9vcCBvdmVyIG1fcGF0aCBoZXJlLiBOb3RpY2UgdGhhdCB0aGUgb3V0ZXIgbG9v cCBpdGVyYXRlcworICAgICAgICBvdmVyIG1fcGF0aCBpbnN0ZWFkIG9mIHRvdWNoTGlzdCBhcyBk b25lIGluIHVwZGF0ZVRvdWNoTGlzdHNJbkV2ZW50UGF0aC4gVGhlIGlubmVyIGxvb3AgZ29lcyB0 aHJvdWdoIHJlc29sdmVycworICAgICAgICBhbmQgYWRkcyBUb3VjaCBvYmplY3RzIGVhY2ggRXZl bnRDb250ZXh0IGFzIG5lZWRlZC4KKwogMjAxMy0xMC0xNCAgU2FtdWVsIFdoaXRlICA8c2FtdWVs X3doaXRlQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogZmllbGRzZXQgc2hvdWxkIGhhdmUgR3Jv dXBSb2xlIGFuZCBsZWdlbmQgc2hvdWxkIGJlIGRlc2NyaXB0aW9uLgpJbmRleDogU291cmNlL1dl YkNvcmUvZG9tL0V2ZW50Q29udGV4dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Rv bS9FdmVudENvbnRleHQuaAkocmV2aXNpb24gMTU3NDM2KQorKysgU291cmNlL1dlYkNvcmUvZG9t L0V2ZW50Q29udGV4dC5oCSh3b3JraW5nIGNvcHkpCkBAIC05MSw3ICs5MSw3IEBAIHB1YmxpYzoK ICAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlTG9jYWxFdmVudHMoRXZlbnQmKSBjb25zdCBPVkVSUklE RTsKICAgICB2aXJ0dWFsIGJvb2wgaXNUb3VjaEV2ZW50Q29udGV4dCgpIGNvbnN0IE9WRVJSSURF OwogCi0gICAgZW51bSBUb3VjaExpc3RUeXBlIHsgVG91Y2hlcywgVGFyZ2V0VG91Y2hlcywgQ2hh bmdlZFRvdWNoZXMsIH07CisgICAgZW51bSBUb3VjaExpc3RUeXBlIHsgVG91Y2hlcywgVGFyZ2V0 VG91Y2hlcywgQ2hhbmdlZFRvdWNoZXMsIE5vdFRvdWNoTGlzdCB9OwogICAgIFRvdWNoTGlzdCog dG91Y2hMaXN0KFRvdWNoTGlzdFR5cGUgdHlwZSkKICAgICB7CiAgICAgICAgIHN3aXRjaCAodHlw ZSkgewpAQCAtMTAxLDYgKzEwMSw4IEBAIHB1YmxpYzoKICAgICAgICAgICAgIHJldHVybiBtX3Rh cmdldFRvdWNoZXMuZ2V0KCk7CiAgICAgICAgIGNhc2UgQ2hhbmdlZFRvdWNoZXM6CiAgICAgICAg ICAgICByZXR1cm4gbV9jaGFuZ2VkVG91Y2hlcy5nZXQoKTsKKyAgICAgICAgY2FzZSBOb3RUb3Vj aExpc3Q6CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9kb20vRXZlbnREaXNwYXRjaGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9k b20vRXZlbnREaXNwYXRjaGVyLmNwcAkocmV2aXNpb24gMTU3NDM2KQorKysgU291cmNlL1dlYkNv cmUvZG9tL0V2ZW50RGlzcGF0Y2hlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExNiw4ICsxMTYs MzAgQEAgcHVibGljOgogICAgICAgICAsIG1fcmVsYXRlZE5vZGVUcmVlU2NvcGUocmVsYXRlZE5v ZGUudHJlZVNjb3BlKCkpCiAgICAgICAgICwgbV9yZWxhdGVkTm9kZUluQ3VycmVudFRyZWVTY29w ZShudWxscHRyKQogICAgICAgICAsIG1fY3VycmVudFRyZWVTY29wZShudWxscHRyKQorI2lmIEVO QUJMRShUT1VDSF9FVkVOVFMpCisgICAgICAgICwgbV90b3VjaCgwKQorICAgICAgICAsIG1fdG91 Y2hMaXN0VHlwZShOb3RUb3VjaExpc3QpCisjZW5kaWYKKyAgICB7CisgICAgfQorCisjaWYgRU5B QkxFKFRPVUNIX0VWRU5UUykKKyAgICBFdmVudFJlbGF0ZWROb2RlUmVzb2x2ZXIoVG91Y2gmIHRv dWNoLCBUb3VjaEV2ZW50Q29udGV4dDo6VG91Y2hMaXN0VHlwZSB0b3VjaExpc3RUeXBlKQorICAg ICAgICA6IG1fcmVsYXRlZE5vZGUoKnRvdWNoLnRhcmdldCgpLT50b05vZGUoKSkKKyAgICAgICAg LCBtX3JlbGF0ZWROb2RlVHJlZVNjb3BlKG1fcmVsYXRlZE5vZGUudHJlZVNjb3BlKCkpCisgICAg ICAgICwgbV9yZWxhdGVkTm9kZUluQ3VycmVudFRyZWVTY29wZShudWxscHRyKQorICAgICAgICAs IG1fY3VycmVudFRyZWVTY29wZShudWxscHRyKQorICAgICAgICAsIG1fdG91Y2goJnRvdWNoKQor ICAgICAgICAsIG1fdG91Y2hMaXN0VHlwZSh0b3VjaExpc3RUeXBlKQogICAgIHsKKyAgICAgICAg QVNTRVJUKHRvdWNoLnRhcmdldCgpLT50b05vZGUoKSk7CiAgICAgfQorI2VuZGlmCisKKyNpZiBF TkFCTEUoVE9VQ0hfRVZFTlRTKQorICAgIFRvdWNoKiB0b3VjaCgpIGNvbnN0IHsgcmV0dXJuIG1f dG91Y2g7IH0KKyAgICBUb3VjaEV2ZW50Q29udGV4dDo6VG91Y2hMaXN0VHlwZSB0b3VjaExpc3RU eXBlKCkgY29uc3QgeyByZXR1cm4gbV90b3VjaExpc3RUeXBlOyB9CisjZW5kaWYKIAogICAgIE5v ZGUqIG1vdmVUb1BhcmVudE9yU2hhZG93SG9zdChOb2RlJiBuZXdUYXJnZXQpCiAgICAgewpAQCAt MTQ4LDYgKzE3MCwxMCBAQCBwcml2YXRlOgogICAgIGNvbnN0IFRyZWVTY29wZSYgbV9yZWxhdGVk Tm9kZVRyZWVTY29wZTsKICAgICBOb2RlKiBtX3JlbGF0ZWROb2RlSW5DdXJyZW50VHJlZVNjb3Bl OwogICAgIFRyZWVTY29wZSogbV9jdXJyZW50VHJlZVNjb3BlOworI2lmIEVOQUJMRShUT1VDSF9F VkVOVFMpCisgICAgVG91Y2gqIG1fdG91Y2g7CisgICAgVG91Y2hFdmVudENvbnRleHQ6OlRvdWNo TGlzdFR5cGUgbV90b3VjaExpc3RUeXBlOworI2VuZGlmCiB9OwogCiBpbmxpbmUgRXZlbnRUYXJn ZXQmIGV2ZW50VGFyZ2V0UmVzcGVjdGluZ1RhcmdldFJ1bGVzKE5vZGUmIHJlZmVyZW5jZU5vZGUp CkBAIC00MDUsMjkgKzQzMSwzNSBAQCBFdmVudFBhdGg6OkV2ZW50UGF0aChOb2RlJiB0YXJnZXRO b2RlLCBFCiB9CiAKICNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQotdm9pZCBFdmVudFBhdGg6OnVw ZGF0ZVRvdWNoTGlzdHNJbkV2ZW50UGF0aChjb25zdCBUb3VjaExpc3QqIHRvdWNoTGlzdCwgVG91 Y2hFdmVudENvbnRleHQ6OlRvdWNoTGlzdFR5cGUgdG91Y2hMaXN0VHlwZSkKK3N0YXRpYyB2b2lk IGFkZFJlbGF0ZWROb2RlUmVzb2x2ZXJzRm9yVG91Y2hMaXN0KFZlY3RvcjxFdmVudFJlbGF0ZWRO b2RlUmVzb2x2ZXIsIDE2PiYgdG91Y2hUYXJnZXRSZXNvbHZlcnMsIFRvdWNoTGlzdCogdG91Y2hM aXN0LCBUb3VjaEV2ZW50Q29udGV4dDo6VG91Y2hMaXN0VHlwZSB0eXBlKQogewotICAgIGlmICgh dG91Y2hMaXN0KQotICAgICAgICByZXR1cm47Ci0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB0 b3VjaExpc3QtPmxlbmd0aCgpOyArK2kpIHsKLSAgICAgICAgY29uc3QgVG91Y2gmIHRvdWNoID0g KnRvdWNoTGlzdC0+aXRlbShpKTsKLQotICAgICAgICBBU1NFUlQodG91Y2gudGFyZ2V0KCktPnRv Tm9kZSgpKTsKLSAgICAgICAgRXZlbnRSZWxhdGVkTm9kZVJlc29sdmVyIHJlc29sdmVyKCp0b3Vj aC50YXJnZXQoKS0+dG9Ob2RlKCkpOwotICAgICAgICBzaXplX3QgZXZlbnRQYXRoU2l6ZSA9IG1f cGF0aC5zaXplKCk7Ci0gICAgICAgIGZvciAoc2l6ZV90IGogPSAwOyBqIDwgZXZlbnRQYXRoU2l6 ZTsgKytqKSB7Ci0gICAgICAgICAgICBFdmVudENvbnRleHQmIGNvbnRleHQgPSAqbV9wYXRoW2ld OwotICAgICAgICAgICAgTm9kZSogbm9kZUluQ3VycmVudFRyZWVTY29wZSA9IHJlc29sdmVyLm1v dmVUb1BhcmVudE9yU2hhZG93SG9zdCgqY29udGV4dC5ub2RlKCkpOwotICAgICAgICAgICAgdG9U b3VjaEV2ZW50Q29udGV4dChjb250ZXh0KS50b3VjaExpc3QodG91Y2hMaXN0VHlwZSktPmFwcGVu ZCh0b3VjaC5jbG9uZVdpdGhOZXdUYXJnZXQobm9kZUluQ3VycmVudFRyZWVTY29wZSkpOwotICAg ICAgICB9Ci0gICAgfQorICAgIGNvbnN0IHNpemVfdCB0b3VjaExpc3RTaXplID0gdG91Y2hMaXN0 LT5sZW5ndGgoKTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHRvdWNoTGlzdFNpemU7ICsr aSkKKyAgICAgICAgdG91Y2hUYXJnZXRSZXNvbHZlcnNbaV0uYXBwZW5kKEV2ZW50UmVsYXRlZE5v ZGVSZXNvbHZlcigqdG91Y2hMaXN0LT5pdGVtKGkpLCB0eXBlKSk7CiB9CiAKIHZvaWQgRXZlbnRQ YXRoOjp1cGRhdGVUb3VjaExpc3RzKGNvbnN0IFRvdWNoRXZlbnQmIHRvdWNoRXZlbnQpCiB7Ci0g ICAgdXBkYXRlVG91Y2hMaXN0c0luRXZlbnRQYXRoKHRvdWNoRXZlbnQudG91Y2hlcygpLCBUb3Vj aEV2ZW50Q29udGV4dDo6VG91Y2hlcyk7Ci0gICAgdXBkYXRlVG91Y2hMaXN0c0luRXZlbnRQYXRo KHRvdWNoRXZlbnQudGFyZ2V0VG91Y2hlcygpLCBUb3VjaEV2ZW50Q29udGV4dDo6VGFyZ2V0VG91 Y2hlcyk7Ci0gICAgdXBkYXRlVG91Y2hMaXN0c0luRXZlbnRQYXRoKHRvdWNoRXZlbnQuY2hhbmdl ZFRvdWNoZXMoKSwgVG91Y2hFdmVudENvbnRleHQ6OkNoYW5nZWRUb3VjaGVzKTsKKyAgICBWZWN0 b3I8RXZlbnRSZWxhdGVkTm9kZVJlc29sdmVyLCAxNj4gdG91Y2hUYXJnZXRSZXNvbHZlcnM7Cisg ICAgY29uc3Qgc2l6ZV90IHRvdWNoTm9kZUNvdW50ID0gdG91Y2hFdmVudC50b3VjaGVzKCktPmxl bmd0aCgpICsgdG91Y2hFdmVudC50YXJnZXRUb3VjaGVzKCktPmxlbmd0aCgpICsgdG91Y2hFdmVu dC5jaGFuZ2VkVG91Y2hlcygpLT5sZW5ndGgoKTsKKyAgICB0b3VjaFRhcmdldFJlc29sdmVycy5y ZXNlcnZlSW5pdGlhbENhcGFjaXR5KHRvdWNoTm9kZUNvdW50KTsKKworICAgIGFkZFJlbGF0ZWRO b2RlUmVzb2x2ZXJzRm9yVG91Y2hMaXN0KHRvdWNoVGFyZ2V0UmVzb2x2ZXJzLCB0b3VjaEV2ZW50 LnRvdWNoZXMoKSwgVG91Y2hFdmVudENvbnRleHQ6OlRvdWNoZXMpOworICAgIGFkZFJlbGF0ZWRO b2RlUmVzb2x2ZXJzRm9yVG91Y2hMaXN0KHRvdWNoVGFyZ2V0UmVzb2x2ZXJzLCB0b3VjaEV2ZW50 LnRhcmdldFRvdWNoZXMoKSwgVG91Y2hFdmVudENvbnRleHQ6OlRhcmdldFRvdWNoZXMpOworICAg IGFkZFJlbGF0ZWROb2RlUmVzb2x2ZXJzRm9yVG91Y2hMaXN0KHRvdWNoVGFyZ2V0UmVzb2x2ZXJz LCB0b3VjaEV2ZW50LmNoYW5nZWRUb3VjaGVzKCksIFRvdWNoRXZlbnRDb250ZXh0OjpDaGFuZ2Vk VG91Y2hlcyk7CisKKyAgICBBU1NFUlQodG91Y2hUYXJnZXRSZXNvbHZlcnMuc2l6ZSgpID09IHRv dWNoTm9kZUNvdW50KTsKKyAgICBzaXplX3QgZXZlbnRQYXRoU2l6ZSA9IG1fcGF0aC5zaXplKCk7 CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBldmVudFBhdGhTaXplOyArK2kpIHsKKyAgICAg ICAgVG91Y2hFdmVudENvbnRleHQmIGNvbnRleHQgPSB0b1RvdWNoRXZlbnRDb250ZXh0KCptX3Bh dGhbaV0pOworICAgICAgICBOb2RlJiBub2RlVG9Nb3ZlVG8gPSAqY29udGV4dC5ub2RlKCk7Cisg ICAgICAgIGZvciAoc2l6ZV90IHJlc29sdmVySW5kZXggPSAwOyByZXNvbHZlckluZGV4IDwgdG91 Y2hOb2RlQ291bnQ7ICsrcmVzb2x2ZXJJbmRleCkgeworICAgICAgICAgICAgRXZlbnRSZWxhdGVk Tm9kZVJlc29sdmVyJiBjdXJyZW50UmVzb2x2ZXIgPSB0b3VjaFRhcmdldFJlc29sdmVyc1tyZXNv bHZlckluZGV4XTsKKyAgICAgICAgICAgIE5vZGUqIG5vZGVJbkN1cnJlbnRUcmVlU2NvcGUgPSBj dXJyZW50UmVzb2x2ZXIubW92ZVRvUGFyZW50T3JTaGFkb3dIb3N0KG5vZGVUb01vdmVUbyk7Cisg ICAgICAgICAgICBBU1NFUlQoY3VycmVudFJlc29sdmVyLnRvdWNoKCkpOworICAgICAgICAgICAg Y29udGV4dC50b3VjaExpc3QoY3VycmVudFJlc29sdmVyLnRvdWNoTGlzdFR5cGUoKSktPmFwcGVu ZChjdXJyZW50UmVzb2x2ZXIudG91Y2goKS0+Y2xvbmVXaXRoTmV3VGFyZ2V0KG5vZGVJbkN1cnJl bnRUcmVlU2NvcGUpKTsKKyAgICAgICAgfQorICAgIH0KIH0KICNlbmRpZgogCg== 214222 2013-10-14 20:01:25 -0700 2013-10-14 20:41:37 -0700 Patch for landing bug-122804-20131014200124.patch text/plain 7227 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzQzNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTEwLTE0ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEV2ZW50UGF0aDo6dXBkYXRlVG91 Y2hMaXN0cyB0cmF2ZXJzZXMgdGhyb3VnaCBFdmVudFBhdGggdGhyaWNlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI4MDQKKworICAgICAgICBSZXZp ZXdlZCBieSBCZW5qYW1pbiBQb3VsYWluLgorCisgICAgICAgIEluc3RlYWQgb2YgdHJhdmVyc2lu ZyB0aHJvdWdoIEV2ZW50UGF0aCBmb3IgZWFjaCBUb3VjaExpc3QsIHRyYXZlcnNlIHRocm91Z2gg VG91Y2hMaXN0IGZvciBldmVyeSBFdmVudENvbnRleHQuCisgICAgICAgIFRoaXMgcGF2ZXMgb3Vy IHdheSB0byBoYXZlIG9uZS1wYXNzIHRyYXZlcnNhbCBvdmVyIEV2ZW50UGF0aCwgYW5kIGV2ZXR1 YWxseSB0byByZW1vdmUgRXZlbnRDb250ZXh0IGFsdG9nZXRoZXIuCisKKyAgICAgICAgVGhpcyBj aGFuZ2Ugc2hvdWxkIGFsc28gaW1wcm92ZSB0aGUgY2FjaGUgaGl0IHJhdGUgc2luY2UgYWxsIFRv dWNoIG9iamVjdHMgdGVuZCB0byBiZSBhbGxvY2F0ZWQgYXQgdGhlIHNhbWUgdGltZQorICAgICAg ICBidXQgdGhpcyBwZXJmb3JtYW5jZSBpbXByb3ZlbWVudCBpcyBwcm9iYWJseSBub3Qgb2JzZXJ2 YWJsZS4KKworICAgICAgICAqIGRvbS9FdmVudENvbnRleHQuaDoKKyAgICAgICAgKiBkb20vRXZl bnREaXNwYXRjaGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50UmVsYXRlZE5vZGVSZXNv bHZlcjo6RXZlbnRSZWxhdGVkTm9kZVJlc29sdmVyKTogQWRkZWQgYSBuZXcgY29uc3RydWN0b3Ig dGhhdCB0YWtlcyBUb3VjaCBhbmQKKyAgICAgICAgYW5kIFRvdWNoTGlzdFR5cGUuIFdlIG5lZWQg dG8gc3RvcmUgdGhlc2UgdHdvIHZhbHVlcyBpbiBvcmRlciB0byB1cGRhdGUgRXZlbnRDb250ZXh0 IGxhdGVyLgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRSZWxhdGVkTm9kZVJlc29sdmVyOjp0b3Vj aCk6IEFkZGVkLAorICAgICAgICAoV2ViQ29yZTo6RXZlbnRSZWxhdGVkTm9kZVJlc29sdmVyOjp0 b3VjaExpc3RUeXBlKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjphZGRSZWxhdGVkTm9kZVJl c29sdmVyc0ZvclRvdWNoTGlzdCk6IEV4dHJhY3RlZCBmcm9tIHVwZGF0ZVRvdWNoTGlzdHNJbkV2 ZW50UGF0aC4KKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50UGF0aDo6dXBkYXRlVG91Y2hMaXN0cyk6 IE1vdmVkIHRoZSBsb29wIG92ZXIgbV9wYXRoIGhlcmUuIE5vdGljZSB0aGF0IHRoZSBvdXRlciBs b29wIGl0ZXJhdGVzCisgICAgICAgIG92ZXIgbV9wYXRoIGluc3RlYWQgb2YgdG91Y2hMaXN0IGFz IGRvbmUgaW4gdXBkYXRlVG91Y2hMaXN0c0luRXZlbnRQYXRoLiBUaGUgaW5uZXIgbG9vcCBnb2Vz IHRocm91Z2ggcmVzb2x2ZXJzCisgICAgICAgIGFuZCBhZGRzIFRvdWNoIG9iamVjdHMgZWFjaCBF dmVudENvbnRleHQgYXMgbmVlZGVkLgorCiAyMDEzLTEwLTE0ICBTYW11ZWwgV2hpdGUgIDxzYW11 ZWxfd2hpdGVAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBmaWVsZHNldCBzaG91bGQgaGF2ZSBH cm91cFJvbGUgYW5kIGxlZ2VuZCBzaG91bGQgYmUgZGVzY3JpcHRpb24uCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9kb20vRXZlbnRDb250ZXh0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv ZG9tL0V2ZW50Q29udGV4dC5oCShyZXZpc2lvbiAxNTc0MzYpCisrKyBTb3VyY2UvV2ViQ29yZS9k b20vRXZlbnRDb250ZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTkxLDcgKzkxLDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVMb2NhbEV2ZW50cyhFdmVudCYpIGNvbnN0IE9WRVJS SURFOwogICAgIHZpcnR1YWwgYm9vbCBpc1RvdWNoRXZlbnRDb250ZXh0KCkgY29uc3QgT1ZFUlJJ REU7CiAKLSAgICBlbnVtIFRvdWNoTGlzdFR5cGUgeyBUb3VjaGVzLCBUYXJnZXRUb3VjaGVzLCBD aGFuZ2VkVG91Y2hlcywgfTsKKyAgICBlbnVtIFRvdWNoTGlzdFR5cGUgeyBUb3VjaGVzLCBUYXJn ZXRUb3VjaGVzLCBDaGFuZ2VkVG91Y2hlcywgTm90VG91Y2hMaXN0IH07CiAgICAgVG91Y2hMaXN0 KiB0b3VjaExpc3QoVG91Y2hMaXN0VHlwZSB0eXBlKQogICAgIHsKICAgICAgICAgc3dpdGNoICh0 eXBlKSB7CkBAIC0xMDEsNiArMTAxLDggQEAgcHVibGljOgogICAgICAgICAgICAgcmV0dXJuIG1f dGFyZ2V0VG91Y2hlcy5nZXQoKTsKICAgICAgICAgY2FzZSBDaGFuZ2VkVG91Y2hlczoKICAgICAg ICAgICAgIHJldHVybiBtX2NoYW5nZWRUb3VjaGVzLmdldCgpOworICAgICAgICBjYXNlIE5vdFRv dWNoTGlzdDoKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2RvbS9FdmVudERpc3BhdGNoZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2RvbS9FdmVudERpc3BhdGNoZXIuY3BwCShyZXZpc2lvbiAxNTc0MzYpCisrKyBTb3VyY2UvV2Vi Q29yZS9kb20vRXZlbnREaXNwYXRjaGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE2LDggKzEx NiwzMCBAQCBwdWJsaWM6CiAgICAgICAgICwgbV9yZWxhdGVkTm9kZVRyZWVTY29wZShyZWxhdGVk Tm9kZS50cmVlU2NvcGUoKSkKICAgICAgICAgLCBtX3JlbGF0ZWROb2RlSW5DdXJyZW50VHJlZVNj b3BlKG51bGxwdHIpCiAgICAgICAgICwgbV9jdXJyZW50VHJlZVNjb3BlKG51bGxwdHIpCisjaWYg RU5BQkxFKFRPVUNIX0VWRU5UUykKKyAgICAgICAgLCBtX3RvdWNoKDApCisgICAgICAgICwgbV90 b3VjaExpc3RUeXBlKE5vdFRvdWNoTGlzdCkKKyNlbmRpZgorICAgIHsKKyAgICB9CisKKyNpZiBF TkFCTEUoVE9VQ0hfRVZFTlRTKQorICAgIEV2ZW50UmVsYXRlZE5vZGVSZXNvbHZlcihUb3VjaCYg dG91Y2gsIFRvdWNoRXZlbnRDb250ZXh0OjpUb3VjaExpc3RUeXBlIHRvdWNoTGlzdFR5cGUpCisg ICAgICAgIDogbV9yZWxhdGVkTm9kZSgqdG91Y2gudGFyZ2V0KCktPnRvTm9kZSgpKQorICAgICAg ICAsIG1fcmVsYXRlZE5vZGVUcmVlU2NvcGUobV9yZWxhdGVkTm9kZS50cmVlU2NvcGUoKSkKKyAg ICAgICAgLCBtX3JlbGF0ZWROb2RlSW5DdXJyZW50VHJlZVNjb3BlKG51bGxwdHIpCisgICAgICAg ICwgbV9jdXJyZW50VHJlZVNjb3BlKG51bGxwdHIpCisgICAgICAgICwgbV90b3VjaCgmdG91Y2gp CisgICAgICAgICwgbV90b3VjaExpc3RUeXBlKHRvdWNoTGlzdFR5cGUpCiAgICAgeworICAgICAg ICBBU1NFUlQodG91Y2gudGFyZ2V0KCktPnRvTm9kZSgpKTsKICAgICB9CisjZW5kaWYKKworI2lm IEVOQUJMRShUT1VDSF9FVkVOVFMpCisgICAgVG91Y2gqIHRvdWNoKCkgY29uc3QgeyByZXR1cm4g bV90b3VjaDsgfQorICAgIFRvdWNoRXZlbnRDb250ZXh0OjpUb3VjaExpc3RUeXBlIHRvdWNoTGlz dFR5cGUoKSBjb25zdCB7IHJldHVybiBtX3RvdWNoTGlzdFR5cGU7IH0KKyNlbmRpZgogCiAgICAg Tm9kZSogbW92ZVRvUGFyZW50T3JTaGFkb3dIb3N0KE5vZGUmIG5ld1RhcmdldCkKICAgICB7CkBA IC0xNDgsNiArMTcwLDEwIEBAIHByaXZhdGU6CiAgICAgY29uc3QgVHJlZVNjb3BlJiBtX3JlbGF0 ZWROb2RlVHJlZVNjb3BlOwogICAgIE5vZGUqIG1fcmVsYXRlZE5vZGVJbkN1cnJlbnRUcmVlU2Nv cGU7CiAgICAgVHJlZVNjb3BlKiBtX2N1cnJlbnRUcmVlU2NvcGU7CisjaWYgRU5BQkxFKFRPVUNI X0VWRU5UUykKKyAgICBUb3VjaCogbV90b3VjaDsKKyAgICBUb3VjaEV2ZW50Q29udGV4dDo6VG91 Y2hMaXN0VHlwZSBtX3RvdWNoTGlzdFR5cGU7CisjZW5kaWYKIH07CiAKIGlubGluZSBFdmVudFRh cmdldCYgZXZlbnRUYXJnZXRSZXNwZWN0aW5nVGFyZ2V0UnVsZXMoTm9kZSYgcmVmZXJlbmNlTm9k ZSkKQEAgLTQwNSwyOSArNDMxLDM1IEBAIEV2ZW50UGF0aDo6RXZlbnRQYXRoKE5vZGUmIHRhcmdl dE5vZGUsIEUKIH0KIAogI2lmIEVOQUJMRShUT1VDSF9FVkVOVFMpCi12b2lkIEV2ZW50UGF0aDo6 dXBkYXRlVG91Y2hMaXN0c0luRXZlbnRQYXRoKGNvbnN0IFRvdWNoTGlzdCogdG91Y2hMaXN0LCBU b3VjaEV2ZW50Q29udGV4dDo6VG91Y2hMaXN0VHlwZSB0b3VjaExpc3RUeXBlKQorc3RhdGljIHZv aWQgYWRkUmVsYXRlZE5vZGVSZXNvbHZlcnNGb3JUb3VjaExpc3QoVmVjdG9yPEV2ZW50UmVsYXRl ZE5vZGVSZXNvbHZlciwgMTY+JiB0b3VjaFRhcmdldFJlc29sdmVycywgVG91Y2hMaXN0KiB0b3Vj aExpc3QsIFRvdWNoRXZlbnRDb250ZXh0OjpUb3VjaExpc3RUeXBlIHR5cGUpCiB7Ci0gICAgaWYg KCF0b3VjaExpc3QpCi0gICAgICAgIHJldHVybjsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8 IHRvdWNoTGlzdC0+bGVuZ3RoKCk7ICsraSkgewotICAgICAgICBjb25zdCBUb3VjaCYgdG91Y2gg PSAqdG91Y2hMaXN0LT5pdGVtKGkpOwotCi0gICAgICAgIEFTU0VSVCh0b3VjaC50YXJnZXQoKS0+ dG9Ob2RlKCkpOwotICAgICAgICBFdmVudFJlbGF0ZWROb2RlUmVzb2x2ZXIgcmVzb2x2ZXIoKnRv dWNoLnRhcmdldCgpLT50b05vZGUoKSk7Ci0gICAgICAgIHNpemVfdCBldmVudFBhdGhTaXplID0g bV9wYXRoLnNpemUoKTsKLSAgICAgICAgZm9yIChzaXplX3QgaiA9IDA7IGogPCBldmVudFBhdGhT aXplOyArK2opIHsKLSAgICAgICAgICAgIEV2ZW50Q29udGV4dCYgY29udGV4dCA9ICptX3BhdGhb aV07Ci0gICAgICAgICAgICBOb2RlKiBub2RlSW5DdXJyZW50VHJlZVNjb3BlID0gcmVzb2x2ZXIu bW92ZVRvUGFyZW50T3JTaGFkb3dIb3N0KCpjb250ZXh0Lm5vZGUoKSk7Ci0gICAgICAgICAgICB0 b1RvdWNoRXZlbnRDb250ZXh0KGNvbnRleHQpLnRvdWNoTGlzdCh0b3VjaExpc3RUeXBlKS0+YXBw ZW5kKHRvdWNoLmNsb25lV2l0aE5ld1RhcmdldChub2RlSW5DdXJyZW50VHJlZVNjb3BlKSk7Ci0g ICAgICAgIH0KLSAgICB9CisgICAgY29uc3Qgc2l6ZV90IHRvdWNoTGlzdFNpemUgPSB0b3VjaExp c3QtPmxlbmd0aCgpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgdG91Y2hMaXN0U2l6ZTsg KytpKQorICAgICAgICB0b3VjaFRhcmdldFJlc29sdmVycy5hcHBlbmQoRXZlbnRSZWxhdGVkTm9k ZVJlc29sdmVyKCp0b3VjaExpc3QtPml0ZW0oaSksIHR5cGUpKTsKIH0KIAogdm9pZCBFdmVudFBh dGg6OnVwZGF0ZVRvdWNoTGlzdHMoY29uc3QgVG91Y2hFdmVudCYgdG91Y2hFdmVudCkKIHsKLSAg ICB1cGRhdGVUb3VjaExpc3RzSW5FdmVudFBhdGgodG91Y2hFdmVudC50b3VjaGVzKCksIFRvdWNo RXZlbnRDb250ZXh0OjpUb3VjaGVzKTsKLSAgICB1cGRhdGVUb3VjaExpc3RzSW5FdmVudFBhdGgo dG91Y2hFdmVudC50YXJnZXRUb3VjaGVzKCksIFRvdWNoRXZlbnRDb250ZXh0OjpUYXJnZXRUb3Vj aGVzKTsKLSAgICB1cGRhdGVUb3VjaExpc3RzSW5FdmVudFBhdGgodG91Y2hFdmVudC5jaGFuZ2Vk VG91Y2hlcygpLCBUb3VjaEV2ZW50Q29udGV4dDo6Q2hhbmdlZFRvdWNoZXMpOworICAgIFZlY3Rv cjxFdmVudFJlbGF0ZWROb2RlUmVzb2x2ZXIsIDE2PiB0b3VjaFRhcmdldFJlc29sdmVyczsKKyAg ICBjb25zdCBzaXplX3QgdG91Y2hOb2RlQ291bnQgPSB0b3VjaEV2ZW50LnRvdWNoZXMoKS0+bGVu Z3RoKCkgKyB0b3VjaEV2ZW50LnRhcmdldFRvdWNoZXMoKS0+bGVuZ3RoKCkgKyB0b3VjaEV2ZW50 LmNoYW5nZWRUb3VjaGVzKCktPmxlbmd0aCgpOworICAgIHRvdWNoVGFyZ2V0UmVzb2x2ZXJzLnJl c2VydmVJbml0aWFsQ2FwYWNpdHkodG91Y2hOb2RlQ291bnQpOworCisgICAgYWRkUmVsYXRlZE5v ZGVSZXNvbHZlcnNGb3JUb3VjaExpc3QodG91Y2hUYXJnZXRSZXNvbHZlcnMsIHRvdWNoRXZlbnQu dG91Y2hlcygpLCBUb3VjaEV2ZW50Q29udGV4dDo6VG91Y2hlcyk7CisgICAgYWRkUmVsYXRlZE5v ZGVSZXNvbHZlcnNGb3JUb3VjaExpc3QodG91Y2hUYXJnZXRSZXNvbHZlcnMsIHRvdWNoRXZlbnQu dGFyZ2V0VG91Y2hlcygpLCBUb3VjaEV2ZW50Q29udGV4dDo6VGFyZ2V0VG91Y2hlcyk7CisgICAg YWRkUmVsYXRlZE5vZGVSZXNvbHZlcnNGb3JUb3VjaExpc3QodG91Y2hUYXJnZXRSZXNvbHZlcnMs IHRvdWNoRXZlbnQuY2hhbmdlZFRvdWNoZXMoKSwgVG91Y2hFdmVudENvbnRleHQ6OkNoYW5nZWRU b3VjaGVzKTsKKworICAgIEFTU0VSVCh0b3VjaFRhcmdldFJlc29sdmVycy5zaXplKCkgPT0gdG91 Y2hOb2RlQ291bnQpOworICAgIHNpemVfdCBldmVudFBhdGhTaXplID0gbV9wYXRoLnNpemUoKTsK KyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGV2ZW50UGF0aFNpemU7ICsraSkgeworICAgICAg ICBUb3VjaEV2ZW50Q29udGV4dCYgY29udGV4dCA9IHRvVG91Y2hFdmVudENvbnRleHQoKm1fcGF0 aFtpXSk7CisgICAgICAgIE5vZGUmIG5vZGVUb01vdmVUbyA9ICpjb250ZXh0Lm5vZGUoKTsKKyAg ICAgICAgZm9yIChzaXplX3QgcmVzb2x2ZXJJbmRleCA9IDA7IHJlc29sdmVySW5kZXggPCB0b3Vj aE5vZGVDb3VudDsgKytyZXNvbHZlckluZGV4KSB7CisgICAgICAgICAgICBFdmVudFJlbGF0ZWRO b2RlUmVzb2x2ZXImIGN1cnJlbnRSZXNvbHZlciA9IHRvdWNoVGFyZ2V0UmVzb2x2ZXJzW3Jlc29s dmVySW5kZXhdOworICAgICAgICAgICAgTm9kZSogbm9kZUluQ3VycmVudFRyZWVTY29wZSA9IGN1 cnJlbnRSZXNvbHZlci5tb3ZlVG9QYXJlbnRPclNoYWRvd0hvc3Qobm9kZVRvTW92ZVRvKTsKKyAg ICAgICAgICAgIEFTU0VSVChjdXJyZW50UmVzb2x2ZXIudG91Y2goKSk7CisgICAgICAgICAgICBj b250ZXh0LnRvdWNoTGlzdChjdXJyZW50UmVzb2x2ZXIudG91Y2hMaXN0VHlwZSgpKS0+YXBwZW5k KGN1cnJlbnRSZXNvbHZlci50b3VjaCgpLT5jbG9uZVdpdGhOZXdUYXJnZXQobm9kZUluQ3VycmVu dFRyZWVTY29wZSkpOworICAgICAgICB9CisgICAgfQogfQogI2VuZGlmCiAK 214225 2013-10-14 20:41:40 -0700 2013-10-14 20:41:40 -0700 Another build fix attempt bug-122804-20131014204140.patch text/plain 7246 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzQzNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTEwLTE0ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEV2ZW50UGF0aDo6dXBkYXRlVG91 Y2hMaXN0cyB0cmF2ZXJzZXMgdGhyb3VnaCBFdmVudFBhdGggdGhyaWNlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI4MDQKKworICAgICAgICBSZXZp ZXdlZCBieSBCZW5qYW1pbiBQb3VsYWluLgorCisgICAgICAgIEluc3RlYWQgb2YgdHJhdmVyc2lu ZyB0aHJvdWdoIEV2ZW50UGF0aCBmb3IgZWFjaCBUb3VjaExpc3QsIHRyYXZlcnNlIHRocm91Z2gg VG91Y2hMaXN0IGZvciBldmVyeSBFdmVudENvbnRleHQuCisgICAgICAgIFRoaXMgcGF2ZXMgb3Vy IHdheSB0byBoYXZlIG9uZS1wYXNzIHRyYXZlcnNhbCBvdmVyIEV2ZW50UGF0aCwgYW5kIGV2ZXR1 YWxseSB0byByZW1vdmUgRXZlbnRDb250ZXh0IGFsdG9nZXRoZXIuCisKKyAgICAgICAgVGhpcyBj aGFuZ2Ugc2hvdWxkIGFsc28gaW1wcm92ZSB0aGUgY2FjaGUgaGl0IHJhdGUgc2luY2UgYWxsIFRv dWNoIG9iamVjdHMgdGVuZCB0byBiZSBhbGxvY2F0ZWQgYXQgdGhlIHNhbWUgdGltZQorICAgICAg ICBidXQgdGhpcyBwZXJmb3JtYW5jZSBpbXByb3ZlbWVudCBpcyBwcm9iYWJseSBub3Qgb2JzZXJ2 YWJsZS4KKworICAgICAgICAqIGRvbS9FdmVudENvbnRleHQuaDoKKyAgICAgICAgKiBkb20vRXZl bnREaXNwYXRjaGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50UmVsYXRlZE5vZGVSZXNv bHZlcjo6RXZlbnRSZWxhdGVkTm9kZVJlc29sdmVyKTogQWRkZWQgYSBuZXcgY29uc3RydWN0b3Ig dGhhdCB0YWtlcyBUb3VjaCBhbmQKKyAgICAgICAgYW5kIFRvdWNoTGlzdFR5cGUuIFdlIG5lZWQg dG8gc3RvcmUgdGhlc2UgdHdvIHZhbHVlcyBpbiBvcmRlciB0byB1cGRhdGUgRXZlbnRDb250ZXh0 IGxhdGVyLgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRSZWxhdGVkTm9kZVJlc29sdmVyOjp0b3Vj aCk6IEFkZGVkLAorICAgICAgICAoV2ViQ29yZTo6RXZlbnRSZWxhdGVkTm9kZVJlc29sdmVyOjp0 b3VjaExpc3RUeXBlKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjphZGRSZWxhdGVkTm9kZVJl c29sdmVyc0ZvclRvdWNoTGlzdCk6IEV4dHJhY3RlZCBmcm9tIHVwZGF0ZVRvdWNoTGlzdHNJbkV2 ZW50UGF0aC4KKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50UGF0aDo6dXBkYXRlVG91Y2hMaXN0cyk6 IE1vdmVkIHRoZSBsb29wIG92ZXIgbV9wYXRoIGhlcmUuIE5vdGljZSB0aGF0IHRoZSBvdXRlciBs b29wIGl0ZXJhdGVzCisgICAgICAgIG92ZXIgbV9wYXRoIGluc3RlYWQgb2YgdG91Y2hMaXN0IGFz IGRvbmUgaW4gdXBkYXRlVG91Y2hMaXN0c0luRXZlbnRQYXRoLiBUaGUgaW5uZXIgbG9vcCBnb2Vz IHRocm91Z2ggcmVzb2x2ZXJzCisgICAgICAgIGFuZCBhZGRzIFRvdWNoIG9iamVjdHMgZWFjaCBF dmVudENvbnRleHQgYXMgbmVlZGVkLgorCiAyMDEzLTEwLTE0ICBTYW11ZWwgV2hpdGUgIDxzYW11 ZWxfd2hpdGVAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBmaWVsZHNldCBzaG91bGQgaGF2ZSBH cm91cFJvbGUgYW5kIGxlZ2VuZCBzaG91bGQgYmUgZGVzY3JpcHRpb24uCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9kb20vRXZlbnRDb250ZXh0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv ZG9tL0V2ZW50Q29udGV4dC5oCShyZXZpc2lvbiAxNTc0MzYpCisrKyBTb3VyY2UvV2ViQ29yZS9k b20vRXZlbnRDb250ZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTkxLDcgKzkxLDcgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVMb2NhbEV2ZW50cyhFdmVudCYpIGNvbnN0IE9WRVJS SURFOwogICAgIHZpcnR1YWwgYm9vbCBpc1RvdWNoRXZlbnRDb250ZXh0KCkgY29uc3QgT1ZFUlJJ REU7CiAKLSAgICBlbnVtIFRvdWNoTGlzdFR5cGUgeyBUb3VjaGVzLCBUYXJnZXRUb3VjaGVzLCBD aGFuZ2VkVG91Y2hlcywgfTsKKyAgICBlbnVtIFRvdWNoTGlzdFR5cGUgeyBUb3VjaGVzLCBUYXJn ZXRUb3VjaGVzLCBDaGFuZ2VkVG91Y2hlcywgTm90VG91Y2hMaXN0IH07CiAgICAgVG91Y2hMaXN0 KiB0b3VjaExpc3QoVG91Y2hMaXN0VHlwZSB0eXBlKQogICAgIHsKICAgICAgICAgc3dpdGNoICh0 eXBlKSB7CkBAIC0xMDEsNiArMTAxLDggQEAgcHVibGljOgogICAgICAgICAgICAgcmV0dXJuIG1f dGFyZ2V0VG91Y2hlcy5nZXQoKTsKICAgICAgICAgY2FzZSBDaGFuZ2VkVG91Y2hlczoKICAgICAg ICAgICAgIHJldHVybiBtX2NoYW5nZWRUb3VjaGVzLmdldCgpOworICAgICAgICBjYXNlIE5vdFRv dWNoTGlzdDoKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2RvbS9FdmVudERpc3BhdGNoZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2RvbS9FdmVudERpc3BhdGNoZXIuY3BwCShyZXZpc2lvbiAxNTc0MzYpCisrKyBTb3VyY2UvV2Vi Q29yZS9kb20vRXZlbnREaXNwYXRjaGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE2LDggKzEx NiwzMCBAQCBwdWJsaWM6CiAgICAgICAgICwgbV9yZWxhdGVkTm9kZVRyZWVTY29wZShyZWxhdGVk Tm9kZS50cmVlU2NvcGUoKSkKICAgICAgICAgLCBtX3JlbGF0ZWROb2RlSW5DdXJyZW50VHJlZVNj b3BlKG51bGxwdHIpCiAgICAgICAgICwgbV9jdXJyZW50VHJlZVNjb3BlKG51bGxwdHIpCisjaWYg RU5BQkxFKFRPVUNIX0VWRU5UUykKKyAgICAgICAgLCBtX3RvdWNoKDApCisgICAgICAgICwgbV90 b3VjaExpc3RUeXBlKFRvdWNoRXZlbnRDb250ZXh0OjpOb3RUb3VjaExpc3QpCisjZW5kaWYKKyAg ICB7CisgICAgfQorCisjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKKyAgICBFdmVudFJlbGF0ZWRO b2RlUmVzb2x2ZXIoVG91Y2gmIHRvdWNoLCBUb3VjaEV2ZW50Q29udGV4dDo6VG91Y2hMaXN0VHlw ZSB0b3VjaExpc3RUeXBlKQorICAgICAgICA6IG1fcmVsYXRlZE5vZGUoKnRvdWNoLnRhcmdldCgp LT50b05vZGUoKSkKKyAgICAgICAgLCBtX3JlbGF0ZWROb2RlVHJlZVNjb3BlKG1fcmVsYXRlZE5v ZGUudHJlZVNjb3BlKCkpCisgICAgICAgICwgbV9yZWxhdGVkTm9kZUluQ3VycmVudFRyZWVTY29w ZShudWxscHRyKQorICAgICAgICAsIG1fY3VycmVudFRyZWVTY29wZShudWxscHRyKQorICAgICAg ICAsIG1fdG91Y2goJnRvdWNoKQorICAgICAgICAsIG1fdG91Y2hMaXN0VHlwZSh0b3VjaExpc3RU eXBlKQogICAgIHsKKyAgICAgICAgQVNTRVJUKHRvdWNoLnRhcmdldCgpLT50b05vZGUoKSk7CiAg ICAgfQorI2VuZGlmCisKKyNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQorICAgIFRvdWNoKiB0b3Vj aCgpIGNvbnN0IHsgcmV0dXJuIG1fdG91Y2g7IH0KKyAgICBUb3VjaEV2ZW50Q29udGV4dDo6VG91 Y2hMaXN0VHlwZSB0b3VjaExpc3RUeXBlKCkgY29uc3QgeyByZXR1cm4gbV90b3VjaExpc3RUeXBl OyB9CisjZW5kaWYKIAogICAgIE5vZGUqIG1vdmVUb1BhcmVudE9yU2hhZG93SG9zdChOb2RlJiBu ZXdUYXJnZXQpCiAgICAgewpAQCAtMTQ4LDYgKzE3MCwxMCBAQCBwcml2YXRlOgogICAgIGNvbnN0 IFRyZWVTY29wZSYgbV9yZWxhdGVkTm9kZVRyZWVTY29wZTsKICAgICBOb2RlKiBtX3JlbGF0ZWRO b2RlSW5DdXJyZW50VHJlZVNjb3BlOwogICAgIFRyZWVTY29wZSogbV9jdXJyZW50VHJlZVNjb3Bl OworI2lmIEVOQUJMRShUT1VDSF9FVkVOVFMpCisgICAgVG91Y2gqIG1fdG91Y2g7CisgICAgVG91 Y2hFdmVudENvbnRleHQ6OlRvdWNoTGlzdFR5cGUgbV90b3VjaExpc3RUeXBlOworI2VuZGlmCiB9 OwogCiBpbmxpbmUgRXZlbnRUYXJnZXQmIGV2ZW50VGFyZ2V0UmVzcGVjdGluZ1RhcmdldFJ1bGVz KE5vZGUmIHJlZmVyZW5jZU5vZGUpCkBAIC00MDUsMjkgKzQzMSwzNSBAQCBFdmVudFBhdGg6OkV2 ZW50UGF0aChOb2RlJiB0YXJnZXROb2RlLCBFCiB9CiAKICNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRT KQotdm9pZCBFdmVudFBhdGg6OnVwZGF0ZVRvdWNoTGlzdHNJbkV2ZW50UGF0aChjb25zdCBUb3Vj aExpc3QqIHRvdWNoTGlzdCwgVG91Y2hFdmVudENvbnRleHQ6OlRvdWNoTGlzdFR5cGUgdG91Y2hM aXN0VHlwZSkKK3N0YXRpYyB2b2lkIGFkZFJlbGF0ZWROb2RlUmVzb2x2ZXJzRm9yVG91Y2hMaXN0 KFZlY3RvcjxFdmVudFJlbGF0ZWROb2RlUmVzb2x2ZXIsIDE2PiYgdG91Y2hUYXJnZXRSZXNvbHZl cnMsIFRvdWNoTGlzdCogdG91Y2hMaXN0LCBUb3VjaEV2ZW50Q29udGV4dDo6VG91Y2hMaXN0VHlw ZSB0eXBlKQogewotICAgIGlmICghdG91Y2hMaXN0KQotICAgICAgICByZXR1cm47Ci0gICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCB0b3VjaExpc3QtPmxlbmd0aCgpOyArK2kpIHsKLSAgICAgICAg Y29uc3QgVG91Y2gmIHRvdWNoID0gKnRvdWNoTGlzdC0+aXRlbShpKTsKLQotICAgICAgICBBU1NF UlQodG91Y2gudGFyZ2V0KCktPnRvTm9kZSgpKTsKLSAgICAgICAgRXZlbnRSZWxhdGVkTm9kZVJl c29sdmVyIHJlc29sdmVyKCp0b3VjaC50YXJnZXQoKS0+dG9Ob2RlKCkpOwotICAgICAgICBzaXpl X3QgZXZlbnRQYXRoU2l6ZSA9IG1fcGF0aC5zaXplKCk7Ci0gICAgICAgIGZvciAoc2l6ZV90IGog PSAwOyBqIDwgZXZlbnRQYXRoU2l6ZTsgKytqKSB7Ci0gICAgICAgICAgICBFdmVudENvbnRleHQm IGNvbnRleHQgPSAqbV9wYXRoW2ldOwotICAgICAgICAgICAgTm9kZSogbm9kZUluQ3VycmVudFRy ZWVTY29wZSA9IHJlc29sdmVyLm1vdmVUb1BhcmVudE9yU2hhZG93SG9zdCgqY29udGV4dC5ub2Rl KCkpOwotICAgICAgICAgICAgdG9Ub3VjaEV2ZW50Q29udGV4dChjb250ZXh0KS50b3VjaExpc3Qo dG91Y2hMaXN0VHlwZSktPmFwcGVuZCh0b3VjaC5jbG9uZVdpdGhOZXdUYXJnZXQobm9kZUluQ3Vy cmVudFRyZWVTY29wZSkpOwotICAgICAgICB9Ci0gICAgfQorICAgIGNvbnN0IHNpemVfdCB0b3Vj aExpc3RTaXplID0gdG91Y2hMaXN0LT5sZW5ndGgoKTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsg aSA8IHRvdWNoTGlzdFNpemU7ICsraSkKKyAgICAgICAgdG91Y2hUYXJnZXRSZXNvbHZlcnMuYXBw ZW5kKEV2ZW50UmVsYXRlZE5vZGVSZXNvbHZlcigqdG91Y2hMaXN0LT5pdGVtKGkpLCB0eXBlKSk7 CiB9CiAKIHZvaWQgRXZlbnRQYXRoOjp1cGRhdGVUb3VjaExpc3RzKGNvbnN0IFRvdWNoRXZlbnQm IHRvdWNoRXZlbnQpCiB7Ci0gICAgdXBkYXRlVG91Y2hMaXN0c0luRXZlbnRQYXRoKHRvdWNoRXZl bnQudG91Y2hlcygpLCBUb3VjaEV2ZW50Q29udGV4dDo6VG91Y2hlcyk7Ci0gICAgdXBkYXRlVG91 Y2hMaXN0c0luRXZlbnRQYXRoKHRvdWNoRXZlbnQudGFyZ2V0VG91Y2hlcygpLCBUb3VjaEV2ZW50 Q29udGV4dDo6VGFyZ2V0VG91Y2hlcyk7Ci0gICAgdXBkYXRlVG91Y2hMaXN0c0luRXZlbnRQYXRo KHRvdWNoRXZlbnQuY2hhbmdlZFRvdWNoZXMoKSwgVG91Y2hFdmVudENvbnRleHQ6OkNoYW5nZWRU b3VjaGVzKTsKKyAgICBWZWN0b3I8RXZlbnRSZWxhdGVkTm9kZVJlc29sdmVyLCAxNj4gdG91Y2hU YXJnZXRSZXNvbHZlcnM7CisgICAgY29uc3Qgc2l6ZV90IHRvdWNoTm9kZUNvdW50ID0gdG91Y2hF dmVudC50b3VjaGVzKCktPmxlbmd0aCgpICsgdG91Y2hFdmVudC50YXJnZXRUb3VjaGVzKCktPmxl bmd0aCgpICsgdG91Y2hFdmVudC5jaGFuZ2VkVG91Y2hlcygpLT5sZW5ndGgoKTsKKyAgICB0b3Vj aFRhcmdldFJlc29sdmVycy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KHRvdWNoTm9kZUNvdW50KTsK KworICAgIGFkZFJlbGF0ZWROb2RlUmVzb2x2ZXJzRm9yVG91Y2hMaXN0KHRvdWNoVGFyZ2V0UmVz b2x2ZXJzLCB0b3VjaEV2ZW50LnRvdWNoZXMoKSwgVG91Y2hFdmVudENvbnRleHQ6OlRvdWNoZXMp OworICAgIGFkZFJlbGF0ZWROb2RlUmVzb2x2ZXJzRm9yVG91Y2hMaXN0KHRvdWNoVGFyZ2V0UmVz b2x2ZXJzLCB0b3VjaEV2ZW50LnRhcmdldFRvdWNoZXMoKSwgVG91Y2hFdmVudENvbnRleHQ6OlRh cmdldFRvdWNoZXMpOworICAgIGFkZFJlbGF0ZWROb2RlUmVzb2x2ZXJzRm9yVG91Y2hMaXN0KHRv dWNoVGFyZ2V0UmVzb2x2ZXJzLCB0b3VjaEV2ZW50LmNoYW5nZWRUb3VjaGVzKCksIFRvdWNoRXZl bnRDb250ZXh0OjpDaGFuZ2VkVG91Y2hlcyk7CisKKyAgICBBU1NFUlQodG91Y2hUYXJnZXRSZXNv bHZlcnMuc2l6ZSgpID09IHRvdWNoTm9kZUNvdW50KTsKKyAgICBzaXplX3QgZXZlbnRQYXRoU2l6 ZSA9IG1fcGF0aC5zaXplKCk7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBldmVudFBhdGhT aXplOyArK2kpIHsKKyAgICAgICAgVG91Y2hFdmVudENvbnRleHQmIGNvbnRleHQgPSB0b1RvdWNo RXZlbnRDb250ZXh0KCptX3BhdGhbaV0pOworICAgICAgICBOb2RlJiBub2RlVG9Nb3ZlVG8gPSAq Y29udGV4dC5ub2RlKCk7CisgICAgICAgIGZvciAoc2l6ZV90IHJlc29sdmVySW5kZXggPSAwOyBy ZXNvbHZlckluZGV4IDwgdG91Y2hOb2RlQ291bnQ7ICsrcmVzb2x2ZXJJbmRleCkgeworICAgICAg ICAgICAgRXZlbnRSZWxhdGVkTm9kZVJlc29sdmVyJiBjdXJyZW50UmVzb2x2ZXIgPSB0b3VjaFRh cmdldFJlc29sdmVyc1tyZXNvbHZlckluZGV4XTsKKyAgICAgICAgICAgIE5vZGUqIG5vZGVJbkN1 cnJlbnRUcmVlU2NvcGUgPSBjdXJyZW50UmVzb2x2ZXIubW92ZVRvUGFyZW50T3JTaGFkb3dIb3N0 KG5vZGVUb01vdmVUbyk7CisgICAgICAgICAgICBBU1NFUlQoY3VycmVudFJlc29sdmVyLnRvdWNo KCkpOworICAgICAgICAgICAgY29udGV4dC50b3VjaExpc3QoY3VycmVudFJlc29sdmVyLnRvdWNo TGlzdFR5cGUoKSktPmFwcGVuZChjdXJyZW50UmVzb2x2ZXIudG91Y2goKS0+Y2xvbmVXaXRoTmV3 VGFyZ2V0KG5vZGVJbkN1cnJlbnRUcmVlU2NvcGUpKTsKKyAgICAgICAgfQorICAgIH0KIH0KICNl bmRpZgogCg==