174719 2017-07-21 11:01:33 -0700 [WebIDL] Make a few parameters non-nullable in inspector IDL files 2017-07-21 12:40:02 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam buildbot commit-queue joepeck oldest_to_newest 1331025 0 sam 2017-07-21 11:01:33 -0700 [WebIDL] Make a few parameters non-nullable in inspector IDL files 1331027 1 316105 sam 2017-07-21 11:02:20 -0700 Created attachment 316105 Patch 1331037 2 316105 joepeck 2017-07-21 11:22:53 -0700 Comment on attachment 316105 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=316105&action=review r=me > Source/WebCore/inspector/InspectorFrontendHost.cpp:392 > if (!is<MouseEvent>(event)) > return; If this is the case should we just change the IDL to take a MouseEvent instead of an Event? 1331039 3 joepeck 2017-07-21 11:41:39 -0700 `InspectorFrontendHost.dispatchEventAsContextMenuEvent` can take a non-nullable. It is only used in our code with a non-null object: > if (this._event.type !== "contextmenu" && typeof InspectorFrontendHost.dispatchEventAsContextMenuEvent === "function") { > this._menuObject = menuObject; > this._event.target.addEventListener("contextmenu", this, true); > InspectorFrontendHost.dispatchEventAsContextMenuEvent(this._event); > } `CommandLineAPIHost.getEventListeners` taking a non-nullable would be a small behavior change but probably for the better. Users can use this by just calling it from Web Inspector's Quick Console: js> getEventListeners() undefined js> getEventListeners(document.body) {} js> getEventListeners(node) {click: Array} I think making the first argument non-nullable would change that first case to: > getEventListeners() TypeError: Not enough arguments Which is totally fine to me. As something only available through Web Inspector, we wouldn't be breaking any existing code. That said, returning `undefined` does matches Chrome's impl. None of this is standard nor commonly used. The doc everyone uses is: https://getfirebug.com/wiki/index.php/Command_Line_API#getEventListeners.28.29 1331068 4 316105 commit-queue 2017-07-21 12:40:00 -0700 Comment on attachment 316105 Patch Clearing flags on attachment: 316105 Committed r219735: <http://trac.webkit.org/changeset/219735> 1331069 5 commit-queue 2017-07-21 12:40:02 -0700 All reviewed patches have been landed. Closing bug. 316105 2017-07-21 11:02:20 -0700 2017-07-21 12:40:00 -0700 Patch bug-174719-20170721110425.patch text/plain 10069 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxOTczMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE3LTA3LTIxICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW1dlYklETF0gTWFrZSBhIGZldyBwYXJh bWV0ZXJzIG5vbi1udWxsYWJsZSBpbiBpbnNwZWN0b3IgSURMIGZpbGVzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQ3MTkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9Db21tYW5kTGlu ZUFQSUhvc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29tbWFuZExpbmVBUElIb3N0OjpkYXRh YmFzZUlkKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbW1hbmRMaW5lQVBJSG9zdDo6c3RvcmFnZUlk KToKKyAgICAgICAgKiBpbnNwZWN0b3IvQ29tbWFuZExpbmVBUElIb3N0Lmg6CisgICAgICAgICog aW5zcGVjdG9yL0NvbW1hbmRMaW5lQVBJSG9zdC5pZGw6CisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3RvckRPTVN0b3JhZ2VBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JE T01TdG9yYWdlQWdlbnQ6OnN0b3JhZ2VJZCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rv ckRPTVN0b3JhZ2VBZ2VudC5oOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JEYXRhYmFz ZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRhdGFiYXNlQWdlbnQ6OmRh dGFiYXNlSWQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JEYXRhYmFzZUFnZW50Lmg6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OnNob3dDb250ZXh0TWVudSk6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OmRpc3BhdGNoRXZlbnRBc0NvbnRl eHRNZW51RXZlbnQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3Qu aDoKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmlkbDoKKyAgICAg ICAgUmVtb3ZlIG51bGxhYmlsaXR5IGZyb20gYXJndW1lbnRzIHRoYXQgc2hvdWxkIG5ldmVyIGJl IG51bGwuCisKIDIwMTctMDctMjEgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAog ICAgICAgICBSZW5hbWUgRE9NQ29yZUV4Y2VwdGlvbiBjbGFzcyB0byBET01FeGNlcHRpb24KSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db21tYW5kTGluZUFQSUhvc3QuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db21tYW5kTGluZUFQSUhvc3QuY3Bw CShyZXZpc2lvbiAyMTk3MzEpCisrKyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29tbWFuZExp bmVBUElIb3N0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTczLDE0ICsxNzMsMTQgQEAgSlNDOjpK U1ZhbHVlIENvbW1hbmRMaW5lQVBJSG9zdDo6aW5zcGVjdAogICAgIHJldHVybiBzY3JpcHRWYWx1 ZSA/IHNjcmlwdFZhbHVlIDoganNVbmRlZmluZWQoKTsKIH0KIAotU3RyaW5nIENvbW1hbmRMaW5l QVBJSG9zdDo6ZGF0YWJhc2VJZChEYXRhYmFzZSogZGF0YWJhc2UpCitTdHJpbmcgQ29tbWFuZExp bmVBUElIb3N0OjpkYXRhYmFzZUlkKERhdGFiYXNlJiBkYXRhYmFzZSkKIHsKICAgICBpZiAobV9k YXRhYmFzZUFnZW50KQogICAgICAgICByZXR1cm4gbV9kYXRhYmFzZUFnZW50LT5kYXRhYmFzZUlk KGRhdGFiYXNlKTsKICAgICByZXR1cm4geyB9OwogfQogCi1TdHJpbmcgQ29tbWFuZExpbmVBUElI b3N0OjpzdG9yYWdlSWQoU3RvcmFnZSogc3RvcmFnZSkKK1N0cmluZyBDb21tYW5kTGluZUFQSUhv c3Q6OnN0b3JhZ2VJZChTdG9yYWdlJiBzdG9yYWdlKQogewogICAgIGlmIChtX2RvbVN0b3JhZ2VB Z2VudCkKICAgICAgICAgcmV0dXJuIG1fZG9tU3RvcmFnZUFnZW50LT5zdG9yYWdlSWQoc3RvcmFn ZSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29tbWFuZExpbmVBUElIb3N0LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbW1hbmRMaW5lQVBJSG9z dC5oCShyZXZpc2lvbiAyMTk3MzEpCisrKyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29tbWFu ZExpbmVBUElIb3N0LmgJKHdvcmtpbmcgY29weSkKQEAgLTk5LDggKzk5LDggQEAgcHVibGljOgog ICAgIHVzaW5nIEV2ZW50TGlzdGVuZXJzUmVjb3JkID0gVmVjdG9yPFdURjo6S2V5VmFsdWVQYWly PFN0cmluZywgVmVjdG9yPExpc3RlbmVyRW50cnk+Pj47CiAgICAgRXZlbnRMaXN0ZW5lcnNSZWNv cmQgZ2V0RXZlbnRMaXN0ZW5lcnMoSlNDOjpFeGVjU3RhdGUmLCBOb2RlKik7CiAKLSAgICBTdHJp bmcgZGF0YWJhc2VJZChEYXRhYmFzZSopOwotICAgIFN0cmluZyBzdG9yYWdlSWQoU3RvcmFnZSop OworICAgIFN0cmluZyBkYXRhYmFzZUlkKERhdGFiYXNlJik7CisgICAgU3RyaW5nIHN0b3JhZ2VJ ZChTdG9yYWdlJik7CiAKICAgICBKU0M6OkpTVmFsdWUgd3JhcHBlcihKU0M6OkV4ZWNTdGF0ZSos IEpTRE9NR2xvYmFsT2JqZWN0Kik7CiAgICAgdm9pZCBjbGVhckFsbFdyYXBwZXJzKCk7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29tbWFuZExpbmVBUElIb3N0LmlkbAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29tbWFuZExpbmVBUElIb3N0LmlkbAko cmV2aXNpb24gMjE5NzMxKQorKysgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvbW1hbmRMaW5l QVBJSG9zdC5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTQyLDggKzQyLDggQEAKIAogICAgIFtDYWxs V2l0aD1TY3JpcHRTdGF0ZV0gcmVjb3JkPERPTVN0cmluZywgc2VxdWVuY2U8TGlzdGVuZXJFbnRy eT4+IGdldEV2ZW50TGlzdGVuZXJzKE5vZGU/IG5vZGUpOwogCi0gICAgRE9NU3RyaW5nIGRhdGFi YXNlSWQoRGF0YWJhc2U/IGRhdGFiYXNlKTsKLSAgICBET01TdHJpbmcgc3RvcmFnZUlkKFN0b3Jh Z2U/IHN0b3JhZ2UpOworICAgIERPTVN0cmluZyBkYXRhYmFzZUlkKERhdGFiYXNlIGRhdGFiYXNl KTsKKyAgICBET01TdHJpbmcgc3RvcmFnZUlkKFN0b3JhZ2Ugc3RvcmFnZSk7CiB9OwogCiBbCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3Rv cmFnZUFnZW50LmNwcAkocmV2aXNpb24gMjE5NzMxKQorKysgU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvckRPTVN0b3JhZ2VBZ2VudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzOSwx NSArMTM5LDE0IEBAIHZvaWQgSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50OjpyZW1vdmVET00KICAg ICBzdG9yYWdlQXJlYS0+cmVtb3ZlSXRlbShmcmFtZSwga2V5KTsKIH0KIAotU3RyaW5nIEluc3Bl Y3RvckRPTVN0b3JhZ2VBZ2VudDo6c3RvcmFnZUlkKFN0b3JhZ2UqIHN0b3JhZ2UpCitTdHJpbmcg SW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50OjpzdG9yYWdlSWQoU3RvcmFnZSYgc3RvcmFnZSkKIHsK LSAgICBBU1NFUlQoc3RvcmFnZSk7Ci0gICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gc3RvcmFnZS0+ ZnJhbWUoKS0+ZG9jdW1lbnQoKTsKKyAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBzdG9yYWdlLmZy YW1lKCktPmRvY3VtZW50KCk7CiAgICAgQVNTRVJUKGRvY3VtZW50KTsKICAgICBET01XaW5kb3cq IHdpbmRvdyA9IGRvY3VtZW50LT5kb21XaW5kb3coKTsKICAgICBBU1NFUlQod2luZG93KTsKICAg ICBSZWY8U2VjdXJpdHlPcmlnaW4+IHNlY3VyaXR5T3JpZ2luID0gZG9jdW1lbnQtPnNlY3VyaXR5 T3JpZ2luKCk7Ci0gICAgYm9vbCBpc0xvY2FsU3RvcmFnZSA9IHdpbmRvdy0+b3B0aW9uYWxMb2Nh bFN0b3JhZ2UoKSA9PSBzdG9yYWdlOworICAgIGJvb2wgaXNMb2NhbFN0b3JhZ2UgPSB3aW5kb3ct Pm9wdGlvbmFsTG9jYWxTdG9yYWdlKCkgPT0gJnN0b3JhZ2U7CiAgICAgcmV0dXJuIHN0b3JhZ2VJ ZChzZWN1cml0eU9yaWdpbi5wdHIoKSwgaXNMb2NhbFN0b3JhZ2UpLT50b0pTT05TdHJpbmcoKTsK IH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTVN0b3JhZ2VB Z2VudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JE T01TdG9yYWdlQWdlbnQuaAkocmV2aXNpb24gMjE5NzMxKQorKysgU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckRPTVN0b3JhZ2VBZ2VudC5oCSh3b3JraW5nIGNvcHkpCkBAIC02NSw3 ICs2NSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHJlbW92ZURPTVN0b3JhZ2VJdGVtKEVycm9yU3Ry aW5nJiwgY29uc3QgSW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3QmIHN0b3JhZ2VJZCwgY29uc3Qg U3RyaW5nJiBrZXkpIG92ZXJyaWRlOwogCiAgICAgLy8gQ2FsbGVkIGZyb20gdGhlIGluamVjdGVk IHNjcmlwdC4KLSAgICBTdHJpbmcgc3RvcmFnZUlkKFN0b3JhZ2UqKTsKKyAgICBTdHJpbmcgc3Rv cmFnZUlkKFN0b3JhZ2UmKTsKICAgICBSZWZQdHI8SW5zcGVjdG9yOjpQcm90b2NvbDo6RE9NU3Rv cmFnZTo6U3RvcmFnZUlkPiBzdG9yYWdlSWQoU2VjdXJpdHlPcmlnaW4qLCBib29sIGlzTG9jYWxT dG9yYWdlKTsKIAogICAgIC8vIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbgpJbmRleDogU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRhdGFiYXNlQWdlbnQuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEYXRhYmFzZUFnZW50LmNwcAko cmV2aXNpb24gMjE5NzMxKQorKysgU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRh dGFiYXNlQWdlbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNzMsMTAgKzI3MywxMCBAQCB2b2lk IEluc3BlY3RvckRhdGFiYXNlQWdlbnQ6OmV4ZWN1dGVTUUwoCiAgICAgICAgIFRyYW5zYWN0aW9u U3VjY2Vzc0NhbGxiYWNrOjpjcmVhdGUoKSk7CiB9CiAKLVN0cmluZyBJbnNwZWN0b3JEYXRhYmFz ZUFnZW50OjpkYXRhYmFzZUlkKERhdGFiYXNlKiBkYXRhYmFzZSkKK1N0cmluZyBJbnNwZWN0b3JE YXRhYmFzZUFnZW50OjpkYXRhYmFzZUlkKERhdGFiYXNlJiBkYXRhYmFzZSkKIHsKICAgICBmb3Ig KGF1dG8mIHJlc291cmNlIDogbV9yZXNvdXJjZXMpIHsKLSAgICAgICAgaWYgKHJlc291cmNlLnZh bHVlLT5kYXRhYmFzZSgpID09IGRhdGFiYXNlKQorICAgICAgICBpZiAocmVzb3VyY2UudmFsdWUt PmRhdGFiYXNlKCkgPT0gJmRhdGFiYXNlKQogICAgICAgICAgICAgcmV0dXJuIHJlc291cmNlLmtl eTsKICAgICB9CiAgICAgcmV0dXJuIFN0cmluZygpOwpJbmRleDogU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckRhdGFiYXNlQWdlbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGF0YWJhc2VBZ2VudC5oCShyZXZpc2lvbiAyMTk3MzEp CisrKyBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGF0YWJhc2VBZ2VudC5oCSh3 b3JraW5nIGNvcHkpCkBAIC02MCw3ICs2MCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGV4ZWN1dGVT UUwoRXJyb3JTdHJpbmcmLCBjb25zdCBTdHJpbmcmIGRhdGFiYXNlSWQsIGNvbnN0IFN0cmluZyYg cXVlcnksIFJlZjxFeGVjdXRlU1FMQ2FsbGJhY2s+JiYpIG92ZXJyaWRlOwogCiAgICAgLy8gQ2Fs bGVkIGZyb20gdGhlIGluamVjdGVkIHNjcmlwdC4KLSAgICBTdHJpbmcgZGF0YWJhc2VJZChEYXRh YmFzZSopOworICAgIFN0cmluZyBkYXRhYmFzZUlkKERhdGFiYXNlJik7CiAKICAgICB2b2lkIGRp ZE9wZW5EYXRhYmFzZShSZWZQdHI8RGF0YWJhc2U+JiYsIGNvbnN0IFN0cmluZyYgZG9tYWluLCBj b25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmVyc2lvbik7CiBwcml2YXRlOgpJbmRl eDogU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9z dC5jcHAJKHJldmlzaW9uIDIxOTczMSkKKysrIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JGcm9udGVuZEhvc3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNjIsMTIgKzM2Miw5IEBA IHN0YXRpYyB2b2lkIHBvcHVsYXRlQ29udGV4dE1lbnUoVmVjdG9yPEkKIH0KICNlbmRpZgogCi12 b2lkIEluc3BlY3RvckZyb250ZW5kSG9zdDo6c2hvd0NvbnRleHRNZW51KEV2ZW50KiBldmVudCwg VmVjdG9yPENvbnRleHRNZW51SXRlbT4mJiBpdGVtcykKK3ZvaWQgSW5zcGVjdG9yRnJvbnRlbmRI b3N0OjpzaG93Q29udGV4dE1lbnUoRXZlbnQmIGV2ZW50LCBWZWN0b3I8Q29udGV4dE1lbnVJdGVt PiYmIGl0ZW1zKQogewogI2lmIEVOQUJMRShDT05URVhUX01FTlVTKQotICAgIGlmICghZXZlbnQp Ci0gICAgICAgIHJldHVybjsKLQogICAgIEFTU0VSVChtX2Zyb250ZW5kUGFnZSk7CiAgICAgYXV0 byYgc3RhdGUgPSAqZXhlY1N0YXRlRnJvbVBhZ2UoZGVidWdnZXJXb3JsZCgpLCBtX2Zyb250ZW5k UGFnZSk7CiAgICAgSlNDOjpKU09iamVjdCogZnJvbnRlbmRBcGlPYmplY3Q7CkBAIC0zODEsMjQg KzM3OCwyNCBAQCB2b2lkIEluc3BlY3RvckZyb250ZW5kSG9zdDo6c2hvd0NvbnRleHRNCiAKICAg ICBhdXRvIG1lbnVQcm92aWRlciA9IEZyb250ZW5kTWVudVByb3ZpZGVyOjpjcmVhdGUodGhpcywg eyAmc3RhdGUsIGZyb250ZW5kQXBpT2JqZWN0IH0sIG1lbnUuaXRlbXMoKSk7CiAgICAgbV9tZW51 UHJvdmlkZXIgPSBtZW51UHJvdmlkZXIucHRyKCk7Ci0gICAgbV9mcm9udGVuZFBhZ2UtPmNvbnRl eHRNZW51Q29udHJvbGxlcigpLnNob3dDb250ZXh0TWVudSgqZXZlbnQsIG1lbnVQcm92aWRlcik7 CisgICAgbV9mcm9udGVuZFBhZ2UtPmNvbnRleHRNZW51Q29udHJvbGxlcigpLnNob3dDb250ZXh0 TWVudShldmVudCwgbWVudVByb3ZpZGVyKTsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKGV2ZW50 KTsKICAgICBVTlVTRURfUEFSQU0oaXRlbXMpOwogI2VuZGlmCiB9CiAKLXZvaWQgSW5zcGVjdG9y RnJvbnRlbmRIb3N0OjpkaXNwYXRjaEV2ZW50QXNDb250ZXh0TWVudUV2ZW50KEV2ZW50KiBldmVu dCkKK3ZvaWQgSW5zcGVjdG9yRnJvbnRlbmRIb3N0OjpkaXNwYXRjaEV2ZW50QXNDb250ZXh0TWVu dUV2ZW50KEV2ZW50JiBldmVudCkKIHsKICNpZiBFTkFCTEUoQ09OVEVYVF9NRU5VUykgJiYgVVNF KEFDQ0VTU0lCSUxJVFlfQ09OVEVYVF9NRU5VUykKICAgICBpZiAoIWlzPE1vdXNlRXZlbnQ+KGV2 ZW50KSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgRnJhbWUqIGZyYW1lID0gZXZlbnQtPnRhcmdl dCgpLT50b05vZGUoKS0+ZG9jdW1lbnQoKS5mcmFtZSgpOwotICAgIE1vdXNlRXZlbnQmIG1vdXNl RXZlbnQgPSBkb3duY2FzdDxNb3VzZUV2ZW50PigqZXZlbnQpOwotICAgIEludFBvaW50IG1vdXNl UG9pbnQgPSBJbnRQb2ludChtb3VzZUV2ZW50LmNsaWVudFgoKSwgbW91c2VFdmVudC5jbGllbnRZ KCkpOworICAgIGF1dG8mIG1vdXNlRXZlbnQgPSBkb3duY2FzdDxNb3VzZUV2ZW50PihldmVudCk7 CisgICAgSW50UG9pbnQgbW91c2VQb2ludCB7IG1vdXNlRXZlbnQuY2xpZW50WCgpLCBtb3VzZUV2 ZW50LmNsaWVudFkoKSB9OworICAgIGF1dG8mIGZyYW1lID0gKm1vdXNlRXZlbnQudGFyZ2V0KCkt PnRvTm9kZSgpLT5kb2N1bWVudCgpLmZyYW1lKCk7CiAKLSAgICBtX2Zyb250ZW5kUGFnZS0+Y29u dGV4dE1lbnVDb250cm9sbGVyKCkuc2hvd0NvbnRleHRNZW51QXQoKmZyYW1lLCBtb3VzZVBvaW50 KTsKKyAgICBtX2Zyb250ZW5kUGFnZS0+Y29udGV4dE1lbnVDb250cm9sbGVyKCkuc2hvd0NvbnRl eHRNZW51QXQoZnJhbWUsIG1vdXNlUG9pbnQpOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0oZXZl bnQpOwogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJv bnRlbmRIb3N0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3RvckZyb250ZW5kSG9zdC5oCShyZXZpc2lvbiAyMTk3MzEpCisrKyBTb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmgJKHdvcmtpbmcgY29weSkKQEAgLTkyLDEw ICs5MiwxMCBAQCBwdWJsaWM6CiAgICAgICAgIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gY2hlY2tlZDsK ICAgICAgICAgc3RkOjpvcHRpb25hbDxWZWN0b3I8Q29udGV4dE1lbnVJdGVtPj4gc3ViSXRlbXM7 CiAgICAgfTsKLSAgICB2b2lkIHNob3dDb250ZXh0TWVudShFdmVudCosIFZlY3RvcjxDb250ZXh0 TWVudUl0ZW0+JiYpOworICAgIHZvaWQgc2hvd0NvbnRleHRNZW51KEV2ZW50JiwgVmVjdG9yPENv bnRleHRNZW51SXRlbT4mJik7CiAKICAgICB2b2lkIHNlbmRNZXNzYWdlVG9CYWNrZW5kKGNvbnN0 IFN0cmluZyYgbWVzc2FnZSk7Ci0gICAgdm9pZCBkaXNwYXRjaEV2ZW50QXNDb250ZXh0TWVudUV2 ZW50KEV2ZW50Kik7CisgICAgdm9pZCBkaXNwYXRjaEV2ZW50QXNDb250ZXh0TWVudUV2ZW50KEV2 ZW50Jik7CiAKICAgICBib29sIGlzVW5kZXJUZXN0KCk7CiAgICAgdm9pZCB1bmJ1ZmZlcmVkTG9n KGNvbnN0IFN0cmluZyYgbWVzc2FnZSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRnJvbnRlbmRIb3N0LmlkbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmlkbAkocmV2aXNpb24gMjE5NzMxKQorKysg U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5pZGwJKHdvcmtp bmcgY29weSkKQEAgLTY4LDggKzY4LDggQEAKICAgICBET01TdHJpbmcgcGxhdGZvcm0oKTsKICAg ICBET01TdHJpbmcgcG9ydCgpOwogCi0gICAgdm9pZCBzaG93Q29udGV4dE1lbnUoRXZlbnQ/IGV2 ZW50LCBzZXF1ZW5jZTxDb250ZXh0TWVudUl0ZW0+IGl0ZW1zKTsKLSAgICB2b2lkIGRpc3BhdGNo RXZlbnRBc0NvbnRleHRNZW51RXZlbnQoRXZlbnQ/IGV2ZW50KTsKKyAgICB2b2lkIHNob3dDb250 ZXh0TWVudShFdmVudCBldmVudCwgc2VxdWVuY2U8Q29udGV4dE1lbnVJdGVtPiBpdGVtcyk7Cisg ICAgdm9pZCBkaXNwYXRjaEV2ZW50QXNDb250ZXh0TWVudUV2ZW50KEV2ZW50IGV2ZW50KTsKICAg ICB2b2lkIHNlbmRNZXNzYWdlVG9CYWNrZW5kKERPTVN0cmluZyBtZXNzYWdlKTsKICAgICB2b2lk IHVuYnVmZmVyZWRMb2coRE9NU3RyaW5nIG1lc3NhZ2UpOwogCg==