122477 2013-10-07 18:17:12 -0700 Make buildRelatedNodeMap and findRelatedNode static to EventRetargeter.cpp 2013-10-08 00:08:30 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa andersca benjamin commit-queue esprehn+autocc kangil.han kling koivisto oldest_to_newest 937303 0 rniwa 2013-10-07 18:17:12 -0700 Make buildRelatedNodeMap and findRelatedNode static to EventRetargeter.cpp 937306 1 213636 rniwa 2013-10-07 18:23:01 -0700 Created attachment 213636 Cleanup 937312 2 213637 rniwa 2013-10-07 18:26:36 -0700 Created attachment 213637 Minor bug fix 937319 3 213637 koivisto 2013-10-07 18:32:07 -0700 Comment on attachment 213637 Minor bug fix View in context: https://bugs.webkit.org/attachment.cgi?id=213637&action=review > Source/WebCore/dom/EventRetargeter.cpp:184 > +static void buildRelatedNodeMap(const Node* relatedNode, HashMap<TreeScope*, Node*>& relatedNodeMap) I wish these had more descriptive names. Related to what and how? Same applies to variable names in this code. > Source/WebCore/dom/EventRetargeter.h:65 > typedef Vector<RefPtr<Node> > AdjustedNodes; Would be nice to remove this opaque typedef too. 937324 4 213637 rniwa 2013-10-07 19:03:03 -0700 Comment on attachment 213637 Minor bug fix View in context: https://bugs.webkit.org/attachment.cgi?id=213637&action=review >> Source/WebCore/dom/EventRetargeter.cpp:184 >> +static void buildRelatedNodeMap(const Node* relatedNode, HashMap<TreeScope*, Node*>& relatedNodeMap) > > I wish these had more descriptive names. Related to what and how? Same applies to variable names in this code. I think they're referring to https://developer.mozilla.org/en-US/docs/Web/API/event.relatedTarget but I agree it'll be nice if we could come up with a better name. 937350 5 rniwa 2013-10-07 20:38:01 -0700 Committed r157083: <http://trac.webkit.org/changeset/157083> 213636 2013-10-07 18:23:01 -0700 2013-10-07 18:26:34 -0700 Cleanup bug-122477-20131007182300.patch text/plain 7217 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzA3MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEzLTEwLTA3ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1ha2UgYnVpbGRSZWxhdGVkTm9k ZU1hcCBhbmQgZmluZFJlbGF0ZWROb2RlIHN0YXRpYyB0byBFdmVudFJldGFyZ2V0ZXIuY3BwCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI0NzcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIEV2ZW50 UmV0YXJnZXRlcjo6YnVpbGRSZWxhdGVkTm9kZU1hcCBhbmQgRXZlbnRSZXRhcmdldGVyOjpmaW5k UmVsYXRlZE5vZGUgc3RhdGljIGxvY2FsIGZ1bmN0aW9ucworICAgICAgICBpbiBFdmVudFJldGFy Z2V0ZXIuY3BwIHNpbmNlIHRoZXkncmUgb25seSBjYWxsZWQgaW4gRXZlbnRSZXRhcmdldGVyOjpj YWxjdWxhdGVBZGp1c3RlZE5vZGVzIGFuZCBkb24ndAorICAgICAgICBkZXBlbmQgb24gYW55IG9o ZXIgbWVtYmVyIGZ1bmN0aW9uIG9yIHZhcmlhYmxlIChFdmVudFJldGFyZ2VyIGRvZXNuJ3QgaGF2 ZSBhbnkgbWVtYmVyIHZhcmlhYmxlcykuCisKKyAgICAgICAgQWxzbyBnZXQgcmlkIG9mIFZlY3Rv ciBsb2NhbCB2YXJpYWJsZXMgaW4gYm90aCBmdW5jdGlvbnMgYXMgdGhleSdyZSByZWR1bmRhbnQu CisKKyAgICAgICAgKiBkb20vRXZlbnRSZXRhcmdldGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OmJ1aWxkUmVsYXRlZE5vZGVNYXApOiBNb3ZlZC4gUmVwbGFjZWQgVmVjdG9yPE5vZGUqLCAzMj4g cmVsYXRlZE5vZGVTdGFjayBieSBhIHNpbmdsZSBwb2ludGVyCisgICAgICAgIHNpbmNlIHRoZSBv bmx5IHRpbWUgd2UgYWRkIGFuIGl0ZW0gdG8gdGhpcyBWZWN0b3IgaXMgd2hlbiBpdCdzIGVtcHR5 LCBhbmQgd2UgYWx3YXlzIHVzZSBvciByZW1vdmUgdGhlCisgICAgICAgIGxhc3QgaXRlbS4KKyAg ICAgICAgKFdlYkNvcmU6OmFkZFJlbGF0ZWROb2RlRm9yVW5tYXBlZFRyZWVTY29wZXMpOiBNb3Zl ZC4gUmVtb3ZlZCBWZWN0b3I8VHJlZVNjb3BlKiwgMzI+IHBhcmVudFRyZWVTY29wZXMKKyAgICAg ICAgc2luY2UgaXQgb25seSBjb250YWlucyB0aGUgYW5jZXN0b3IgdHJlZSBzY29wZXMgb2Ygc2Nv cGUgdXAgdG8gYSB0cmVlIHNjb3BlIGFscmVhZHkgaW4gcmVsYXRlZE5vZGVNYXAuCisgICAgICAg IFdlIGNvdWxkIHNpbXBseSByZW1lbWJlciB0aGlzIHRyZWUgc2NvcGUgYW5kIHJlLXRyYXZlcnNl IHRoZSBhbmNlc3RvciB0cmVlIHNjb3BlcyBpbiB0aGUgc2Vjb25kIGxvb3AuCisgICAgICAgIChX ZWJDb3JlOjpFdmVudFJldGFyZ2V0ZXI6OmNhbGN1bGF0ZUFkanVzdGVkTm9kZXMpOgorICAgICAg ICAqIGRvbS9FdmVudFJldGFyZ2V0ZXIuaDoKKwogMjAxMy0xMC0wNyAgQW5kZXJzIENhcmxzc29u ICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSB0ZXN0IHJlc3VsdHMuCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRSZXRhcmdldGVyLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRSZXRhcmdldGVyLmNwcAkocmV2aXNpb24gMTU3MDU1 KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50UmV0YXJnZXRlci5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTE4MSw5ICsxODEsNDUgQEAgdm9pZCBFdmVudFJldGFyZ2V0ZXI6OmFkanVzdEZvclJl bGF0ZWRUYQogICAgIH0KIH0KIAorc3RhdGljIHZvaWQgYnVpbGRSZWxhdGVkTm9kZU1hcChjb25z dCBOb2RlKiByZWxhdGVkTm9kZSwgSGFzaE1hcDxUcmVlU2NvcGUqLCBOb2RlKj4mIHJlbGF0ZWRO b2RlTWFwKQoreworICAgIE5vZGUqIHJlbGF0ZWROb2RlSW5DdXJyZW50VHJlZSA9IDA7CisgICAg VHJlZVNjb3BlKiBsYXN0VHJlZVNjb3BlID0gMDsKKyAgICBmb3IgKE5vZGUqIG5vZGUgPSBub2Rl T3JIb3N0SWZQc2V1ZG9FbGVtZW50KGNvbnN0X2Nhc3Q8Tm9kZSo+KHJlbGF0ZWROb2RlKSk7IG5v ZGU7IG5vZGUgPSBub2RlLT5wYXJlbnRPclNoYWRvd0hvc3ROb2RlKCkpIHsKKyAgICAgICAgaWYg KCFyZWxhdGVkTm9kZUluQ3VycmVudFRyZWUpCisgICAgICAgICAgICByZWxhdGVkTm9kZUluQ3Vy cmVudFRyZWUgPSBub2RlOworICAgICAgICBUcmVlU2NvcGUqIHNjb3BlID0gJm5vZGUtPnRyZWVT Y29wZSgpOworICAgICAgICAvLyBTa2lwcyBhZGRpbmcgYSBub2RlIHRvIHRoZSBtYXAgaWYgdHJl ZVNjb3BlIGRvZXMgbm90IGNoYW5nZS4gSnVzdCBmb3IgdGhlIHBlcmZvcm1hbmNlIG9wdGltaXph dGlvbi4KKyAgICAgICAgaWYgKHNjb3BlICE9IGxhc3RUcmVlU2NvcGUpCisgICAgICAgICAgICBy ZWxhdGVkTm9kZU1hcC5hZGQoc2NvcGUsIHJlbGF0ZWROb2RlSW5DdXJyZW50VHJlZSk7CisgICAg ICAgIGxhc3RUcmVlU2NvcGUgPSBzY29wZTsKKyAgICAgICAgaWYgKG5vZGUtPmlzU2hhZG93Um9v dCgpKSB7CisgICAgICAgICAgICBBU1NFUlQocmVsYXRlZE5vZGVJbkN1cnJlbnRUcmVlKTsKKyAg ICAgICAgICAgIHJlbGF0ZWROb2RlSW5DdXJyZW50VHJlZSA9IDA7CisgICAgICAgIH0KKyAgICB9 Cit9CisKK3N0YXRpYyBOb2RlKiBhZGRSZWxhdGVkTm9kZUZvclVubWFwZWRUcmVlU2NvcGVzKFRy ZWVTY29wZSogc2NvcGUsIEhhc2hNYXA8VHJlZVNjb3BlKiwgTm9kZSo+JiByZWxhdGVkTm9kZU1h cCkKK3sKKyAgICBOb2RlKiByZWxhdGVkTm9kZSA9IDA7CisgICAgVHJlZVNjb3BlKiBlbmRTY29w ZSA9IDA7CisgICAgZm9yIChUcmVlU2NvcGUqIGN1cnJlbnRTY29wZSA9IHNjb3BlOyBjdXJyZW50 U2NvcGU7IGN1cnJlbnRTY29wZSA9IGN1cnJlbnRTY29wZS0+cGFyZW50VHJlZVNjb3BlKCkpIHsK KyAgICAgICAgYXV0byByZXN1bHQgPSByZWxhdGVkTm9kZU1hcC5maW5kKGN1cnJlbnRTY29wZSk7 CisgICAgICAgIGlmIChyZXN1bHQgIT0gcmVsYXRlZE5vZGVNYXAuZW5kKCkpIHsKKyAgICAgICAg ICAgIHJlbGF0ZWROb2RlID0gcmVzdWx0LT52YWx1ZTsKKyAgICAgICAgICAgIGVuZFNjb3BlID0g Y3VycmVudFNjb3BlOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICB9CisgICAg Zm9yIChUcmVlU2NvcGUqIGN1cnJlbnRTY29wZSA9IHNjb3BlOyBjdXJyZW50U2NvcGUgIT0gZW5k U2NvcGU7IGN1cnJlbnRTY29wZSA9IGN1cnJlbnRTY29wZS0+cGFyZW50VHJlZVNjb3BlKCkpCisg ICAgICAgIHJlbGF0ZWROb2RlTWFwLmFkZChjdXJyZW50U2NvcGUsIHJlbGF0ZWROb2RlKTsKKyAg ICByZXR1cm4gcmVsYXRlZE5vZGU7Cit9CisKIHZvaWQgRXZlbnRSZXRhcmdldGVyOjpjYWxjdWxh dGVBZGp1c3RlZE5vZGVzKGNvbnN0IE5vZGUqIG5vZGUsIGNvbnN0IE5vZGUqIHJlbGF0ZWROb2Rl LCBFdmVudFdpdGhSZWxhdGVkVGFyZ2V0RGlzcGF0Y2hCZWhhdmlvciBldmVudFdpdGhSZWxhdGVk VGFyZ2V0RGlzcGF0Y2hCZWhhdmlvciwgRXZlbnRQYXRoJiBldmVudFBhdGgsIEFkanVzdGVkTm9k ZXMmIGFkanVzdGVkTm9kZXMpCiB7Ci0gICAgUmVsYXRlZE5vZGVNYXAgcmVsYXRlZE5vZGVNYXA7 CisgICAgSGFzaE1hcDxUcmVlU2NvcGUqLCBOb2RlKj4gcmVsYXRlZE5vZGVNYXA7CiAgICAgYnVp bGRSZWxhdGVkTm9kZU1hcChyZWxhdGVkTm9kZSwgcmVsYXRlZE5vZGVNYXApOwogCiAgICAgLy8g U3ludGhldGljIG1vdXNlIGV2ZW50cyBjYW4gaGF2ZSBhIHJlbGF0ZWRUYXJnZXQgd2hpY2ggaXMg aWRlbnRpY2FsIHRvIHRoZSB0YXJnZXQuCkBAIC0xOTYsMTAgKzIzMiw4IEBAIHZvaWQgRXZlbnRS ZXRhcmdldGVyOjpjYWxjdWxhdGVBZGp1c3RlZE4KICAgICAgICAgaWYgKHNjb3BlID09IGxhc3RU cmVlU2NvcGUpIHsKICAgICAgICAgICAgIC8vIFJlLXVzZSB0aGUgcHJldmlvdXMgYWRqdXN0ZWRS ZWxhdGVkVGFyZ2V0IGlmIHRyZWVTY29wZSBkb2VzIG5vdCBjaGFuZ2UuIEp1c3QgZm9yIHRoZSBw ZXJmb3JtYW5jZSBvcHRpbWl6YXRpb24uCiAgICAgICAgICAgICBhZGp1c3RlZE5vZGVzLmFwcGVu ZChhZGp1c3RlZE5vZGUpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgYWRqdXN0ZWRO b2RlID0gZmluZFJlbGF0ZWROb2RlKHNjb3BlLCByZWxhdGVkTm9kZU1hcCk7Ci0gICAgICAgICAg ICBhZGp1c3RlZE5vZGVzLmFwcGVuZChhZGp1c3RlZE5vZGUpOwotICAgICAgICB9CisgICAgICAg IH0gZWxzZQorICAgICAgICAgICAgYWRqdXN0ZWROb2Rlcy5hcHBlbmQoYWRkUmVsYXRlZE5vZGVG b3JVbm1hcGVkVHJlZVNjb3BlcyhzY29wZSwgcmVsYXRlZE5vZGVNYXApKTsKICAgICAgICAgbGFz dFRyZWVTY29wZSA9IHNjb3BlOwogICAgICAgICBpZiAoZXZlbnRXaXRoUmVsYXRlZFRhcmdldERp c3BhdGNoQmVoYXZpb3IgPT0gRG9lc05vdFN0b3BBdEJvdW5kYXJ5KQogICAgICAgICAgICAgY29u dGludWU7CkBAIC0yMTcsNDEgKzI1MSw0IEBAIHZvaWQgRXZlbnRSZXRhcmdldGVyOjpjYWxjdWxh dGVBZGp1c3RlZE4KICAgICB9CiB9CiAKLXZvaWQgRXZlbnRSZXRhcmdldGVyOjpidWlsZFJlbGF0 ZWROb2RlTWFwKGNvbnN0IE5vZGUqIHJlbGF0ZWROb2RlLCBSZWxhdGVkTm9kZU1hcCYgcmVsYXRl ZE5vZGVNYXApCi17Ci0gICAgVmVjdG9yPE5vZGUqLCAzMj4gcmVsYXRlZE5vZGVTdGFjazsKLSAg ICBUcmVlU2NvcGUqIGxhc3RUcmVlU2NvcGUgPSAwOwotICAgIGZvciAoTm9kZSogbm9kZSA9IG5v ZGVPckhvc3RJZlBzZXVkb0VsZW1lbnQoY29uc3RfY2FzdDxOb2RlKj4ocmVsYXRlZE5vZGUpKTsg bm9kZTsgbm9kZSA9IG5vZGUtPnBhcmVudE9yU2hhZG93SG9zdE5vZGUoKSkgewotICAgICAgICBp ZiAocmVsYXRlZE5vZGVTdGFjay5pc0VtcHR5KCkpCi0gICAgICAgICAgICByZWxhdGVkTm9kZVN0 YWNrLmFwcGVuZChub2RlKTsKLSAgICAgICAgVHJlZVNjb3BlKiBzY29wZSA9ICZub2RlLT50cmVl U2NvcGUoKTsKLSAgICAgICAgLy8gU2tpcHMgYWRkaW5nIGEgbm9kZSB0byB0aGUgbWFwIGlmIHRy ZWVTY29wZSBkb2VzIG5vdCBjaGFuZ2UuIEp1c3QgZm9yIHRoZSBwZXJmb3JtYW5jZSBvcHRpbWl6 YXRpb24uCi0gICAgICAgIGlmIChzY29wZSAhPSBsYXN0VHJlZVNjb3BlKQotICAgICAgICAgICAg cmVsYXRlZE5vZGVNYXAuYWRkKHNjb3BlLCByZWxhdGVkTm9kZVN0YWNrLmxhc3QoKSk7Ci0gICAg ICAgIGxhc3RUcmVlU2NvcGUgPSBzY29wZTsKLSAgICAgICAgaWYgKG5vZGUtPmlzU2hhZG93Um9v dCgpKSB7Ci0gICAgICAgICAgICBBU1NFUlQoIXJlbGF0ZWROb2RlU3RhY2suaXNFbXB0eSgpKTsK LSAgICAgICAgICAgIHJlbGF0ZWROb2RlU3RhY2sucmVtb3ZlTGFzdCgpOwotICAgICAgICB9Ci0g ICAgfQotfQotCi1Ob2RlKiBFdmVudFJldGFyZ2V0ZXI6OmZpbmRSZWxhdGVkTm9kZShUcmVlU2Nv cGUqIHNjb3BlLCBSZWxhdGVkTm9kZU1hcCYgcmVsYXRlZE5vZGVNYXApCi17Ci0gICAgVmVjdG9y PFRyZWVTY29wZSosIDMyPiBwYXJlbnRUcmVlU2NvcGVzOwotICAgIE5vZGUqIHJlbGF0ZWROb2Rl ID0gMDsKLSAgICB3aGlsZSAoc2NvcGUpIHsKLSAgICAgICAgcGFyZW50VHJlZVNjb3Blcy5hcHBl bmQoc2NvcGUpOwotICAgICAgICBSZWxhdGVkTm9kZU1hcDo6Y29uc3RfaXRlcmF0b3IgZm91bmQg PSByZWxhdGVkTm9kZU1hcC5maW5kKHNjb3BlKTsKLSAgICAgICAgaWYgKGZvdW5kICE9IHJlbGF0 ZWROb2RlTWFwLmVuZCgpKSB7Ci0gICAgICAgICAgICByZWxhdGVkTm9kZSA9IGZvdW5kLT52YWx1 ZTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0gICAgICAgIHNjb3BlID0gc2NvcGUt PnBhcmVudFRyZWVTY29wZSgpOwotICAgIH0KLSAgICBmb3IgKFZlY3RvcjxUcmVlU2NvcGUqLCAz Mj46Oml0ZXJhdG9yIGl0ZXIgPSBwYXJlbnRUcmVlU2NvcGVzLmJlZ2luKCk7IGl0ZXIgPCBwYXJl bnRUcmVlU2NvcGVzLmVuZCgpOyArK2l0ZXIpCi0gICAgICAgIHJlbGF0ZWROb2RlTWFwLmFkZCgq aXRlciwgcmVsYXRlZE5vZGUpOwotICAgIHJldHVybiByZWxhdGVkTm9kZTsKLX0KLQogfQpJbmRl eDogU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50UmV0YXJnZXRlci5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2RvbS9FdmVudFJldGFyZ2V0ZXIuaAkocmV2aXNpb24gMTU3MDU1KQorKysg U291cmNlL1dlYkNvcmUvZG9tL0V2ZW50UmV0YXJnZXRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC02 MywxNSArNjMsMTIgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIHR5cGVkZWYgVmVjdG9yPFJl ZlB0cjxOb2RlPiA+IEFkanVzdGVkTm9kZXM7Ci0gICAgdHlwZWRlZiBIYXNoTWFwPFRyZWVTY29w ZSosIE5vZGUqPiBSZWxhdGVkTm9kZU1hcDsKICAgICBlbnVtIEV2ZW50V2l0aFJlbGF0ZWRUYXJn ZXREaXNwYXRjaEJlaGF2aW9yIHsKICAgICAgICAgU3RvcEF0Qm91bmRhcnlJZk5lZWRlZCwKICAg ICAgICAgRG9lc05vdFN0b3BBdEJvdW5kYXJ5CiAgICAgfTsKICAgICBzdGF0aWMgdm9pZCBhZGp1 c3RGb3JSZWxhdGVkVGFyZ2V0KGNvbnN0IE5vZGUqLCBFdmVudFRhcmdldCogcmVsYXRlZFRhcmdl dCwgRXZlbnRQYXRoJik7CiAgICAgc3RhdGljIHZvaWQgY2FsY3VsYXRlQWRqdXN0ZWROb2Rlcyhj b25zdCBOb2RlKiwgY29uc3QgTm9kZSogcmVsYXRlZE5vZGUsIEV2ZW50V2l0aFJlbGF0ZWRUYXJn ZXREaXNwYXRjaEJlaGF2aW9yLCBFdmVudFBhdGgmLCBBZGp1c3RlZE5vZGVzJik7Ci0gICAgc3Rh dGljIHZvaWQgYnVpbGRSZWxhdGVkTm9kZU1hcChjb25zdCBOb2RlKiwgUmVsYXRlZE5vZGVNYXAm KTsKLSAgICBzdGF0aWMgTm9kZSogZmluZFJlbGF0ZWROb2RlKFRyZWVTY29wZSosIFJlbGF0ZWRO b2RlTWFwJik7CiAjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKICAgICBzdGF0aWMgdm9pZCBhZGp1 c3RUb3VjaExpc3QoY29uc3QgTm9kZSosIGNvbnN0IFRvdWNoTGlzdCosIGNvbnN0IEV2ZW50UGF0 aCYsIEV2ZW50UGF0aFRvdWNoTGlzdHMmKTsKICNlbmRpZgo= 213637 2013-10-07 18:26:36 -0700 2013-10-07 19:03:03 -0700 Minor bug fix bug-122477-20131007182635.patch text/plain 7637 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzA3MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDEzLTEwLTA3ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1ha2UgYnVpbGRSZWxhdGVkTm9k ZU1hcCBhbmQgZmluZFJlbGF0ZWROb2RlIHN0YXRpYyB0byBFdmVudFJldGFyZ2V0ZXIuY3BwCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI0NzcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIEV2ZW50 UmV0YXJnZXRlcjo6YnVpbGRSZWxhdGVkTm9kZU1hcCBhbmQgRXZlbnRSZXRhcmdldGVyOjpmaW5k UmVsYXRlZE5vZGUgc3RhdGljIGxvY2FsIGZ1bmN0aW9ucworICAgICAgICBpbiBFdmVudFJldGFy Z2V0ZXIuY3BwIHNpbmNlIHRoZXkncmUgb25seSBjYWxsZWQgaW4gRXZlbnRSZXRhcmdldGVyOjpj YWxjdWxhdGVBZGp1c3RlZE5vZGVzIGFuZCBkb24ndAorICAgICAgICBkZXBlbmQgb24gYW55IG9o ZXIgbWVtYmVyIGZ1bmN0aW9uIG9yIHZhcmlhYmxlIChFdmVudFJldGFyZ2VyIGRvZXNuJ3QgaGF2 ZSBhbnkgbWVtYmVyIHZhcmlhYmxlcykuCisKKyAgICAgICAgQWxzbyBnZXQgcmlkIG9mIFZlY3Rv ciBsb2NhbCB2YXJpYWJsZXMgaW4gYm90aCBmdW5jdGlvbnMgYXMgdGhleSdyZSByZWR1bmRhbnQu CisKKyAgICAgICAgKiBkb20vRXZlbnRSZXRhcmdldGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OmJ1aWxkUmVsYXRlZE5vZGVNYXApOiBNb3ZlZC4gUmVwbGFjZWQgVmVjdG9yPE5vZGUqLCAzMj4g cmVsYXRlZE5vZGVTdGFjayBieSBhIHNpbmdsZSBwb2ludGVyCisgICAgICAgIHNpbmNlIHRoZSBv bmx5IHRpbWUgd2UgYWRkIGFuIGl0ZW0gdG8gdGhpcyBWZWN0b3IgaXMgd2hlbiBpdCdzIGVtcHR5 LCBhbmQgd2UgYWx3YXlzIHVzZSBvciByZW1vdmUgdGhlCisgICAgICAgIGxhc3QgaXRlbS4KKyAg ICAgICAgKFdlYkNvcmU6OmFkZFJlbGF0ZWROb2RlRm9yVW5tYXBlZFRyZWVTY29wZXMpOiBSZW5h bWVkIGZyb20gRXZlbnRSZXRhcmdldGVyOjpmaW5kUmVsYXRlZE5vZGUuIFJlbW92ZWQKKyAgICAg ICAgVmVjdG9yPFRyZWVTY29wZSosIDMyPiBwYXJlbnRUcmVlU2NvcGVzIHNpbmNlIGl0IG9ubHkg Y29udGFpbnMgdGhlIGFuY2VzdG9yIHRyZWUgc2NvcGVzIG9mIHNjb3BlIHVwIHRvCisgICAgICAg IGEgdHJlZSBzY29wZSBhbHJlYWR5IGluIHJlbGF0ZWROb2RlTWFwLiBXZSBjb3VsZCBzaW1wbHkg cmVtZW1iZXIgdGhpcyB0cmVlIHNjb3BlIGFuZCByZS10cmF2ZXJzZSB0aGUKKyAgICAgICAgYW5j ZXN0b3IgdHJlZSBzY29wZXMgaW4gdGhlIHNlY29uZCBsb29wLgorICAgICAgICAoV2ViQ29yZTo6 RXZlbnRSZXRhcmdldGVyOjpjYWxjdWxhdGVBZGp1c3RlZE5vZGVzKToKKyAgICAgICAgKiBkb20v RXZlbnRSZXRhcmdldGVyLmg6CisKIDIwMTMtMTAtMDcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVy c2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgdGVzdCByZXN1bHRzLgpJbmRleDogU291 cmNlL1dlYkNvcmUvZG9tL0V2ZW50UmV0YXJnZXRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvZG9tL0V2ZW50UmV0YXJnZXRlci5jcHAJKHJldmlzaW9uIDE1NzA1NSkKKysrIFNv dXJjZS9XZWJDb3JlL2RvbS9FdmVudFJldGFyZ2V0ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x ODEsOSArMTgxLDQ1IEBAIHZvaWQgRXZlbnRSZXRhcmdldGVyOjphZGp1c3RGb3JSZWxhdGVkVGEK ICAgICB9CiB9CiAKK3N0YXRpYyB2b2lkIGJ1aWxkUmVsYXRlZE5vZGVNYXAoY29uc3QgTm9kZSog cmVsYXRlZE5vZGUsIEhhc2hNYXA8VHJlZVNjb3BlKiwgTm9kZSo+JiByZWxhdGVkTm9kZU1hcCkK K3sKKyAgICBOb2RlKiByZWxhdGVkTm9kZUluQ3VycmVudFRyZWUgPSAwOworICAgIFRyZWVTY29w ZSogbGFzdFRyZWVTY29wZSA9IDA7CisgICAgZm9yIChOb2RlKiBub2RlID0gbm9kZU9ySG9zdElm UHNldWRvRWxlbWVudChjb25zdF9jYXN0PE5vZGUqPihyZWxhdGVkTm9kZSkpOyBub2RlOyBub2Rl ID0gbm9kZS0+cGFyZW50T3JTaGFkb3dIb3N0Tm9kZSgpKSB7CisgICAgICAgIGlmICghcmVsYXRl ZE5vZGVJbkN1cnJlbnRUcmVlKQorICAgICAgICAgICAgcmVsYXRlZE5vZGVJbkN1cnJlbnRUcmVl ID0gbm9kZTsKKyAgICAgICAgVHJlZVNjb3BlKiBzY29wZSA9ICZub2RlLT50cmVlU2NvcGUoKTsK KyAgICAgICAgLy8gU2tpcHMgYWRkaW5nIGEgbm9kZSB0byB0aGUgbWFwIGlmIHRyZWVTY29wZSBk b2VzIG5vdCBjaGFuZ2UuIEp1c3QgZm9yIHRoZSBwZXJmb3JtYW5jZSBvcHRpbWl6YXRpb24uCisg ICAgICAgIGlmIChzY29wZSAhPSBsYXN0VHJlZVNjb3BlKQorICAgICAgICAgICAgcmVsYXRlZE5v ZGVNYXAuYWRkKHNjb3BlLCByZWxhdGVkTm9kZUluQ3VycmVudFRyZWUpOworICAgICAgICBsYXN0 VHJlZVNjb3BlID0gc2NvcGU7CisgICAgICAgIGlmIChub2RlLT5pc1NoYWRvd1Jvb3QoKSkgewor ICAgICAgICAgICAgQVNTRVJUKHJlbGF0ZWROb2RlSW5DdXJyZW50VHJlZSk7CisgICAgICAgICAg ICByZWxhdGVkTm9kZUluQ3VycmVudFRyZWUgPSAwOworICAgICAgICB9CisgICAgfQorfQorCitz dGF0aWMgTm9kZSogYWRkUmVsYXRlZE5vZGVGb3JVbm1hcGVkVHJlZVNjb3BlcyhUcmVlU2NvcGUq IHNjb3BlLCBIYXNoTWFwPFRyZWVTY29wZSosIE5vZGUqPiYgcmVsYXRlZE5vZGVNYXApCit7Cisg ICAgTm9kZSogcmVsYXRlZE5vZGUgPSAwOworICAgIFRyZWVTY29wZSogZW5kU2NvcGUgPSAwOwor ICAgIGZvciAoVHJlZVNjb3BlKiBjdXJyZW50U2NvcGUgPSBzY29wZTsgY3VycmVudFNjb3BlOyBj dXJyZW50U2NvcGUgPSBjdXJyZW50U2NvcGUtPnBhcmVudFRyZWVTY29wZSgpKSB7CisgICAgICAg IGF1dG8gcmVzdWx0ID0gcmVsYXRlZE5vZGVNYXAuZmluZChjdXJyZW50U2NvcGUpOworICAgICAg ICBpZiAocmVzdWx0ICE9IHJlbGF0ZWROb2RlTWFwLmVuZCgpKSB7CisgICAgICAgICAgICByZWxh dGVkTm9kZSA9IHJlc3VsdC0+dmFsdWU7CisgICAgICAgICAgICBlbmRTY29wZSA9IGN1cnJlbnRT Y29wZTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisgICAgfQorICAgIGZvciAoVHJl ZVNjb3BlKiBjdXJyZW50U2NvcGUgPSBzY29wZTsgY3VycmVudFNjb3BlICE9IGVuZFNjb3BlOyBj dXJyZW50U2NvcGUgPSBjdXJyZW50U2NvcGUtPnBhcmVudFRyZWVTY29wZSgpKQorICAgICAgICBy ZWxhdGVkTm9kZU1hcC5hZGQoY3VycmVudFNjb3BlLCByZWxhdGVkTm9kZSk7CisgICAgcmV0dXJu IHJlbGF0ZWROb2RlOworfQorCiB2b2lkIEV2ZW50UmV0YXJnZXRlcjo6Y2FsY3VsYXRlQWRqdXN0 ZWROb2Rlcyhjb25zdCBOb2RlKiBub2RlLCBjb25zdCBOb2RlKiByZWxhdGVkTm9kZSwgRXZlbnRX aXRoUmVsYXRlZFRhcmdldERpc3BhdGNoQmVoYXZpb3IgZXZlbnRXaXRoUmVsYXRlZFRhcmdldERp c3BhdGNoQmVoYXZpb3IsIEV2ZW50UGF0aCYgZXZlbnRQYXRoLCBBZGp1c3RlZE5vZGVzJiBhZGp1 c3RlZE5vZGVzKQogewotICAgIFJlbGF0ZWROb2RlTWFwIHJlbGF0ZWROb2RlTWFwOworICAgIEhh c2hNYXA8VHJlZVNjb3BlKiwgTm9kZSo+IHJlbGF0ZWROb2RlTWFwOwogICAgIGJ1aWxkUmVsYXRl ZE5vZGVNYXAocmVsYXRlZE5vZGUsIHJlbGF0ZWROb2RlTWFwKTsKIAogICAgIC8vIFN5bnRoZXRp YyBtb3VzZSBldmVudHMgY2FuIGhhdmUgYSByZWxhdGVkVGFyZ2V0IHdoaWNoIGlzIGlkZW50aWNh bCB0byB0aGUgdGFyZ2V0LgpAQCAtMTkzLDEzICsyMjksMTIgQEAgdm9pZCBFdmVudFJldGFyZ2V0 ZXI6OmNhbGN1bGF0ZUFkanVzdGVkTgogICAgIE5vZGUqIGFkanVzdGVkTm9kZSA9IDA7CiAgICAg Zm9yIChFdmVudFBhdGg6OmNvbnN0X2l0ZXJhdG9yIGl0ZXIgPSBldmVudFBhdGguYmVnaW4oKTsg aXRlciA8IGV2ZW50UGF0aC5lbmQoKTsgKytpdGVyKSB7CiAgICAgICAgIFRyZWVTY29wZSogc2Nv cGUgPSAmKCppdGVyKS0+bm9kZSgpLT50cmVlU2NvcGUoKTsKLSAgICAgICAgaWYgKHNjb3BlID09 IGxhc3RUcmVlU2NvcGUpIHsKLSAgICAgICAgICAgIC8vIFJlLXVzZSB0aGUgcHJldmlvdXMgYWRq dXN0ZWRSZWxhdGVkVGFyZ2V0IGlmIHRyZWVTY29wZSBkb2VzIG5vdCBjaGFuZ2UuIEp1c3QgZm9y IHRoZSBwZXJmb3JtYW5jZSBvcHRpbWl6YXRpb24uCi0gICAgICAgICAgICBhZGp1c3RlZE5vZGVz LmFwcGVuZChhZGp1c3RlZE5vZGUpOwotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgYWRq dXN0ZWROb2RlID0gZmluZFJlbGF0ZWROb2RlKHNjb3BlLCByZWxhdGVkTm9kZU1hcCk7Ci0gICAg ICAgICAgICBhZGp1c3RlZE5vZGVzLmFwcGVuZChhZGp1c3RlZE5vZGUpOwotICAgICAgICB9CisK KyAgICAgICAgLy8gUmUtdXNlIHRoZSBwcmV2aW91cyBhZGp1c3RlZFJlbGF0ZWRUYXJnZXQgaWYg dHJlZVNjb3BlIGRvZXMgbm90IGNoYW5nZS4gSnVzdCBmb3IgdGhlIHBlcmZvcm1hbmNlIG9wdGlt aXphdGlvbi4KKyAgICAgICAgaWYgKHNjb3BlICE9IGxhc3RUcmVlU2NvcGUpCisgICAgICAgICAg ICBhZGp1c3RlZE5vZGUgPSBhZGRSZWxhdGVkTm9kZUZvclVubWFwZWRUcmVlU2NvcGVzKHNjb3Bl LCByZWxhdGVkTm9kZU1hcCk7CisgICAgICAgIGFkanVzdGVkTm9kZXMuYXBwZW5kKGFkanVzdGVk Tm9kZSk7CisKICAgICAgICAgbGFzdFRyZWVTY29wZSA9IHNjb3BlOwogICAgICAgICBpZiAoZXZl bnRXaXRoUmVsYXRlZFRhcmdldERpc3BhdGNoQmVoYXZpb3IgPT0gRG9lc05vdFN0b3BBdEJvdW5k YXJ5KQogICAgICAgICAgICAgY29udGludWU7CkBAIC0yMTcsNDEgKzI1Miw0IEBAIHZvaWQgRXZl bnRSZXRhcmdldGVyOjpjYWxjdWxhdGVBZGp1c3RlZE4KICAgICB9CiB9CiAKLXZvaWQgRXZlbnRS ZXRhcmdldGVyOjpidWlsZFJlbGF0ZWROb2RlTWFwKGNvbnN0IE5vZGUqIHJlbGF0ZWROb2RlLCBS ZWxhdGVkTm9kZU1hcCYgcmVsYXRlZE5vZGVNYXApCi17Ci0gICAgVmVjdG9yPE5vZGUqLCAzMj4g cmVsYXRlZE5vZGVTdGFjazsKLSAgICBUcmVlU2NvcGUqIGxhc3RUcmVlU2NvcGUgPSAwOwotICAg IGZvciAoTm9kZSogbm9kZSA9IG5vZGVPckhvc3RJZlBzZXVkb0VsZW1lbnQoY29uc3RfY2FzdDxO b2RlKj4ocmVsYXRlZE5vZGUpKTsgbm9kZTsgbm9kZSA9IG5vZGUtPnBhcmVudE9yU2hhZG93SG9z dE5vZGUoKSkgewotICAgICAgICBpZiAocmVsYXRlZE5vZGVTdGFjay5pc0VtcHR5KCkpCi0gICAg ICAgICAgICByZWxhdGVkTm9kZVN0YWNrLmFwcGVuZChub2RlKTsKLSAgICAgICAgVHJlZVNjb3Bl KiBzY29wZSA9ICZub2RlLT50cmVlU2NvcGUoKTsKLSAgICAgICAgLy8gU2tpcHMgYWRkaW5nIGEg bm9kZSB0byB0aGUgbWFwIGlmIHRyZWVTY29wZSBkb2VzIG5vdCBjaGFuZ2UuIEp1c3QgZm9yIHRo ZSBwZXJmb3JtYW5jZSBvcHRpbWl6YXRpb24uCi0gICAgICAgIGlmIChzY29wZSAhPSBsYXN0VHJl ZVNjb3BlKQotICAgICAgICAgICAgcmVsYXRlZE5vZGVNYXAuYWRkKHNjb3BlLCByZWxhdGVkTm9k ZVN0YWNrLmxhc3QoKSk7Ci0gICAgICAgIGxhc3RUcmVlU2NvcGUgPSBzY29wZTsKLSAgICAgICAg aWYgKG5vZGUtPmlzU2hhZG93Um9vdCgpKSB7Ci0gICAgICAgICAgICBBU1NFUlQoIXJlbGF0ZWRO b2RlU3RhY2suaXNFbXB0eSgpKTsKLSAgICAgICAgICAgIHJlbGF0ZWROb2RlU3RhY2sucmVtb3Zl TGFzdCgpOwotICAgICAgICB9Ci0gICAgfQotfQotCi1Ob2RlKiBFdmVudFJldGFyZ2V0ZXI6OmZp bmRSZWxhdGVkTm9kZShUcmVlU2NvcGUqIHNjb3BlLCBSZWxhdGVkTm9kZU1hcCYgcmVsYXRlZE5v ZGVNYXApCi17Ci0gICAgVmVjdG9yPFRyZWVTY29wZSosIDMyPiBwYXJlbnRUcmVlU2NvcGVzOwot ICAgIE5vZGUqIHJlbGF0ZWROb2RlID0gMDsKLSAgICB3aGlsZSAoc2NvcGUpIHsKLSAgICAgICAg cGFyZW50VHJlZVNjb3Blcy5hcHBlbmQoc2NvcGUpOwotICAgICAgICBSZWxhdGVkTm9kZU1hcDo6 Y29uc3RfaXRlcmF0b3IgZm91bmQgPSByZWxhdGVkTm9kZU1hcC5maW5kKHNjb3BlKTsKLSAgICAg ICAgaWYgKGZvdW5kICE9IHJlbGF0ZWROb2RlTWFwLmVuZCgpKSB7Ci0gICAgICAgICAgICByZWxh dGVkTm9kZSA9IGZvdW5kLT52YWx1ZTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICB9Ci0g ICAgICAgIHNjb3BlID0gc2NvcGUtPnBhcmVudFRyZWVTY29wZSgpOwotICAgIH0KLSAgICBmb3Ig KFZlY3RvcjxUcmVlU2NvcGUqLCAzMj46Oml0ZXJhdG9yIGl0ZXIgPSBwYXJlbnRUcmVlU2NvcGVz LmJlZ2luKCk7IGl0ZXIgPCBwYXJlbnRUcmVlU2NvcGVzLmVuZCgpOyArK2l0ZXIpCi0gICAgICAg IHJlbGF0ZWROb2RlTWFwLmFkZCgqaXRlciwgcmVsYXRlZE5vZGUpOwotICAgIHJldHVybiByZWxh dGVkTm9kZTsKLX0KLQogfQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50UmV0YXJnZXRl ci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9FdmVudFJldGFyZ2V0ZXIuaAko cmV2aXNpb24gMTU3MDU1KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50UmV0YXJnZXRlci5o CSh3b3JraW5nIGNvcHkpCkBAIC02MywxNSArNjMsMTIgQEAgcHVibGljOgogCiBwcml2YXRlOgog ICAgIHR5cGVkZWYgVmVjdG9yPFJlZlB0cjxOb2RlPiA+IEFkanVzdGVkTm9kZXM7Ci0gICAgdHlw ZWRlZiBIYXNoTWFwPFRyZWVTY29wZSosIE5vZGUqPiBSZWxhdGVkTm9kZU1hcDsKICAgICBlbnVt IEV2ZW50V2l0aFJlbGF0ZWRUYXJnZXREaXNwYXRjaEJlaGF2aW9yIHsKICAgICAgICAgU3RvcEF0 Qm91bmRhcnlJZk5lZWRlZCwKICAgICAgICAgRG9lc05vdFN0b3BBdEJvdW5kYXJ5CiAgICAgfTsK ICAgICBzdGF0aWMgdm9pZCBhZGp1c3RGb3JSZWxhdGVkVGFyZ2V0KGNvbnN0IE5vZGUqLCBFdmVu dFRhcmdldCogcmVsYXRlZFRhcmdldCwgRXZlbnRQYXRoJik7CiAgICAgc3RhdGljIHZvaWQgY2Fs Y3VsYXRlQWRqdXN0ZWROb2Rlcyhjb25zdCBOb2RlKiwgY29uc3QgTm9kZSogcmVsYXRlZE5vZGUs IEV2ZW50V2l0aFJlbGF0ZWRUYXJnZXREaXNwYXRjaEJlaGF2aW9yLCBFdmVudFBhdGgmLCBBZGp1 c3RlZE5vZGVzJik7Ci0gICAgc3RhdGljIHZvaWQgYnVpbGRSZWxhdGVkTm9kZU1hcChjb25zdCBO b2RlKiwgUmVsYXRlZE5vZGVNYXAmKTsKLSAgICBzdGF0aWMgTm9kZSogZmluZFJlbGF0ZWROb2Rl KFRyZWVTY29wZSosIFJlbGF0ZWROb2RlTWFwJik7CiAjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykK ICAgICBzdGF0aWMgdm9pZCBhZGp1c3RUb3VjaExpc3QoY29uc3QgTm9kZSosIGNvbnN0IFRvdWNo TGlzdCosIGNvbnN0IEV2ZW50UGF0aCYsIEV2ZW50UGF0aFRvdWNoTGlzdHMmKTsKICNlbmRpZgo=