7079 2006-02-05 01:13:26 -0800 various event cleanup, including fixing of the load event for iframes 2019-02-06 09:02:46 -0800 1 1 1 Unclassified WebKit DOM 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 mjs mjs cdumez oldest_to_newest 31417 0 mjs 2006-02-05 01:13:26 -0800 I made a few improvements to event dispatch: - don't bother to nil-check the document, a node can never have a null document now - move temp event forgetting from dispatchEvent to dispatchGenericEvent - pass event down using RefPtr::release() to avoid ref thrashing - support default handlers even for non-bubbling events (only on target node) and skip calling default event handler explicitly in callers - dispatch a whole separate load event to a frame document's containing frame - don't let propagationStopped prevent this new event - remove bogus security check for iframe onload 31419 1 6264 mjs 2006-02-05 01:17:49 -0800 Created attachment 6264 the fix (including test case) 31423 2 6264 darin 2006-02-05 01:28:54 -0800 Comment on attachment 6264 the fix (including test case) Looks good. Gave Maciej some comments on IRC. r=me 31470 3 darin 2006-02-05 10:59:32 -0800 Had to roll it out -- I think Maciej had a fix last night but the commit failed. 31663 4 adele 2006-02-06 20:15:09 -0800 Maciej checked in a fixed version of this. Setting state to resolved/fixed. 1502840 5 lforschler 2019-02-06 09:02:46 -0800 Mass moving XML DOM bugs to the "DOM" Component. 6264 2006-02-05 01:17:49 -0800 2006-02-05 01:28:54 -0800 the fix (including test case) event-improvements.patch.txt text/plain 13559 mjs SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDEyNTcwKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDYtMDItMDUgIE1hY2llaiBTdGFjaG93aWFr ICA8bWpzQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KyAgICAgICAgCisgICAgICAgIFRlc3QgY2FzZSBmb3I6CisgICAgICAgIC0gdmFyaW91cyBldmVu dCBjbGVhbnVwLCBpbmNsdWRpbmcgZml4aW5nIG9mIHRoZSBsb2FkIGV2ZW50IGZvciBpZnJhbWVz CisgICAgICAgIGh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NzA3OQorCisgICAgICAgICogZmFzdC9ldmVudHMvaWZyYW1lLW9iamVjdC1vbmxvYWQtZXhwZWN0 ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2V2ZW50cy9pZnJhbWUtb2JqZWN0LW9ubG9h ZC5odG1sOiBBZGRlZC4KKwogMjAwNi0wMi0wNCAgTWFjaWVqIFN0YWNob3dpYWsgIDxtanNAYXBw bGUuY29tPgogCiAgICAgICAgIC0gcmV2ZXJ0ZWQgQ1NTIG1lZGlhIHF1ZXJpZXMgcGF0Y2gsIGFz IGl0IGNhdXNlcyByYW5kb20gY3Jhc2hlcyBvbiB0aGUKSW5kZXg6IExheW91dFRlc3RzL2Zhc3Qv ZXZlbnRzL2lmcmFtZS1vYmplY3Qtb25sb2FkLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvZmFzdC9ldmVudHMvaWZyYW1lLW9iamVjdC1vbmxvYWQuaHRtbAkocmV2aXNpb24gMCkKKysr IExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2lmcmFtZS1vYmplY3Qtb25sb2FkLmh0bWwJKHJldmlz aW9uIDApCkBAIC0wLDAgKzEsNjggQEAKKzxkaXY+IAorVGhpcyB0ZXN0IGNoZWNrcyB0aGF0IG9u bG9hZCBldmVudHMgZmlyZSBvbiBpZnJhbWUgYW5kIG9iamVjdAorZWxlbWVudHMgd2hlbiB0aGVp ciBjb250ZW50cyBmaW5pc2ggbG9hZGluZywgYW5kIHRoYXQgdGhlc2UgYXJlCitzZXBhcmF0ZSBl dmVudCBvYmplY3RzIGZyb20gdGhvc2UgdGhhdCBmaXJlIG9uIHRoZSBib2R5IGluc2lkZSB0aGUK K2ZyYW1lLiBJZiBpdCBwYXNzZXMsIHlvdSB3aWxsIHNlZSA2IGJsb2NrcyBiZWxvdywgZWFjaCB3 aXRoIGEKK3RocmVlLWxpbmUgbWVzc2FnZSB0aGF0IGVuZHMgaW4gZmFsc2UuCis8L2Rpdj4KKzxk aXYgaWQ9ImNvbnNvbGUiPgorPC9kaXY+Cis8c2NyaXB0PgoraWYgKHdpbmRvdy5sYXlvdXRUZXN0 Q29udHJvbGxlcikKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisKK2Z1 bmN0aW9uIGxvZyhzKQoreworICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb25zb2xlIiku aW5uZXJIVE1MICs9IHMgKyAiPGJyPiI7Cit9CisKK3ZhciBpbm5lckV2ZW50ID0gbmlsOworCitm dW5jdGlvbiBsb2dPdXRlcihtc2csIGV2ZW50KQoreworICAgIGxvZyhtc2cpOworICAgIGxvZygn T3V0ZXIgZXZlbnQgc2FtZSBhcyBpbm5lcjogJyArIChpbm5lckV2ZW50ID09IGV2ZW50KSk7Cisg ICAgbG9nKCctLS0tLS0nKTsKK30KKworZnVuY3Rpb24gbG9nSW5uZXIodGFnLCBldmVudCkKK3sK KyAgICBwYXJlbnQubG9nKCJGaXJlZCBsb2FkIGV2ZW50IG9uIGJvZHkgaW5zaWRlICIgKyB0YWcp OyAKKyAgICBwYXJlbnQuaW5uZXJFdmVudCA9IGV2ZW50OworfQorCis8L3NjcmlwdD4KKworPGlm cmFtZSAKKyAgICBzcmM9ImRhdGE6dGV4dC9odG1sLDxodG1sPjxib2R5IG9ubG9hZD0ncGFyZW50 LmxvZ0lubmVyKCUyMmlmcmFtZSUyMiwgZXZlbnQpJz5Jbm5lcjwvYm9keT48L2h0bWw+IiAKKyAg ICBvbmxvYWQ9ImxvZ091dGVyKCdGaXJlZCBldmVudCBvbiBpZnJhbWUnLCBldmVudCkiPgorPC9p ZnJhbWU+CisKKzxpZnJhbWUgCisgICAgc3JjPSJkYXRhOnRleHQvaHRtbCw8Ym9keSBvbmxvYWQ9 J3BhcmVudC5sb2dJbm5lciglMjJpZnJhbWUlMjIsIGV2ZW50KTsgZXZlbnQucHJldmVudERlZmF1 bHQoKSc+cHJldmVudERlZmF1bHQ8L2JvZHk+IiAKKyAgICBvbmxvYWQ9ImxvZ091dGVyKCdGaXJl ZCBldmVudCBvbiBpZnJhbWUgZXZlbiB0aG91Z2ggZGVmYXVsdCB3YXMgcHJldmVudGVkJywgZXZl bnQpIj4KKzwvaWZyYW1lPgorCis8aWZyYW1lCisgICAgc3JjPSJkYXRhOnRleHQvaHRtbCw8Ym9k eSBvbmxvYWQ9J3BhcmVudC5sb2dJbm5lciglMjJvYmplY3QlMjIsIGV2ZW50KTsgZXZlbnQuc3Rv cFByb3BhZ2F0aW9uKCknPnN0b3BQcm9wYWdhdGlvbjwvYm9keT4iIAorICAgIG9ubG9hZD0ibG9n T3V0ZXIoJ0ZpcmVkIGV2ZW50IG9uIG9iamVjdCBldmVuIHRob3VnaCBwcm9wYWdhdGlvbiB3YXMg c3RvcHBlZCcsIGV2ZW50KSI+Cis8L2lmcmFtZT4KKworPG9iamVjdCAKKyAgICB0eXBlPSJ0ZXh0 L2h0bWwiCisgICAgZGF0YT0iZGF0YTp0ZXh0L2h0bWwsPGh0bWw+PGJvZHkgb25sb2FkPSdwYXJl bnQubG9nSW5uZXIoJTIyb2JqZWN0JTIyLCBldmVudCknPklubmVyPC9ib2R5PjwvaHRtbD4iIAor ICAgIG9ubG9hZD0ibG9nT3V0ZXIoJ0ZpcmVkIGV2ZW50IG9uIG9iamVjdCcsIGV2ZW50KSI+Cis8 L29iamVjdD4KKworPG9iamVjdCAKKyAgICB0eXBlPSJ0ZXh0L2h0bWwiCisgICAgZGF0YT0iZGF0 YTp0ZXh0L2h0bWwsPGJvZHkgb25sb2FkPSdwYXJlbnQubG9nSW5uZXIoJTIyb2JqZWN0JTIyLCBl dmVudCk7IGV2ZW50LnByZXZlbnREZWZhdWx0KCknPnByZXZlbnREZWZhdWx0PC9ib2R5PiIgCisg ICAgb25sb2FkPSJsb2dPdXRlcignRmlyZWQgZXZlbnQgb24gb2JqZWN0IGV2ZW4gdGhvdWdoIGRl ZmF1bHQgd2FzIHByZXZlbnRlZCcsIGV2ZW50KSI+Cis8L29iamVjdD4KKworPG9iamVjdCAKKyAg ICB0eXBlPSJ0ZXh0L2h0bWwiCisgICAgZGF0YT0iZGF0YTp0ZXh0L2h0bWwsPGJvZHkgb25sb2Fk PSdwYXJlbnQubG9nSW5uZXIoJTIyb2JqZWN0JTIyLCBldmVudCk7IGV2ZW50LnN0b3BQcm9wYWdh dGlvbigpJz5zdG9wUHJvcGFnYXRpb248L2JvZHk+IiAKKyAgICBvbmxvYWQ9ImxvZ091dGVyKCdG aXJlZCBldmVudCBvbiBvYmplY3QgZXZlbiB0aG91Z2ggcHJvcGFnYXRpb24gd2FzIHN0b3BwZWQn LCBldmVudCkiPgorPC9vYmplY3Q+CisKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZXZlbnRzL2lm cmFtZS1vYmplY3Qtb25sb2FkLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9mYXN0L2V2ZW50cy9pZnJhbWUtb2JqZWN0LW9ubG9hZC1leHBlY3RlZC50eHQJKHJldmlzaW9u IDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9pZnJhbWUtb2JqZWN0LW9ubG9hZC1leHBl Y3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMjUgQEAKK0ZpcmVkIGxvYWQgZXZlbnQg b24gYm9keSBpbnNpZGUgaWZyYW1lCitGaXJlZCBldmVudCBvbiBpZnJhbWUKK091dGVyIGV2ZW50 IHNhbWUgYXMgaW5uZXI6IGZhbHNlCistLS0tLS0KK0ZpcmVkIGxvYWQgZXZlbnQgb24gYm9keSBp bnNpZGUgaWZyYW1lCitGaXJlZCBldmVudCBvbiBpZnJhbWUgZXZlbiB0aG91Z2ggZGVmYXVsdCB3 YXMgcHJldmVudGVkCitPdXRlciBldmVudCBzYW1lIGFzIGlubmVyOiBmYWxzZQorLS0tLS0tCitG aXJlZCBsb2FkIGV2ZW50IG9uIGJvZHkgaW5zaWRlIG9iamVjdAorRmlyZWQgZXZlbnQgb24gb2Jq ZWN0IGV2ZW4gdGhvdWdoIHByb3BhZ2F0aW9uIHdhcyBzdG9wcGVkCitPdXRlciBldmVudCBzYW1l IGFzIGlubmVyOiBmYWxzZQorLS0tLS0tCitGaXJlZCBsb2FkIGV2ZW50IG9uIGJvZHkgaW5zaWRl IG9iamVjdAorRmlyZWQgZXZlbnQgb24gb2JqZWN0CitPdXRlciBldmVudCBzYW1lIGFzIGlubmVy OiBmYWxzZQorLS0tLS0tCitGaXJlZCBsb2FkIGV2ZW50IG9uIGJvZHkgaW5zaWRlIG9iamVjdAor RmlyZWQgZXZlbnQgb24gb2JqZWN0IGV2ZW4gdGhvdWdoIGRlZmF1bHQgd2FzIHByZXZlbnRlZAor T3V0ZXIgZXZlbnQgc2FtZSBhcyBpbm5lcjogZmFsc2UKKy0tLS0tLQorRmlyZWQgbG9hZCBldmVu dCBvbiBib2R5IGluc2lkZSBvYmplY3QKK0ZpcmVkIGV2ZW50IG9uIG9iamVjdCBldmVuIHRob3Vn aCBwcm9wYWdhdGlvbiB3YXMgc3RvcHBlZAorT3V0ZXIgZXZlbnQgc2FtZSBhcyBpbm5lcjogZmFs c2UKKy0tLS0tLQorICAgICAgICAKSW5kZXg6IFdlYkNvcmUva2h0bWwveG1sL05vZGVJbXBsLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9raHRtbC94bWwvTm9kZUltcGwuaAkocmV2aXNpb24gMTI1 NzApCisrKyBXZWJDb3JlL2todG1sL3htbC9Ob2RlSW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0y NzIsNyArMjcyLDcgQEAgcHVibGljOgogICAgIHZvaWQgcmVtb3ZlQWxsRXZlbnRMaXN0ZW5lcnMo KTsKIAogICAgIGJvb2wgZGlzcGF0Y2hFdmVudChQYXNzUmVmUHRyPEV2ZW50SW1wbD4sIEV4Y2Vw dGlvbkNvZGUmLCBib29sIHRlbXBFdmVudCA9IGZhbHNlKTsKLSAgICBib29sIGRpc3BhdGNoR2Vu ZXJpY0V2ZW50KFBhc3NSZWZQdHI8RXZlbnRJbXBsPiwgRXhjZXB0aW9uQ29kZSYpOworICAgIGJv b2wgZGlzcGF0Y2hHZW5lcmljRXZlbnQoUGFzc1JlZlB0cjxFdmVudEltcGw+LCBFeGNlcHRpb25D b2RlJiwgYm9vbCB0ZW1wRXZlbnQgPSBmYWxzZSk7CiAgICAgYm9vbCBkaXNwYXRjaEhUTUxFdmVu dChjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwgYm9vbCBjYW5CdWJibGUsIGJvb2wgY2Fu Y2VsYWJsZSk7CiAgICAgYm9vbCBkaXNwYXRjaFdpbmRvd0V2ZW50KGNvbnN0IEF0b21pY1N0cmlu ZyYgZXZlbnRUeXBlLCBib29sIGNhbkJ1YmJsZSwgYm9vbCBjYW5jZWxhYmxlKTsKICAgICBib29s IGRpc3BhdGNoTW91c2VFdmVudChRTW91c2VFdmVudCosIGNvbnN0IEF0b21pY1N0cmluZyYgb3Zl cnJpZGVUeXBlLApJbmRleDogV2ViQ29yZS9raHRtbC94bWwvTm9kZUltcGwuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUva2h0bWwveG1sL05vZGVJbXBsLmNwcAkocmV2aXNpb24gMTI1NzApCisr KyBXZWJDb3JlL2todG1sL3htbC9Ob2RlSW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ5NSwz MSArNDk1LDEyIEBAIGJvb2wgTm9kZUltcGw6OmRpc3BhdGNoRXZlbnQoUGFzc1JlZlB0cjwKICAg ICB9CiAgICAgZXZ0LT5zZXRUYXJnZXQodGhpcyk7CiAKLSAgICAvLyBXZSd2ZSBoYWQgYXQgbGVh c3Qgb25lIHJlcG9ydCBvZiBhIGNyYXNoIG9uIGEgcGFnZSB3aGVyZSBkb2N1bWVudCBpcyBudWxs IGhlcmUuCi0gICAgLy8gVW5mb3J0dW5hdGVseSB0aGF0IHBhZ2Ugbm8gbG9uZ2VyIGV4aXN0cywg YnV0IHdlJ2xsIG1ha2UgdGhpcyBjb2RlIHJvYnVzdCBhZ2FpbnN0Ci0gICAgLy8gdGhhdCBhbnl3 YXkuCi0gICAgLy8gRklYTUU6IE11Y2ggY29kZSBpbiB0aGlzIGNsYXNzIGFzc3VtZXMgZG9jdW1l bnQgaXMgbm9uLW51bGw7IGl0IHdvdWxkIGJlIGJldHRlciB0bwotICAgIC8vIGVuc3VyZSB0aGF0 IGRvY3VtZW50IGNhbiBuZXZlciBiZSBudWxsLgotICAgIEZyYW1lICpmcmFtZSA9IDA7Ci0gICAg UmVmUHRyPEZyYW1lVmlldz4gdmlldzsKLQotICAgIGlmIChEb2N1bWVudEltcGwgKmRvYyA9IGdl dERvY3VtZW50KCkpIHsKLSAgICAgICAgZnJhbWUgPSBkb2MtPmZyYW1lKCk7Ci0gICAgICAgIHZp ZXcgPSBkb2MtPnZpZXcoKTsKLSAgICB9Ci0KLSAgICBib29sIHJldCA9IGRpc3BhdGNoR2VuZXJp Y0V2ZW50KGV2dCwgZXhjZXB0aW9uY29kZSk7Ci0KLSAgICAvLyBJZiB0ZW1wRXZlbnQgaXMgdHJ1 ZSwgdGhpcyBtZWFucyB0aGF0IHRoZSBET00gaW1wbGVtZW50YXRpb24gd2lsbCBub3QgYmUgc3Rv cmluZyBhIHJlZmVyZW5jZSB0byB0aGUgZXZlbnQsIGkuZS4KLSAgICAvLyB0aGVyZSBpcyBubyB3 YXkgdG8gcmV0cmlldmUgaXQgZnJvbSBqYXZhc2NyaXB0IGlmIGEgc2NyaXB0IGRvZXMgbm90IGFs cmVhZHkgaGF2ZSBhIHJlZmVyZW5jZSB0byBpdCBpbiBhIHZhcmlhYmxlLgotICAgIC8vIFNvIHRo ZXJlIGlzIG5vIG5lZWQgZm9yIHRoZSBpbnRlcnByZXRlciB0byBrZWVwIHRoZSBldmVudCBpbiBp dCdzIGNhY2hlCi0gICAgaWYgKHRlbXBFdmVudCAmJiBmcmFtZSAmJiBmcmFtZS0+alNjcmlwdCgp KQotICAgICAgICBmcmFtZS0+alNjcmlwdCgpLT5maW5pc2hlZFdpdGhFdmVudChldnQuZ2V0KCkp OworICAgIFJlZlB0cjxGcmFtZVZpZXc+IHZpZXcgPSBnZXREb2N1bWVudCgpLT52aWV3KCk7CiAK LSAgICByZXR1cm4gcmV0OworICAgIHJldHVybiBkaXNwYXRjaEdlbmVyaWNFdmVudChldnQucmVs ZWFzZSgpLCBleGNlcHRpb25jb2RlLCB0ZW1wRXZlbnQpOwogfQogCi1ib29sIE5vZGVJbXBsOjpk aXNwYXRjaEdlbmVyaWNFdmVudChQYXNzUmVmUHRyPEV2ZW50SW1wbD4gZSwgaW50ICYvKmV4Y2Vw dGlvbmNvZGUgKi8pCitib29sIE5vZGVJbXBsOjpkaXNwYXRjaEdlbmVyaWNFdmVudChQYXNzUmVm UHRyPEV2ZW50SW1wbD4gZSwgaW50ICYvKmV4Y2VwdGlvbmNvZGUgKi8sIGJvb2wgdGVtcEV2ZW50 KQogewogICAgIFJlZlB0cjxFdmVudEltcGw+IGV2dChlKTsKICAgICBhc3NlcnQoIWV2ZW50RGlz cGF0Y2hGb3JiaWRkZW4oKSk7CkBAIC01MzUsNyArNTE2LDYgQEAgYm9vbCBOb2RlSW1wbDo6ZGlz cGF0Y2hHZW5lcmljRXZlbnQoUGFzcwogICAgICAgICBub2RlQ2hhaW4ucHJlcGVuZChuKTsKICAg ICB9CiAKLSAgICAKICAgICBRUHRyTGlzdEl0ZXJhdG9yPE5vZGVJbXBsPiBpdChub2RlQ2hhaW4p OwogICAgIAogICAgIC8vIEJlZm9yZSB3ZSBiZWdpbiBkaXNwYXRjaGluZyBldmVudHMsIGdpdmUg dGhlIHRhcmdldCBub2RlIGEgY2hhbmNlIHRvIGRvIHNvbWUgd29yayBwcmlvcgpAQCAtNTg5LDEy ICs1NjksMTYgQEAgYm9vbCBOb2RlSW1wbDo6ZGlzcGF0Y2hHZW5lcmljRXZlbnQoUGFzcwogICAg IC8vIE5vdyBjYWxsIHRoZSBwb3N0IGRpc3BhdGNoLgogICAgIHBvc3REaXNwYXRjaEV2ZW50SGFu ZGxlcihldnQuZ2V0KCksIGRhdGEpOwogICAgIAotICAgIGlmIChldnQtPmJ1YmJsZXMoKSkgewot ICAgICAgICAvLyBub3cgd2UgY2FsbCBhbGwgZGVmYXVsdCBldmVudCBoYW5kbGVycyAodGhpcyBp cyBub3QgcGFydCBvZiBET00gLSBpdCBpcyBpbnRlcm5hbCB0byBraHRtbCkKKyAgICAvLyBub3cg d2UgY2FsbCBhbGwgZGVmYXVsdCBldmVudCBoYW5kbGVycyAodGhpcyBpcyBub3QgcGFydCBvZiBE T00gLSBpdCBpcyBpbnRlcm5hbCB0byBraHRtbCkKIAorICAgIGlmIChldnQtPmJ1YmJsZXMoKSkg ewogICAgICAgICBpdC50b0xhc3QoKTsKICAgICAgICAgZm9yICg7IGl0LmN1cnJlbnQoKSAmJiAh ZXZ0LT5kZWZhdWx0UHJldmVudGVkKCkgJiYgIWV2dC0+ZGVmYXVsdEhhbmRsZWQoKTsgLS1pdCkK ICAgICAgICAgICAgIGl0LmN1cnJlbnQoKS0+ZGVmYXVsdEV2ZW50SGFuZGxlcihldnQuZ2V0KCkp OworICAgIH0gZWxzZSB7CisgICAgICAgIGl0LnRvRmlyc3QoKTsKKyAgICAgICAgaWYgKCFldnQt PmRlZmF1bHRQcmV2ZW50ZWQoKSAmJiAhZXZ0LT5kZWZhdWx0SGFuZGxlZCgpKQorICAgICAgICAg ICAgaXQuY3VycmVudCgpLT5kZWZhdWx0RXZlbnRIYW5kbGVyKGV2dC5nZXQoKSk7CiAgICAgfQog ICAgIAogICAgIC8vIGRlcmVmIGFsbCBub2RlcyBpbiBjaGFpbgpAQCAtNjA0LDYgKzU4OCwxNSBA QCBib29sIE5vZGVJbXBsOjpkaXNwYXRjaEdlbmVyaWNFdmVudChQYXNzCiAKICAgICBEb2N1bWVu dEltcGw6OnVwZGF0ZURvY3VtZW50c1JlbmRlcmluZygpOwogCisgICAgLy8gSWYgdGVtcEV2ZW50 IGlzIHRydWUsIHRoaXMgbWVhbnMgdGhhdCB0aGUgRE9NIGltcGxlbWVudGF0aW9uCisgICAgLy8g d2lsbCBub3QgYmUgc3RvcmluZyBhIHJlZmVyZW5jZSB0byB0aGUgZXZlbnQsIGkuZS4gIHRoZXJl IGlzIG5vCisgICAgLy8gd2F5IHRvIHJldHJpZXZlIGl0IGZyb20gamF2YXNjcmlwdCBpZiBhIHNj cmlwdCBkb2VzIG5vdCBhbHJlYWR5CisgICAgLy8gaGF2ZSBhIHJlZmVyZW5jZSB0byBpdCBpbiBh IHZhcmlhYmxlLiAgU28gdGhlcmUgaXMgbm8gbmVlZCBmb3IKKyAgICAvLyB0aGUgaW50ZXJwcmV0 ZXIgdG8ga2VlcCB0aGUgZXZlbnQgaW4gaXQncyBjYWNoZQorICAgIEZyYW1lICpmcmFtZSA9IGdl dERvY3VtZW50KCktPmZyYW1lKCk7CisgICAgaWYgKHRlbXBFdmVudCAmJiBmcmFtZSAmJiBmcmFt ZS0+alNjcmlwdCgpKQorICAgICAgICBmcmFtZS0+alNjcmlwdCgpLT5maW5pc2hlZFdpdGhFdmVu dChldnQuZ2V0KCkpOworCiAgICAgcmV0dXJuICFldnQtPmRlZmF1bHRQcmV2ZW50ZWQoKTsgLy8g IyMjIHdoYXQgaWYgZGVmYXVsdFByZXZlbnRlZCB3YXMgY2FsbGVkIGJlZm9yZSBkaXNwYXRjaEV2 ZW50PwogfQogCkBAIC02MjEsMjkgKzYxNCwxNyBAQCBib29sIE5vZGVJbXBsOjpkaXNwYXRjaFdp bmRvd0V2ZW50KGNvbnN0CiAgICAgUmVmUHRyPEV2ZW50SW1wbD4gZXZ0ID0gbmV3IEV2ZW50SW1w bChldmVudFR5cGUsIGNhbkJ1YmJsZUFyZywgY2FuY2VsYWJsZUFyZyk7CiAgICAgUmVmUHRyPERv Y3VtZW50SW1wbD4gZG9jID0gZ2V0RG9jdW1lbnQoKTsKICAgICBldnQtPnNldFRhcmdldChkb2Mu Z2V0KCkpOwotICAgIGJvb2wgciA9IGRpc3BhdGNoR2VuZXJpY0V2ZW50KGV2dCwgZXhjZXB0aW9u Y29kZSk7Ci0gICAgaWYgKCFldnQtPmRlZmF1bHRQcmV2ZW50ZWQoKSAmJiBkb2MpCi0gICAgICAg IGRvYy0+ZGVmYXVsdEV2ZW50SGFuZGxlcihldnQuZ2V0KCkpOworICAgIGJvb2wgciA9IGRpc3Bh dGNoR2VuZXJpY0V2ZW50KGV2dC5yZWxlYXNlKCksIGV4Y2VwdGlvbmNvZGUsIHRydWUpOwogCi0g ICAgaWYgKGV2ZW50VHlwZSA9PSBsb2FkRXZlbnQgJiYgIWV2dC0+cHJvcGFnYXRpb25TdG9wcGVk KCkgJiYgZG9jKSB7Ci0gICAgICAgIC8vIEZvciBvbmxvYWQgZXZlbnRzLCBzZW5kIHRoZW0gdG8g dGhlIGVuY2xvc2luZyBmcmFtZSBvbmx5LgorICAgIGlmIChldmVudFR5cGUgPT0gbG9hZEV2ZW50 KSB7CisgICAgICAgIC8vIEZvciBvbmxvYWQgZXZlbnRzLCBzZW5kIGEgc2VwYXJhdGUgbG9hZCBl dmVudCB0byB0aGUgZW5jbG9zaW5nIGZyYW1lIG9ubHkuCiAgICAgICAgIC8vIFRoaXMgaXMgYSBE T00gZXh0ZW5zaW9uIGFuZCBpcyBpbmRlcGVuZGVudCBvZiBidWJibGluZy9jYXB0dXJpbmcgcnVs ZXMgb2YKLSAgICAgICAgLy8gdGhlIERPTS4gIFlvdSBzZW5kIHRoZSBldmVudCBvbmx5IHRvIHRo ZSBlbmNsb3NpbmcgZnJhbWUuICBJdCBkb2VzIG5vdAotICAgICAgICAvLyBidWJibGUgdGhyb3Vn aCB0aGUgcGFyZW50IGRvY3VtZW50LgotICAgICAgICBFbGVtZW50SW1wbCogZWx0ID0gZG9jLT5v d25lckVsZW1lbnQoKTsKLSAgICAgICAgaWYgKGVsdCAmJiAoZWx0LT5nZXREb2N1bWVudCgpLT5k b21haW4oKS5pc051bGwoKSB8fAotICAgICAgICAgICAgICAgICAgICBlbHQtPmdldERvY3VtZW50 KCktPmRvbWFpbigpID09IGRvYy0+ZG9tYWluKCkpKSB7Ci0gICAgICAgICAgICAvLyBXZSBhbHNv IGRvIGEgc2VjdXJpdHkgY2hlY2ssIHNpbmNlIHdlIGRvbid0IHdhbnQgdG8gYWxsb3cgdGhlIGVu Y2xvc2luZwotICAgICAgICAgICAgLy8gaWZyYW1lIHRvIHNlZSBsb2FkcyBvZiBjaGlsZCBkb2N1 bWVudHMgaW4gb3RoZXIgZG9tYWlucy4KLSAgICAgICAgICAgIGV2dC0+c2V0Q3VycmVudFRhcmdl dChlbHQpOwotCi0gICAgICAgICAgICAvLyBDYXB0dXJpbmcgZmlyc3QuCi0gICAgICAgICAgICBl bHQtPmhhbmRsZUxvY2FsRXZlbnRzKGV2dC5nZXQoKSwgdHJ1ZSk7Ci0KLSAgICAgICAgICAgIC8v IEJ1YmJsaW5nIHNlY29uZC4KLSAgICAgICAgICAgIGlmICghZXZ0LT5wcm9wYWdhdGlvblN0b3Bw ZWQoKSkKLSAgICAgICAgICAgICAgICBlbHQtPmhhbmRsZUxvY2FsRXZlbnRzKGV2dC5nZXQoKSwg ZmFsc2UpOwotICAgICAgICAgICAgciA9ICFldnQtPmRlZmF1bHRQcmV2ZW50ZWQoKTsKKyAgICAg ICAgLy8gdGhlIERPTS4KKyAgICAgICAgRWxlbWVudEltcGwqIG93bmVyRWxlbWVudCA9IGRvYy0+ b3duZXJFbGVtZW50KCk7CisgICAgICAgIGlmIChvd25lckVsZW1lbnQpIHsKKyAgICAgICAgICAg IFJlZlB0cjxFdmVudEltcGw+IG93bmVyRXZlbnQgPSBuZXcgRXZlbnRJbXBsKGV2ZW50VHlwZSwg ZmFsc2UsIGNhbmNlbGFibGVBcmcpOworICAgICAgICAgICAgb3duZXJFdmVudC0+c2V0VGFyZ2V0 KG93bmVyRWxlbWVudCk7CisgICAgICAgICAgICBvd25lckVsZW1lbnQtPmRpc3BhdGNoR2VuZXJp Y0V2ZW50KG93bmVyRXZlbnQucmVsZWFzZSgpLCBleGNlcHRpb25jb2RlLCB0cnVlKTsKICAgICAg ICAgfQogICAgIH0KIApJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNTcwKQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMTMgKzEsMzAgQEAKIDIwMDYtMDItMDUgIE1hY2llaiBTdGFjaG93 aWFrICA8bWpzQGFwcGxlLmNvbT4KIAotICAgICAgICBSZXZpZXdlZCBhbmQgbGFuZGVkIGJ5IEFu ZGVycy4KKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAKLSAgICAgICAgKiBi aW5kaW5ncy9vYmpjL0RPTS5tbToKLSAgICAgICAgKC1bRE9NTm9kZSByZXBsYWNlQ2hpbGQ6Ol0p OgotICAgICAgICAoS0pTOjpET01Ob2RlUHJvdG9GdW5jOjpjYWxsQXNGdW5jdGlvbik6Ci0gICAg ICAgIFJldHVybiBjb3JyZWN0IGNoaWxkLiBGaXhlcyB0ZXN0IGNhc2UgZmFpbHVyZXMgaW50cm9k dWNlZCBieSB0aGUgZml4IHRvCi0gICAgICAgIGh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NzA3NgorICAgICAgICAtIHZhcmlvdXMgZXZlbnQgY2xlYW51cCwg aW5jbHVkaW5nIGZpeGluZyBvZiB0aGUgbG9hZCBldmVudCBmb3IgaWZyYW1lcworICAgICAgICBo dHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hvd19idWcuY2dpP2lkPTcwNzkKKyAgICAg ICAgCisgICAgICAgIFNwZWNpZmljIGNoYW5nZXM6CiAgICAgICAgIAorICAgICAgICAtIGRvbid0 IGJvdGhlciB0byBuaWwtY2hlY2sgdGhlIGRvY3VtZW50LCBhIG5vZGUgY2FuIG5ldmVyIGhhdmUg YSBudWxsIGRvY3VtZW50IG5vdworICAgICAgICAtIG1vdmUgdGVtcCBldmVudCBmb3JnZXR0aW5n IGZyb20gZGlzcGF0Y2hFdmVudCB0byBkaXNwYXRjaEdlbmVyaWNFdmVudAorICAgICAgICAtIHBh c3MgZXZlbnQgZG93biB1c2luZyBSZWZQdHI6OnJlbGVhc2UoKSB0byBhdm9pZCByZWYgdGhyYXNo aW5nCisgICAgICAgIC0gc3VwcG9ydCBkZWZhdWx0IGhhbmRsZXJzIGV2ZW4gZm9yIG5vbi1idWJi bGluZyBldmVudHMgKG9ubHkgb24KKyAgICAgICAgICB0YXJnZXQgbm9kZSkgYW5kIHNraXAgY2Fs bGluZyBkZWZhdWx0IGV2ZW50IGhhbmRsZXIgZXhwbGljaXRseSBpbgorICAgICAgICAgIGNhbGxl cnMKKyAgICAgICAgLSBkaXNwYXRjaCBhIHdob2xlIHNlcGFyYXRlIGxvYWQgZXZlbnQgdG8gYSBm cmFtZSBkb2N1bWVudCdzIGNvbnRhaW5pbmcgZnJhbWUKKyAgICAgICAgLSBkb24ndCBsZXQgcHJv cGFnYXRpb25TdG9wcGVkIHByZXZlbnQgdGhpcyBuZXcgZXZlbnQKKyAgICAgICAgLSByZW1vdmUg Ym9ndXMgc2VjdXJpdHkgY2hlY2sgZm9yIGlmcmFtZSBvbmxvYWQKKworICAgICAgICAqIGJyaWRn ZS9tYWMvTWFjRnJhbWUubW06CisgICAgICAgIChXZWJDb3JlOjpNYWNGcmFtZTo6c2hvdWxkQ2xv c2UpOgorICAgICAgICAqIGtodG1sL3htbC9Ob2RlSW1wbC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpOb2RlSW1wbDo6ZGlzcGF0Y2hFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlSW1wbDo6 ZGlzcGF0Y2hHZW5lcmljRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZUltcGw6OmRpc3Bh dGNoV2luZG93RXZlbnQpOgorICAgICAgICAqIGtodG1sL3htbC9Ob2RlSW1wbC5oOgorCiAyMDA2 LTAyLTA1ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBraWx6ZXIubmV0PgogCiAgICAgICAgIFJl dmlld2VkIGJ5IERhcmluLCBsYW5kZWQgYnkgYXAgKHdpdGggYSB0d2VhayBzdWdnZXN0ZWQgYnkg RGFyaW4pLgpAQCAtMTgsNiArMzUsMjAgQEAKIAogMjAwNi0wMi0wNCAgTWFjaWVqIFN0YWNob3dp YWsgIDxtanNAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFdBUk5JTkc6IE5PIFRFU1QgQ0FTRVMgQURERUQgT1IgQ0hBTkdFRAorCisg ICAgICAgICogYnJpZGdlL21hYy9NYWNGcmFtZS5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1hY0Zy YW1lOjpzaG91bGRDbG9zZSk6CisgICAgICAgICoga2h0bWwveG1sL05vZGVJbXBsLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Ok5vZGVJbXBsOjpkaXNwYXRjaEV2ZW50KToKKyAgICAgICAgKFdlYkNv cmU6Ok5vZGVJbXBsOjpkaXNwYXRjaEdlbmVyaWNFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpO b2RlSW1wbDo6ZGlzcGF0Y2hXaW5kb3dFdmVudCk6CisgICAgICAgICoga2h0bWwveG1sL05vZGVJ bXBsLmg6CisKKzIwMDYtMDItMDQgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4K KwogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbi4KIAogICAgICAgICAtIEp1c3QgcmV0dXJuIGJv b2wgZnJvbSBET00gY2hpbGQgbXV0YXRpb24gbWV0aG9kcyBpbnN0ZWFkIG9mIHRoZSBub2RlCklu ZGV4OiBXZWJDb3JlL2JyaWRnZS9tYWMvTWFjRnJhbWUubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9icmlkZ2UvbWFjL01hY0ZyYW1lLm1tCShyZXZpc2lvbiAxMjU3MCkKKysrIFdlYkNvcmUvYnJp ZGdlL21hYy9NYWNGcmFtZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMzUzMSw3ICszNTMxLDcgQEAg Ym9vbCBNYWNGcmFtZTo6c2hvdWxkQ2xvc2UoKQogICAgIFJlZlB0cjxCZWZvcmVVbmxvYWRFdmVu dEltcGw+IGV2ZW50ID0gbmV3IEJlZm9yZVVubG9hZEV2ZW50SW1wbDsKICAgICBldmVudC0+c2V0 VGFyZ2V0KGRvYy5nZXQoKSk7CiAgICAgaW50IGV4Y2VwdGlvbiA9IDA7Ci0gICAgYm9keS0+ZGlz cGF0Y2hHZW5lcmljRXZlbnQoZXZlbnQsIGV4Y2VwdGlvbik7CisgICAgYm9keS0+ZGlzcGF0Y2hH ZW5lcmljRXZlbnQoZXZlbnQsIGV4Y2VwdGlvbiwgdHJ1ZSk7CiAgICAgaWYgKCFldmVudC0+ZGVm YXVsdFByZXZlbnRlZCgpICYmIGRvYykKICAgICAgICAgZG9jLT5kZWZhdWx0RXZlbnRIYW5kbGVy KGV2ZW50LmdldCgpKTsKICAgICBpZiAoZXZlbnQtPnJlc3VsdCgpLmlzTnVsbCgpKQo=