122579 2013-10-09 16:36:09 -0700 Remove all subclasses of EventDispatchMediator except MouseEventDispatchMediator 2013-10-09 16:47:52 -0700 1 1 1 Unclassified WebKit UI Events 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa andersca benjamin cmarcelo commit-queue darin esprehn+autocc kangil.han kling koivisto sam oldest_to_newest 938128 0 rniwa 2013-10-09 16:36:09 -0700 Remove all subclasses of EventDispatchMediator except MouseEventDispatchMediator 938129 1 213832 rniwa 2013-10-09 16:38:26 -0700 Created attachment 213832 Cleanup 938132 2 rniwa 2013-10-09 16:47:52 -0700 Committed r157195: <http://trac.webkit.org/changeset/157195> 213832 2013-10-09 16:38:26 -0700 2013-10-09 16:40:11 -0700 Cleanup bug-122579-20131009163825.patch text/plain 12733 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NzE5NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEzLTEwLTA5ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFJlbW92ZSBhbGwgc3ViY2xhc3Nl cyBvZiBFdmVudERpc3BhdGNoTWVkaWF0b3IgZXhjZXB0IE1vdXNlRXZlbnREaXNwYXRjaE1lZGlh dG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjI1 NzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1v dmVkIFVJUmVxdWVzdEV2ZW50RGlzcGF0Y2hNZWRpYXRvciwgR2VzdHVyZUV2ZW50RGlzcGF0Y2hN ZWRpYXRvciwgS2V5Ym9hcmRFdmVudERpc3BhdGNoTWVkaWF0b3IsCisgICAgICAgIGFuZCBXaGVl bEV2ZW50RGlzcGF0Y2hNZWRpYXRvci4gTW92ZWQgdGhlIGNvZGUgaW4gdGhlIHJlc3BlY3RpdmUg bWVkaWF0ZUFuZERpc3BhdGNoRXZlbnQgZnVuY3Rpb25zCisgICAgICAgIHRvIHRoZWlyIHJlc3Bl Y3RpdmUgZGlzcGF0Y2gqRXZlbnQgZnVuY3Rpb25zIGluIE5vZGUuY3BwIGFuZCBFbGVtZW50LmNw cC4KKworICAgICAgICAqIE1vZHVsZXMvaW5kaWV1aS9VSVJlcXVlc3RFdmVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpVSVJlcXVlc3RFdmVudDo6ZXZlbnRJbnRlcmZhY2UpOgorICAgICAgICAq IE1vZHVsZXMvaW5kaWV1aS9VSVJlcXVlc3RFdmVudC5oOgorICAgICAgICAqIGRvbS9FbGVtZW50 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmRlbHRhTW9kZSk6CisgICAgICAgIChXZWJDb3JlOjpF bGVtZW50OjpkaXNwYXRjaFdoZWVsRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6 ZGlzcGF0Y2hLZXlFdmVudCk6CisgICAgICAgICogZG9tL0dlc3R1cmVFdmVudC5jcHA6CisgICAg ICAgICogZG9tL0dlc3R1cmVFdmVudC5oOgorICAgICAgICAqIGRvbS9LZXlib2FyZEV2ZW50LmNw cDoKKyAgICAgICAgKiBkb20vS2V5Ym9hcmRFdmVudC5oOgorICAgICAgICAqIGRvbS9Ob2RlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OmRpc3BhdGNoR2VzdHVyZUV2ZW50KToKKyAgICAg ICAgKFdlYkNvcmU6Ok5vZGU6OmRpc3BhdGNoVUlSZXF1ZXN0RXZlbnQpOgorICAgICAgICAqIGRv bS9XaGVlbEV2ZW50LmNwcDoKKyAgICAgICAgKiBkb20vV2hlZWxFdmVudC5oOgorCiAyMDEzLTEw LTA5ICBCZW0gSm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgogCiAgICAgICAgIFtDU1Mg U2hhcGVzXSBMaW5lcyB0aGF0IGRvbid0IGludGVyc2VjdCBzaGFwZS1vdXRzaWRlIHNob3VsZCBp Z25vcmUgYm90aCBsZWZ0IGFuZCByaWdodCBtYXJnaW5zCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2luZGlldWkvVUlSZXF1ZXN0RXZlbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kaWV1aS9VSVJlcXVlc3RFdmVudC5jcHAJKHJldmlzaW9uIDE1NzE3 NikKKysrIFNvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kaWV1aS9VSVJlcXVlc3RFdmVudC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTczLDI3ICs3MywxMSBAQCBVSVJlcXVlc3RFdmVudDo6VUlSZXF1 ZXN0RXZlbnQoKQogVUlSZXF1ZXN0RXZlbnQ6On5VSVJlcXVlc3RFdmVudCgpCiB7CiB9Ci0gICAg CisKIEV2ZW50SW50ZXJmYWNlIFVJUmVxdWVzdEV2ZW50OjpldmVudEludGVyZmFjZSgpIGNvbnN0 CiB7CiAgICAgcmV0dXJuIFVJUmVxdWVzdEV2ZW50SW50ZXJmYWNlVHlwZTsKIH0KLQotVUlSZXF1 ZXN0RXZlbnREaXNwYXRjaE1lZGlhdG9yOjpVSVJlcXVlc3RFdmVudERpc3BhdGNoTWVkaWF0b3Io UGFzc1JlZlB0cjxVSVJlcXVlc3RFdmVudD4gZXZlbnQpCi0gICAgOiBFdmVudERpc3BhdGNoTWVk aWF0b3IoZXZlbnQpCi17Ci19Ci0KLVVJUmVxdWVzdEV2ZW50KiBVSVJlcXVlc3RFdmVudERpc3Bh dGNoTWVkaWF0b3I6OmV2ZW50KCkgY29uc3QKLXsKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8VUlS ZXF1ZXN0RXZlbnQqPihFdmVudERpc3BhdGNoTWVkaWF0b3I6OmV2ZW50KCkpOwotfQotCi1ib29s IFVJUmVxdWVzdEV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6bWVkaWF0ZUFuZERpc3BhdGNoRXZlbnQo RXZlbnREaXNwYXRjaGVyKiBkaXNwYXRjaGVyKSBjb25zdAotewotICAgIGRpc3BhdGNoZXItPmRp c3BhdGNoKCk7Ci0gICAgcmV0dXJuIGV2ZW50KCktPmRlZmF1bHRIYW5kbGVkKCkgfHwgZXZlbnQo KS0+ZGVmYXVsdFByZXZlbnRlZCgpOwotfQogICAgIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQog CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGlldWkvVUlSZXF1ZXN0RXZlbnQuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGlldWkvVUlSZXF1ZXN0RXZl bnQuaAkocmV2aXNpb24gMTU3MTc2KQorKysgU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRpZXVp L1VJUmVxdWVzdEV2ZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTYzLDIxICs2Myw2IEBAIHByaXZh dGU6CiAgICAgUmVmUHRyPEV2ZW50VGFyZ2V0PiBtX3JlY2VpdmVyOwogfTsKIAotY2xhc3MgVUlS ZXF1ZXN0RXZlbnREaXNwYXRjaE1lZGlhdG9yIDogcHVibGljIEV2ZW50RGlzcGF0Y2hNZWRpYXRv ciB7Ci1wdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NSZWZQdHI8VUlSZXF1ZXN0RXZlbnREaXNwYXRj aE1lZGlhdG9yPiBjcmVhdGUoUGFzc1JlZlB0cjxVSVJlcXVlc3RFdmVudD4gZXZlbnQpCi0gICAg ewotICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3IFVJUmVxdWVzdEV2ZW50RGlzcGF0Y2hNZWRp YXRvcihldmVudCkpOwotICAgIH0KLSAgICAKLXByaXZhdGU6Ci0gICAgZXhwbGljaXQgVUlSZXF1 ZXN0RXZlbnREaXNwYXRjaE1lZGlhdG9yKFBhc3NSZWZQdHI8VUlSZXF1ZXN0RXZlbnQ+KTsKLSAg ICAKLSAgICBVSVJlcXVlc3RFdmVudCogZXZlbnQoKSBjb25zdDsKLSAgICAKLSAgICB2aXJ0dWFs IGJvb2wgbWVkaWF0ZUFuZERpc3BhdGNoRXZlbnQoRXZlbnREaXNwYXRjaGVyKikgY29uc3QgT1ZF UlJJREU7Ci19OwotICAgIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gRU5B QkxFKElORElFX1VJKQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAkocmV2aXNpb24gMTU3MTc3 KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03 Miw2ICs3Miw3IEBACiAjaW5jbHVkZSAiTm9kZUxpc3QuaCIKICNpbmNsdWRlICJOb2RlUmVuZGVy U3R5bGUuaCIKICNpbmNsdWRlICJQYWdlLmgiCisjaW5jbHVkZSAiUGxhdGZvcm1XaGVlbEV2ZW50 LmgiCiAjaW5jbHVkZSAiUG9pbnRlckxvY2tDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAiUHNldWRv RWxlbWVudC5oIgogI2luY2x1ZGUgIlJlbmRlclJlZ2lvbi5oIgpAQCAtMjQ1LDE0ICsyNDYsMzQg QEAgYm9vbCBFbGVtZW50OjpkaXNwYXRjaE1vdXNlRXZlbnQoY29uc3QgUAogICAgIHJldHVybiBF dmVudERpc3BhdGNoZXI6OmRpc3BhdGNoRXZlbnQodGhpcywgTW91c2VFdmVudERpc3BhdGNoTWVk aWF0b3I6OmNyZWF0ZShNb3VzZUV2ZW50OjpjcmVhdGUoZXZlbnRUeXBlLCBkb2N1bWVudCgpLmRl ZmF1bHRWaWV3KCksIGV2ZW50LCBkZXRhaWwsIHJlbGF0ZWRUYXJnZXQpKSk7CiB9CiAKK2lubGlu ZSBzdGF0aWMgdW5zaWduZWQgZGVsdGFNb2RlKGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgZXZl bnQpCit7CisgICAgcmV0dXJuIGV2ZW50LmdyYW51bGFyaXR5KCkgPT0gU2Nyb2xsQnlQYWdlV2hl ZWxFdmVudCA/IFdoZWVsRXZlbnQ6OkRPTV9ERUxUQV9QQUdFIDogV2hlZWxFdmVudDo6RE9NX0RF TFRBX1BJWEVMOworfQorCiBib29sIEVsZW1lbnQ6OmRpc3BhdGNoV2hlZWxFdmVudChjb25zdCBQ bGF0Zm9ybVdoZWVsRXZlbnQmIGV2ZW50KQogewotICAgIHJldHVybiBFdmVudERpc3BhdGNoZXI6 OmRpc3BhdGNoRXZlbnQodGhpcywgV2hlZWxFdmVudERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0ZShl dmVudCwgZG9jdW1lbnQoKS5kZWZhdWx0VmlldygpKSk7CisgICAgaWYgKCEoZXZlbnQuZGVsdGFY KCkgfHwgZXZlbnQuZGVsdGFZKCkpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIFJlZlB0 cjxXaGVlbEV2ZW50PiB3aGVlbEV2ZW50ID0gV2hlZWxFdmVudDo6Y3JlYXRlKAorICAgICAgICBG bG9hdFBvaW50KGV2ZW50LndoZWVsVGlja3NYKCksIGV2ZW50LndoZWVsVGlja3NZKCkpLAorICAg ICAgICBGbG9hdFBvaW50KGV2ZW50LmRlbHRhWCgpLCBldmVudC5kZWx0YVkoKSksCisgICAgICAg IGRlbHRhTW9kZShldmVudCksCisgICAgICAgIGRvY3VtZW50KCkuZGVmYXVsdFZpZXcoKSwKKyAg ICAgICAgZXZlbnQuZ2xvYmFsUG9zaXRpb24oKSwKKyAgICAgICAgZXZlbnQucG9zaXRpb24oKSwK KyAgICAgICAgZXZlbnQuY3RybEtleSgpLCBldmVudC5hbHRLZXkoKSwgZXZlbnQuc2hpZnRLZXko KSwgZXZlbnQubWV0YUtleSgpLAorICAgICAgICBldmVudC5kaXJlY3Rpb25JbnZlcnRlZEZyb21E ZXZpY2UoKSwKKyAgICAgICAgZXZlbnQudGltZXN0YW1wKCkpOworCisgICAgcmV0dXJuIEV2ZW50 RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hFdmVudCh0aGlzLCBFdmVudERpc3BhdGNoTWVkaWF0b3I6OmNy ZWF0ZSh3aGVlbEV2ZW50KSkgJiYgIXdoZWVsRXZlbnQtPmRlZmF1bHRIYW5kbGVkKCk7CiB9CiAK LWJvb2wgRWxlbWVudDo6ZGlzcGF0Y2hLZXlFdmVudChjb25zdCBQbGF0Zm9ybUtleWJvYXJkRXZl bnQmIGV2ZW50KQorYm9vbCBFbGVtZW50OjpkaXNwYXRjaEtleUV2ZW50KGNvbnN0IFBsYXRmb3Jt S2V5Ym9hcmRFdmVudCYgcGxhdGZvcm1FdmVudCkKIHsKLSAgICByZXR1cm4gRXZlbnREaXNwYXRj aGVyOjpkaXNwYXRjaEV2ZW50KHRoaXMsIEtleWJvYXJkRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpj cmVhdGUoS2V5Ym9hcmRFdmVudDo6Y3JlYXRlKGV2ZW50LCBkb2N1bWVudCgpLmRlZmF1bHRWaWV3 KCkpKSk7CisgICAgUmVmUHRyPEtleWJvYXJkRXZlbnQ+IGV2ZW50ID0gS2V5Ym9hcmRFdmVudDo6 Y3JlYXRlKHBsYXRmb3JtRXZlbnQsIGRvY3VtZW50KCkuZGVmYXVsdFZpZXcoKSk7CisgICAgcmV0 dXJuIEV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hFdmVudCh0aGlzLCBFdmVudERpc3BhdGNoTWVk aWF0b3I6OmNyZWF0ZShldmVudCkpICYmICFldmVudC0+ZGVmYXVsdEhhbmRsZWQoKTsKIH0KIAog dm9pZCBFbGVtZW50OjpkaXNwYXRjaFNpbXVsYXRlZENsaWNrKEV2ZW50KiB1bmRlcmx5aW5nRXZl bnQsIFNpbXVsYXRlZENsaWNrTW91c2VFdmVudE9wdGlvbnMgZXZlbnRPcHRpb25zLCBTaW11bGF0 ZWRDbGlja1Zpc3VhbE9wdGlvbnMgdmlzdWFsT3B0aW9ucykKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2RvbS9HZXN0dXJlRXZlbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9H ZXN0dXJlRXZlbnQuY3BwCShyZXZpc2lvbiAxNTcxNzYpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20v R2VzdHVyZUV2ZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA1LDI2ICsxMDUsNiBAQCBHZXN0 dXJlRXZlbnQ6Okdlc3R1cmVFdmVudChjb25zdCBBdG9taWNTCiB7CiB9CiAKLUdlc3R1cmVFdmVu dERpc3BhdGNoTWVkaWF0b3I6Okdlc3R1cmVFdmVudERpc3BhdGNoTWVkaWF0b3IoUGFzc1JlZlB0 cjxHZXN0dXJlRXZlbnQ+IGdlc3R1cmVFdmVudCkKLSAgICA6IEV2ZW50RGlzcGF0Y2hNZWRpYXRv cihnZXN0dXJlRXZlbnQpCi17Ci19Ci0KLUdlc3R1cmVFdmVudCogR2VzdHVyZUV2ZW50RGlzcGF0 Y2hNZWRpYXRvcjo6ZXZlbnQoKSBjb25zdAotewotICAgIHJldHVybiBzdGF0aWNfY2FzdDxHZXN0 dXJlRXZlbnQqPihFdmVudERpc3BhdGNoTWVkaWF0b3I6OmV2ZW50KCkpOwotfQotCi1ib29sIEdl c3R1cmVFdmVudERpc3BhdGNoTWVkaWF0b3I6Om1lZGlhdGVBbmREaXNwYXRjaEV2ZW50KEV2ZW50 RGlzcGF0Y2hlciogZGlzcGF0Y2hlcikgY29uc3QKLXsKLSAgICBpZiAoaXNEaXNhYmxlZEZvcm1D b250cm9sKGRpc3BhdGNoZXItPm5vZGUoKSkpCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAg ZGlzcGF0Y2hlci0+ZGlzcGF0Y2goKTsKLSAgICBBU1NFUlQoIWV2ZW50KCktPmRlZmF1bHRQcmV2 ZW50ZWQoKSk7Ci0gICAgcmV0dXJuIGV2ZW50KCktPmRlZmF1bHRIYW5kbGVkKCkgfHwgZXZlbnQo KS0+ZGVmYXVsdFByZXZlbnRlZCgpOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNl bmRpZiAvLyBFTkFCTEUoR0VTVFVSRV9FVkVOVFMpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20v R2VzdHVyZUV2ZW50LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0dlc3R1cmVF dmVudC5oCShyZXZpc2lvbiAxNTcxNzYpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vR2VzdHVyZUV2 ZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTYxLDIxICs2MSw2IEBAIHByaXZhdGU6CiAgICAgZmxv YXQgbV9kZWx0YVk7CiB9OwogCi1jbGFzcyBHZXN0dXJlRXZlbnREaXNwYXRjaE1lZGlhdG9yIDog cHVibGljIEV2ZW50RGlzcGF0Y2hNZWRpYXRvciB7Ci1wdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NS ZWZQdHI8R2VzdHVyZUV2ZW50RGlzcGF0Y2hNZWRpYXRvcj4gY3JlYXRlKFBhc3NSZWZQdHI8R2Vz dHVyZUV2ZW50PiBnZXN0dXJlRXZlbnQpCi0gICAgewotICAgICAgICByZXR1cm4gYWRvcHRSZWYo bmV3IEdlc3R1cmVFdmVudERpc3BhdGNoTWVkaWF0b3IoZ2VzdHVyZUV2ZW50KSk7Ci0gICAgfQot Ci1wcml2YXRlOgotICAgIGV4cGxpY2l0IEdlc3R1cmVFdmVudERpc3BhdGNoTWVkaWF0b3IoUGFz c1JlZlB0cjxHZXN0dXJlRXZlbnQ+KTsKLQotICAgIEdlc3R1cmVFdmVudCogZXZlbnQoKSBjb25z dDsKLQotICAgIHZpcnR1YWwgYm9vbCBtZWRpYXRlQW5kRGlzcGF0Y2hFdmVudChFdmVudERpc3Bh dGNoZXIqKSBjb25zdCBPVkVSUklERTsKLX07Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAog I2VuZGlmIC8vIEVOQUJMRShHRVNUVVJFX0VWRU5UUykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Rv bS9LZXlib2FyZEV2ZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vS2V5 Ym9hcmRFdmVudC5jcHAJKHJldmlzaW9uIDE1NzE3NikKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9L ZXlib2FyZEV2ZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjEzLDIwICsyMTMsNCBAQCBLZXli b2FyZEV2ZW50KiBmaW5kS2V5Ym9hcmRFdmVudChFdmVudCogCiAgICAgcmV0dXJuIDA7CiB9CiAK LVBhc3NSZWZQdHI8S2V5Ym9hcmRFdmVudERpc3BhdGNoTWVkaWF0b3I+IEtleWJvYXJkRXZlbnRE aXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUoUGFzc1JlZlB0cjxLZXlib2FyZEV2ZW50PiBldmVudCkK LXsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IEtleWJvYXJkRXZlbnREaXNwYXRjaE1lZGlhdG9y KGV2ZW50KSk7Ci19Ci0KLUtleWJvYXJkRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpLZXlib2FyZEV2 ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNzUmVmUHRyPEtleWJvYXJkRXZlbnQ+IGV2ZW50KQotICAg IDogRXZlbnREaXNwYXRjaE1lZGlhdG9yKGV2ZW50KQotewotfQotCi1ib29sIEtleWJvYXJkRXZl bnREaXNwYXRjaE1lZGlhdG9yOjptZWRpYXRlQW5kRGlzcGF0Y2hFdmVudChFdmVudERpc3BhdGNo ZXIqIGRpc3BhdGNoZXIpIGNvbnN0Ci17Ci0gICAgLy8gTWFrZSBzdXJlIG5vdCB0byByZXR1cm4g dHJ1ZSBpZiB3ZSBhbHJlYWR5IHRvb2sgZGVmYXVsdCBhY3Rpb24gd2hpbGUgaGFuZGxpbmcgdGhl IGV2ZW50LgotICAgIHJldHVybiBFdmVudERpc3BhdGNoTWVkaWF0b3I6Om1lZGlhdGVBbmREaXNw YXRjaEV2ZW50KGRpc3BhdGNoZXIpICYmICFldmVudCgpLT5kZWZhdWx0SGFuZGxlZCgpOwotfQot CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vS2V5Ym9h cmRFdmVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9LZXlib2FyZEV2ZW50 LmgJKHJldmlzaW9uIDE1NzE3NikKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9LZXlib2FyZEV2ZW50 LmgJKHdvcmtpbmcgY29weSkKQEAgLTEyOCwxNCArMTI4LDYgQEAgcHJpdmF0ZToKIAogS2V5Ym9h cmRFdmVudCogZmluZEtleWJvYXJkRXZlbnQoRXZlbnQqKTsKIAotY2xhc3MgS2V5Ym9hcmRFdmVu dERpc3BhdGNoTWVkaWF0b3IgOiBwdWJsaWMgRXZlbnREaXNwYXRjaE1lZGlhdG9yIHsKLXB1Ymxp YzoKLSAgICBzdGF0aWMgUGFzc1JlZlB0cjxLZXlib2FyZEV2ZW50RGlzcGF0Y2hNZWRpYXRvcj4g Y3JlYXRlKFBhc3NSZWZQdHI8S2V5Ym9hcmRFdmVudD4pOwotcHJpdmF0ZToKLSAgICBleHBsaWNp dCBLZXlib2FyZEV2ZW50RGlzcGF0Y2hNZWRpYXRvcihQYXNzUmVmUHRyPEtleWJvYXJkRXZlbnQ+ KTsKLSAgICB2aXJ0dWFsIGJvb2wgbWVkaWF0ZUFuZERpc3BhdGNoRXZlbnQoRXZlbnREaXNwYXRj aGVyKikgY29uc3QgT1ZFUlJJREU7Ci19OwotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNl bmRpZiAvLyBLZXlib2FyZEV2ZW50X2gKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAJKHJldmlzaW9uIDE1 NzE3NykKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MjExMSw3ICsyMTExLDE0IEBAIGJvb2wgTm9kZTo6ZGlzcGF0Y2hHZXN0dXJlRXZlbnQoY29uc3Qg UGwKICAgICBSZWZQdHI8R2VzdHVyZUV2ZW50PiBnZXN0dXJlRXZlbnQgPSBHZXN0dXJlRXZlbnQ6 OmNyZWF0ZShkb2N1bWVudCgpLmRlZmF1bHRWaWV3KCksIGV2ZW50KTsKICAgICBpZiAoIWdlc3R1 cmVFdmVudC5nZXQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHJldHVybiBFdmVudERp c3BhdGNoZXI6OmRpc3BhdGNoRXZlbnQodGhpcywgR2VzdHVyZUV2ZW50RGlzcGF0Y2hNZWRpYXRv cjo6Y3JlYXRlKGdlc3R1cmVFdmVudCkpOworCisgICAgaWYgKGlzRGlzYWJsZWRGb3JtQ29udHJv bCh0aGlzKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBFdmVudERpc3BhdGNoZXI6OmRp c3BhdGNoRXZlbnQodGhpcywgRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUoZ2VzdHVyZUV2 ZW50KSk7CisKKyAgICBBU1NFUlQoIWdlc3R1cmVFdmVudC0+ZGVmYXVsdFByZXZlbnRlZCgpKTsK KyAgICByZXR1cm4gZ2VzdHVyZUV2ZW50LT5kZWZhdWx0SGFuZGxlZCgpIHx8IGdlc3R1cmVFdmVu dC0+ZGVmYXVsdFByZXZlbnRlZCgpOwogfQogI2VuZGlmCiAKQEAgLTIxMjUsNyArMjEzMiw4IEBA IGJvb2wgTm9kZTo6ZGlzcGF0Y2hUb3VjaEV2ZW50KFBhc3NSZWZQdHIKICNpZiBFTkFCTEUoSU5E SUVfVUkpCiBib29sIE5vZGU6OmRpc3BhdGNoVUlSZXF1ZXN0RXZlbnQoUGFzc1JlZlB0cjxVSVJl cXVlc3RFdmVudD4gZXZlbnQpCiB7Ci0gICAgcmV0dXJuIEV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0 Y2hFdmVudCh0aGlzLCBVSVJlcXVlc3RFdmVudERpc3BhdGNoTWVkaWF0b3I6OmNyZWF0ZShldmVu dCkpOworICAgIEV2ZW50RGlzcGF0Y2hlcjo6ZGlzcGF0Y2hFdmVudCh0aGlzLCBFdmVudERpc3Bh dGNoTWVkaWF0b3I6OmNyZWF0ZShldmVudCkpOworICAgIHJldHVybiBldmVudC0+ZGVmYXVsdEhh bmRsZWQoKSB8fCBldmVudC0+ZGVmYXVsdFByZXZlbnRlZCgpOwogfQogI2VuZGlmCiAgICAgCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vV2hlZWxFdmVudC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvZG9tL1doZWVsRXZlbnQuY3BwCShyZXZpc2lvbiAxNTcxNzYpCisrKyBTb3Vy Y2UvV2ViQ29yZS9kb20vV2hlZWxFdmVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEyNSwzNSAr MTI1LDQgQEAgYm9vbCBXaGVlbEV2ZW50Ojppc01vdXNlRXZlbnQoKSBjb25zdAogICAgIHJldHVy biBmYWxzZTsKIH0KIAotaW5saW5lIHN0YXRpYyB1bnNpZ25lZCBkZWx0YU1vZGUoY29uc3QgUGxh dGZvcm1XaGVlbEV2ZW50JiBldmVudCkKLXsKLSAgICByZXR1cm4gZXZlbnQuZ3JhbnVsYXJpdHko KSA9PSBTY3JvbGxCeVBhZ2VXaGVlbEV2ZW50ID8gV2hlZWxFdmVudDo6RE9NX0RFTFRBX1BBR0Ug OiBXaGVlbEV2ZW50OjpET01fREVMVEFfUElYRUw7Ci19Ci0KLVBhc3NSZWZQdHI8V2hlZWxFdmVu dERpc3BhdGNoTWVkaWF0b3I+IFdoZWVsRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpjcmVhdGUoY29u c3QgUGxhdGZvcm1XaGVlbEV2ZW50JiBldmVudCwgUGFzc1JlZlB0cjxBYnN0cmFjdFZpZXc+IHZp ZXcpCi17Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXaGVlbEV2ZW50RGlzcGF0Y2hNZWRpYXRv cihldmVudCwgdmlldykpOwotfQotCi1XaGVlbEV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6V2hlZWxF dmVudERpc3BhdGNoTWVkaWF0b3IoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiBldmVudCwgUGFz c1JlZlB0cjxBYnN0cmFjdFZpZXc+IHZpZXcpCi17Ci0gICAgaWYgKCEoZXZlbnQuZGVsdGFYKCkg fHwgZXZlbnQuZGVsdGFZKCkpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBzZXRFdmVudChXaGVl bEV2ZW50OjpjcmVhdGUoRmxvYXRQb2ludChldmVudC53aGVlbFRpY2tzWCgpLCBldmVudC53aGVl bFRpY2tzWSgpKSwgRmxvYXRQb2ludChldmVudC5kZWx0YVgoKSwgZXZlbnQuZGVsdGFZKCkpLAot ICAgICAgICBkZWx0YU1vZGUoZXZlbnQpLCB2aWV3LCBldmVudC5nbG9iYWxQb3NpdGlvbigpLCBl dmVudC5wb3NpdGlvbigpLAotICAgICAgICBldmVudC5jdHJsS2V5KCksIGV2ZW50LmFsdEtleSgp LCBldmVudC5zaGlmdEtleSgpLCBldmVudC5tZXRhS2V5KCksIGV2ZW50LmRpcmVjdGlvbkludmVy dGVkRnJvbURldmljZSgpLCBldmVudC50aW1lc3RhbXAoKSkpOwotfQotCi1XaGVlbEV2ZW50KiBX aGVlbEV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6ZXZlbnQoKSBjb25zdAotewotICAgIHJldHVybiBz dGF0aWNfY2FzdDxXaGVlbEV2ZW50Kj4oRXZlbnREaXNwYXRjaE1lZGlhdG9yOjpldmVudCgpKTsK LX0KLQotYm9vbCBXaGVlbEV2ZW50RGlzcGF0Y2hNZWRpYXRvcjo6bWVkaWF0ZUFuZERpc3BhdGNo RXZlbnQoRXZlbnREaXNwYXRjaGVyKiBkaXNwYXRjaGVyKSBjb25zdAotewotICAgIEFTU0VSVChl dmVudCgpKTsKLSAgICByZXR1cm4gRXZlbnREaXNwYXRjaE1lZGlhdG9yOjptZWRpYXRlQW5kRGlz cGF0Y2hFdmVudChkaXNwYXRjaGVyKSAmJiAhZXZlbnQoKS0+ZGVmYXVsdEhhbmRsZWQoKTsKLX0K LQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvZG9tL1doZWVs RXZlbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vV2hlZWxFdmVudC5oCShy ZXZpc2lvbiAxNTcxNzYpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vV2hlZWxFdmVudC5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMTEsMTUgKzExMSw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2RpcmVj dGlvbkludmVydGVkRnJvbURldmljZTsKIH07CiAKLWNsYXNzIFdoZWVsRXZlbnREaXNwYXRjaE1l ZGlhdG9yIDogcHVibGljIEV2ZW50RGlzcGF0Y2hNZWRpYXRvciB7Ci1wdWJsaWM6Ci0gICAgc3Rh dGljIFBhc3NSZWZQdHI8V2hlZWxFdmVudERpc3BhdGNoTWVkaWF0b3I+IGNyZWF0ZShjb25zdCBQ bGF0Zm9ybVdoZWVsRXZlbnQmLCBQYXNzUmVmUHRyPEFic3RyYWN0Vmlldz4pOwotcHJpdmF0ZToK LSAgICBXaGVlbEV2ZW50RGlzcGF0Y2hNZWRpYXRvcihjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQm LCBQYXNzUmVmUHRyPEFic3RyYWN0Vmlldz4pOwotICAgIFdoZWVsRXZlbnQqIGV2ZW50KCkgY29u c3Q7Ci0gICAgdmlydHVhbCBib29sIG1lZGlhdGVBbmREaXNwYXRjaEV2ZW50KEV2ZW50RGlzcGF0 Y2hlciopIGNvbnN0IE9WRVJSSURFOwotfTsKLQogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAj ZW5kaWYgLy8gV2hlZWxFdmVudF9oCg==