149089 2015-09-11 22:00:01 -0700 Web Inspector: Extract InspectorFrontendAPI dispatching from WebInspectorUI 2015-09-12 12:02:33 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 joepeck joepeck bburg commit-queue graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1125347 0 joepeck 2015-09-11 22:00:01 -0700 * SUMMARY Extract InspectorFrontendAPI dispatching from WebInspectorUI. This makes it more readable and able to share. 1125348 1 261044 joepeck 2015-09-11 22:00:43 -0700 Created attachment 261044 [PATCH] Proposed Fix 1125349 2 commit-queue 2015-09-11 22:02:07 -0700 Attachment 261044 did not pass style-queue: ERROR: Source/WebKit2/WebProcess/WebPage/WebInspectorFrontendAPIDispatcher.h:38: The parameter name "page" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1125393 3 261044 bburg 2015-09-12 11:13:56 -0700 Comment on attachment 261044 [PATCH] Proposed Fix r=me, nice! 1125401 4 261044 commit-queue 2015-09-12 12:02:29 -0700 Comment on attachment 261044 [PATCH] Proposed Fix Clearing flags on attachment: 261044 Committed r189657: <http://trac.webkit.org/changeset/189657> 1125402 5 commit-queue 2015-09-12 12:02:33 -0700 All reviewed patches have been landed. Closing bug. 261044 2015-09-11 22:00:43 -0700 2015-09-12 12:02:29 -0700 [PATCH] Proposed Fix frontend-api-dispatcher.patch text/plain 21395 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NNYWtlTGlzdHMudHh0IGIvU291cmNlL1dlYktp dDIvQ01ha2VMaXN0cy50eHQKaW5kZXggOGEyNTJmMy4uOGFlYTQwNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvQ01ha2VMaXN0cy50eHQKKysrIGIvU291cmNlL1dlYktpdDIvQ01ha2VMaXN0 cy50eHQKQEAgLTYyMCw2ICs2MjAsNyBAQCBzZXQoV2ViS2l0Ml9TT1VSQ0VTCiAgICAgV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYkRvY3VtZW50TG9hZGVyLmNwcAogICAgIFdlYlByb2Nlc3MvV2ViUGFn ZS9XZWJGcmFtZS5jcHAKICAgICBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVjdG9yLmNwcAor ICAgIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJJbnNwZWN0b3JGcm9udGVuZEFQSURpc3BhdGNoZXIu Y3BwCiAgICAgV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkluc3BlY3RvclVJLmNwcAogICAgIFdlYlBy b2Nlc3MvV2ViUGFnZS9XZWJPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lci5jcHAKICAgICBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBjMWI2NDAyLi4zZjZiM2FjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCkBAIC0xLDUgKzEsNDIgQEAKIDIwMTUtMDktMTEgIEpvc2VwaCBQZWNvcmFybyAg PHBlY29yYXJvQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBFeHRyYWN0IElu c3BlY3RvckZyb250ZW5kQVBJIGRpc3BhdGNoaW5nIGZyb20gV2ViSW5zcGVjdG9yVUkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTA4OQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQ01ha2VMaXN0cy50 eHQ6CisgICAgICAgICogV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAg ICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJJbnNwZWN0b3JGcm9udGVuZEFQSURpc3BhdGNoZXIu Y3BwOiBBZGRlZC4KKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yRnJvbnRlbmRBUElEaXNw YXRjaGVyOjpXZWJJbnNwZWN0b3JGcm9udGVuZEFQSURpc3BhdGNoZXIpOgorICAgICAgICAoV2Vi S2l0OjpXZWJJbnNwZWN0b3JGcm9udGVuZEFQSURpc3BhdGNoZXI6OnJlc2V0KToKKyAgICAgICAg KFdlYktpdDo6V2ViSW5zcGVjdG9yRnJvbnRlbmRBUElEaXNwYXRjaGVyOjpmcm9udGVuZExvYWRl ZCk6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvckZyb250ZW5kQVBJRGlzcGF0Y2hlcjo6 ZGlzcGF0Y2hDb21tYW5kKToKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yRnJvbnRlbmRB UElEaXNwYXRjaGVyOjpkaXNwYXRjaE1lc3NhZ2VBc3luYyk6CisgICAgICAgIChXZWJLaXQ6Oldl Ykluc3BlY3RvckZyb250ZW5kQVBJRGlzcGF0Y2hlcjo6ZXZhbHVhdGVFeHByZXNzaW9uT25Mb2Fk KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVjdG9yRnJvbnRlbmRBUElE aXNwYXRjaGVyLmg6IEFkZGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJJbnNw ZWN0b3JVSS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclVJOjpXZWJJbnNwZWN0 b3JVSSk6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclVJOjplc3RhYmxpc2hDb25uZWN0 aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yVUk6OmZyb250ZW5kTG9hZGVkKToK KyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yVUk6OnNldERvY2tTaWRlKToKKyAgICAgICAg KFdlYktpdDo6V2ViSW5zcGVjdG9yVUk6OnNldERvY2tpbmdVbmF2YWlsYWJsZSk6CisgICAgICAg IChXZWJLaXQ6OldlYkluc3BlY3RvclVJOjpzaG93Q29uc29sZSk6CisgICAgICAgIChXZWJLaXQ6 OldlYkluc3BlY3RvclVJOjpzaG93UmVzb3VyY2VzKToKKyAgICAgICAgKFdlYktpdDo6V2ViSW5z cGVjdG9yVUk6OnNob3dNYWluUmVzb3VyY2VGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6Oldl Ykluc3BlY3RvclVJOjpzdGFydFBhZ2VQcm9maWxpbmcpOgorICAgICAgICAoV2ViS2l0OjpXZWJJ bnNwZWN0b3JVSTo6c3RvcFBhZ2VQcm9maWxpbmcpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNw ZWN0b3JVSTo6ZGlkU2F2ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclVJOjpkaWRB cHBlbmQpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JVSTo6c2VuZE1lc3NhZ2VUb0Zy b250ZW5kKToKKyAgICAgICAgKFdlYktpdDo6V2ViSW5zcGVjdG9yVUk6OmV2YWx1YXRlQ29tbWFu ZE9uTG9hZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclVJOjpldmFs dWF0ZUV4cHJlc3Npb25PbkxvYWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNw ZWN0b3JVSTo6ZXZhbHVhdGVQZW5kaW5nRXhwcmVzc2lvbnMpOiBEZWxldGVkLgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJJbnNwZWN0b3JVSS5oOgorICAgICAgICAoV2ViS2l0OjpX ZWJJbnNwZWN0b3JVSTo6ZXZhbHVhdGVDb21tYW5kT25Mb2FkKTogRGVsZXRlZC4KKworMjAxNS0w OS0xMSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IE1vdmUgQWxyZWFkeSBHZW5lcmljIEluc3BlY3RvciBQYWdlIENvbnRleHQg TWVudSB0byBHZW5lcmljIFNldHVwCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDkwODgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViS2l0 Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29k ZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IGEwODFiNmQuLjA4MmZiNDcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTEyMTgs NiArMTIxOCw4IEBACiAJCUExREY2MzEzMThFMEI3QzgwMDNBM0UyQSAvKiBEb3dubG9hZENsaWVu dC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQTFERjYz MTExOEUwQjdDODAwM0EzRTJBIC8qIERvd25sb2FkQ2xpZW50LmggKi87IH07CiAJCUE1NDI5M0E0 MTk1QTQzREEwMDI3ODJDNyAvKiBXS0luc3BlY3Rvck5vZGVTZWFyY2hHZXN0dXJlUmVjb2duaXpl ci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQTU0Mjkz QTIxOTVBNDNDNjAwMjc4MkM3IC8qIFdLSW5zcGVjdG9yTm9kZVNlYXJjaEdlc3R1cmVSZWNvZ25p emVyLmggKi87IH07CiAJCUE1NDI5M0E1MTk1QTQzREQwMDI3ODJDNyAvKiBXS0luc3BlY3Rvck5v ZGVTZWFyY2hHZXN0dXJlUmVjb2duaXplci5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IEE1NDI5M0EzMTk1QTQzQzYwMDI3ODJDNyAvKiBXS0luc3BlY3Rv ck5vZGVTZWFyY2hHZXN0dXJlUmVjb2duaXplci5tbSAqLzsgfTsKKwkJQTU1QkE4MzUxQkEzRTcw QTAwN0NEMzNEIC8qIFdlYkluc3BlY3RvckZyb250ZW5kQVBJRGlzcGF0Y2hlci5oIGluIEhlYWRl cnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQTU1QkE4MzMxQkEzRTZGQTAw N0NEMzNEIC8qIFdlYkluc3BlY3RvckZyb250ZW5kQVBJRGlzcGF0Y2hlci5oICovOyB9OworCQlB NTVCQTgzNjFCQTNFNzBEMDA3Q0QzM0QgLyogV2ViSW5zcGVjdG9yRnJvbnRlbmRBUElEaXNwYXRj aGVyLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE1 NUJBODMyMUJBM0U2RkEwMDdDRDMzRCAvKiBXZWJJbnNwZWN0b3JGcm9udGVuZEFQSURpc3BhdGNo ZXIuY3BwICovOyB9OwogCQlBNThCNkYwODE4RkNBNzMzMDA4Q0JBNTMgLyogV0tGaWxlVXBsb2Fk UGFuZWwuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE1 OEI2RjA2MThGQ0E3MzMwMDhDQkE1MyAvKiBXS0ZpbGVVcGxvYWRQYW5lbC5oICovOyB9OwogCQlB NThCNkYwOTE4RkNBNzMzMDA4Q0JBNTMgLyogV0tGaWxlVXBsb2FkUGFuZWwubW0gaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBNThCNkYwNzE4RkNBNzMzMDA4 Q0JBNTMgLyogV0tGaWxlVXBsb2FkUGFuZWwubW0gKi87IH07CiAJCUE1RUZEMzhDMTZCMEU4OEMw MEIyRjBFOCAvKiBXS1BhZ2VWaXNpYmlsaXR5VHlwZXMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE1RUZEMzhCMTZCMEU4OEMwMEIyRjBFOCAvKiBXS1Bh Z2VWaXNpYmlsaXR5VHlwZXMuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRl LCApOyB9OyB9OwpAQCAtMzQxNyw2ICszNDE5LDggQEAKIAkJQTFFREQyREQxODg0QjlFMzAwQkJG RTk4IC8qIFdlYlByb2Nlc3NTaGltLnhjY29uZmlnICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC54Y2NvbmZpZzsgcGF0aCA9IFdlYlByb2Nlc3NT aGltLnhjY29uZmlnOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlBNTQyOTNBMjE5NUE0 M0M2MDAyNzgyQzcgLyogV0tJbnNwZWN0b3JOb2RlU2VhcmNoR2VzdHVyZVJlY29nbml6ZXIuaCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuYy5oOyBuYW1lID0gV0tJbnNwZWN0b3JOb2RlU2VhcmNoR2VzdHVyZVJlY29nbml6ZXIuaDsg cGF0aCA9IGlvcy9XS0luc3BlY3Rvck5vZGVTZWFyY2hHZXN0dXJlUmVjb2duaXplci5oOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQlBNTQyOTNBMzE5NUE0M0M2MDAyNzgyQzcgLyogV0tJ bnNwZWN0b3JOb2RlU2VhcmNoR2VzdHVyZVJlY29nbml6ZXIubW0gKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IG5h bWUgPSBXS0luc3BlY3Rvck5vZGVTZWFyY2hHZXN0dXJlUmVjb2duaXplci5tbTsgcGF0aCA9IGlv cy9XS0luc3BlY3Rvck5vZGVTZWFyY2hHZXN0dXJlUmVjb2duaXplci5tbTsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKKwkJQTU1QkE4MzIxQkEzRTZGQTAwN0NEMzNEIC8qIFdlYkluc3BlY3Rv ckZyb250ZW5kQVBJRGlzcGF0Y2hlci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7 IHBhdGggPSBXZWJJbnNwZWN0b3JGcm9udGVuZEFQSURpc3BhdGNoZXIuY3BwOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OworCQlBNTVCQTgzMzFCQTNFNkZBMDA3Q0QzM0QgLyogV2ViSW5zcGVj dG9yRnJvbnRlbmRBUElEaXNwYXRjaGVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0 aCA9IFdlYkluc3BlY3RvckZyb250ZW5kQVBJRGlzcGF0Y2hlci5oOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQlBNThCNkYwNjE4RkNBNzMzMDA4Q0JBNTMgLyogV0tGaWxlVXBsb2FkUGFu ZWwuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0 S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBuYW1lID0gV0tGaWxlVXBsb2FkUGFuZWwu aDsgcGF0aCA9IGlvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5oOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQlBNThCNkYwNzE4RkNBNzMzMDA4Q0JBNTMgLyogV0tGaWxlVXBsb2FkUGFu ZWwubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFz dEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IG5hbWUgPSBXS0ZpbGVVcGxv YWRQYW5lbC5tbTsgcGF0aCA9IGlvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5tbTsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJQTVFRkQzOEIxNkIwRTg4QzAwQjJGMEU4IC8qIFdLUGFn ZVZpc2liaWxpdHlUeXBlcy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXS1Bh Z2VWaXNpYmlsaXR5VHlwZXMuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKQEAgLTYwMzMs NiArNjAzNyw4IEBACiAJCQkJMUM4RTI4MUYxMjc1RDE1NDAwQkM3QkQwIC8qIFdlYkluc3BlY3Rv ci5jcHAgKi8sCiAJCQkJMUM4RTI4MUUxMjc1RDE1NDAwQkM3QkQwIC8qIFdlYkluc3BlY3Rvci5o ICovLAogCQkJCTFDOEUyQTFDMTI3NzgzM0YwMEJDN0JEMCAvKiBXZWJJbnNwZWN0b3IubWVzc2Fn ZXMuaW4gKi8sCisJCQkJQTU1QkE4MzIxQkEzRTZGQTAwN0NEMzNEIC8qIFdlYkluc3BlY3RvckZy b250ZW5kQVBJRGlzcGF0Y2hlci5jcHAgKi8sCisJCQkJQTU1QkE4MzMxQkEzRTZGQTAwN0NEMzNE IC8qIFdlYkluc3BlY3RvckZyb250ZW5kQVBJRGlzcGF0Y2hlci5oICovLAogCQkJCTFDODkxRDYy MTlCMTI0RkYwMEJBNzlERCAvKiBXZWJJbnNwZWN0b3JVSS5jcHAgKi8sCiAJCQkJMUM4OTFENjMx OUIxMjRGRjAwQkE3OUREIC8qIFdlYkluc3BlY3RvclVJLmggKi8sCiAJCQkJMUM4OTFENjQxOUIx MjRGRjAwQkE3OUREIC8qIFdlYkluc3BlY3RvclVJLm1lc3NhZ2VzLmluICovLApAQCAtNzkzMyw2 ICs3OTM5LDcgQEAKIAkJCQkxQTNERDIwMjEyNUU1QTFGMDA0NTE1RTYgLyogV2ViRmluZENsaWVu dC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMUE5MEMxRUUxMjY0RkQ1MDAwM0U0NEQ0IC8qIFdlYkZp bmRPcHRpb25zLmggaW4gSGVhZGVycyAqLywKIAkJCQlCQ0U0Njk1NDEyMTRFNkNCMDAwQjk4RUIg LyogV2ViRm9ybUNsaWVudC5oIGluIEhlYWRlcnMgKi8sCisJCQkJQTU1QkE4MzUxQkEzRTcwQTAw N0NEMzNEIC8qIFdlYkluc3BlY3RvckZyb250ZW5kQVBJRGlzcGF0Y2hlci5oIGluIEhlYWRlcnMg Ki8sCiAJCQkJQkNFNDY5NTYxMjE0RTZDQjAwMEI5OEVCIC8qIFdlYkZvcm1TdWJtaXNzaW9uTGlz dGVuZXJQcm94eS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQkMwMzJEOEQxMEY0MzdBMDAwNThDMTVB IC8qIFdlYkZyYW1lLmggaW4gSGVhZGVycyAqLywKIAkJCQlCQ0U0Njk3NzEyMTRGMjdCMDAwQjk4 RUIgLyogV2ViRnJhbWVMaXN0ZW5lclByb3h5LmggaW4gSGVhZGVycyAqLywKQEAgLTk1NDYsNiAr OTU1Myw3IEBACiAJCQkJNTE3OTU1NkQxNjI4NzdCMTAwRkE0M0I2IC8qIE5ldHdvcmtQcm9jZXNz UHJveHkuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJNTE2MzE5OTIxNjI4OTgwQTAwRTIyRjAwIC8q IE5ldHdvcmtQcm9jZXNzUHJveHlNYWMubW0gaW4gU291cmNlcyAqLywKIAkJCQk1MTNBMTYzQzE2 MzA4OEY2MDA1RDdEMjIgLyogTmV0d29ya1Byb2Nlc3NQcm94eU1lc3NhZ2VSZWNlaXZlci5jcHAg aW4gU291cmNlcyAqLywKKwkJCQlBNTVCQTgzNjFCQTNFNzBEMDA3Q0QzM0QgLyogV2ViSW5zcGVj dG9yRnJvbnRlbmRBUElEaXNwYXRjaGVyLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTUxRkQxOEI1 MTY1MUZCQUQwMERCRTFDRSAvKiBOZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwIGluIFNvdXJjZXMg Ki8sCiAJCQkJNTFFM0I2N0YxNkYyNjZCMzAwOTk2OERDIC8qIE5ldHdvcmtSZXNvdXJjZUxvYWRl ck1hYy5tbSBpbiBTb3VyY2VzICovLAogCQkJCUUxNTI1NTFBMTcwMTE4MTkwMDNEN0FEQiAvKiBO ZXR3b3JrUmVzb3VyY2VMb2FkZXJNZXNzYWdlUmVjZWl2ZXIuY3BwIGluIFNvdXJjZXMgKi8sCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVjdG9y RnJvbnRlbmRBUElEaXNwYXRjaGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJJbnNwZWN0b3JGcm9udGVuZEFQSURpc3BhdGNoZXIuY3BwCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAuLjkzMmMxYWMKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVjdG9yRnJvbnRlbmRBUElEaXNwYXRj aGVyLmNwcApAQCAtMCwwICsxLDkwIEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE0LCAyMDE1 IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBh bmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1v ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u ZGl0aW9ucworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29k ZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRp c3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHly aWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIg bWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNP RlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBB UyBJUycnCisgKiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJ TkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVS Q0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJF IERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJV VE9SUworICogQkUgTElBQkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwg U1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJ TkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09P RFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVT UworICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBM SUFCSUxJVFksIFdIRVRIRVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBU T1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFO WSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9G CisgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgImNv bmZpZy5oIgorI2luY2x1ZGUgIldlYkluc3BlY3RvckZyb250ZW5kQVBJRGlzcGF0Y2hlci5oIgor CisjaW5jbHVkZSAiV2ViUGFnZS5oIgorI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL1NjcmlwdFZh bHVlLmg+CisjaW5jbHVkZSA8V2ViQ29yZS9NYWluRnJhbWUuaD4KKyNpbmNsdWRlIDxXZWJDb3Jl L1NjcmlwdENvbnRyb2xsZXIuaD4KKyNpbmNsdWRlIDxXZWJDb3JlL1NjcmlwdFN0YXRlLmg+CisK K25hbWVzcGFjZSBXZWJLaXQgeworCitXZWJJbnNwZWN0b3JGcm9udGVuZEFQSURpc3BhdGNoZXI6 OldlYkluc3BlY3RvckZyb250ZW5kQVBJRGlzcGF0Y2hlcihXZWJQYWdlJiBwYWdlKQorICAgIDog bV9wYWdlKHBhZ2UpCit7Cit9CisKK3ZvaWQgV2ViSW5zcGVjdG9yRnJvbnRlbmRBUElEaXNwYXRj aGVyOjpyZXNldCgpCit7CisgICAgbV9mcm9udGVuZExvYWRlZCA9IGZhbHNlOworCisgICAgbV9x dWV1ZS5jbGVhcigpOworfQorCit2b2lkIFdlYkluc3BlY3RvckZyb250ZW5kQVBJRGlzcGF0Y2hl cjo6ZnJvbnRlbmRMb2FkZWQoKQoreworICAgIG1fZnJvbnRlbmRMb2FkZWQgPSB0cnVlOworCisg ICAgZm9yIChjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24gOiBtX3F1ZXVlKQorICAgICAgICBtX3Bh Z2UuY29yZVBhZ2UoKS0+bWFpbkZyYW1lKCkuc2NyaXB0KCkuZXhlY3V0ZVNjcmlwdChleHByZXNz aW9uKTsKKworICAgIG1fcXVldWUuY2xlYXIoKTsKK30KKwordm9pZCBXZWJJbnNwZWN0b3JGcm9u dGVuZEFQSURpc3BhdGNoZXI6OmRpc3BhdGNoQ29tbWFuZChjb25zdCBTdHJpbmcmIGNvbW1hbmQp Cit7CisgICAgZXZhbHVhdGVFeHByZXNzaW9uT25Mb2FkKG1ha2VTdHJpbmcoIkluc3BlY3RvckZy b250ZW5kQVBJLmRpc3BhdGNoKFtcIiIsIGNvbW1hbmQsICJcIl0pIikpOworfQorCit2b2lkIFdl Ykluc3BlY3RvckZyb250ZW5kQVBJRGlzcGF0Y2hlcjo6ZGlzcGF0Y2hDb21tYW5kKGNvbnN0IFN0 cmluZyYgY29tbWFuZCwgY29uc3QgU3RyaW5nJiBhcmd1bWVudCkKK3sKKyAgICBldmFsdWF0ZUV4 cHJlc3Npb25PbkxvYWQobWFrZVN0cmluZygiSW5zcGVjdG9yRnJvbnRlbmRBUEkuZGlzcGF0Y2go W1wiIiwgY29tbWFuZCwgIlwiLCBcIiIsIGFyZ3VtZW50LCAiXCJdKSIpKTsKK30KKwordm9pZCBX ZWJJbnNwZWN0b3JGcm9udGVuZEFQSURpc3BhdGNoZXI6OmRpc3BhdGNoQ29tbWFuZChjb25zdCBT dHJpbmcmIGNvbW1hbmQsIGJvb2wgYXJndW1lbnQpCit7CisgICAgZXZhbHVhdGVFeHByZXNzaW9u T25Mb2FkKG1ha2VTdHJpbmcoIkluc3BlY3RvckZyb250ZW5kQVBJLmRpc3BhdGNoKFtcIiIsIGNv bW1hbmQsICJcIiwgIiwgYXJndW1lbnQgPyAidHJ1ZSIgOiAiZmFsc2UiLCAiXSkiKSk7Cit9CisK K3ZvaWQgV2ViSW5zcGVjdG9yRnJvbnRlbmRBUElEaXNwYXRjaGVyOjpkaXNwYXRjaE1lc3NhZ2VB c3luYyhjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCit7CisgICAgZXZhbHVhdGVFeHByZXNzaW9uT25M b2FkKG1ha2VTdHJpbmcoIkluc3BlY3RvckZyb250ZW5kQVBJLmRpc3BhdGNoTWVzc2FnZUFzeW5j KCIsIG1lc3NhZ2UsICIpIikpOworfQorCit2b2lkIFdlYkluc3BlY3RvckZyb250ZW5kQVBJRGlz cGF0Y2hlcjo6ZXZhbHVhdGVFeHByZXNzaW9uT25Mb2FkKGNvbnN0IFN0cmluZyYgZXhwcmVzc2lv bikKK3sKKyAgICBpZiAobV9mcm9udGVuZExvYWRlZCkgeworICAgICAgICBBU1NFUlQobV9xdWV1 ZS5pc0VtcHR5KCkpOworICAgICAgICBtX3BhZ2UuY29yZVBhZ2UoKS0+bWFpbkZyYW1lKCkuc2Ny aXB0KCkuZXhlY3V0ZVNjcmlwdChleHByZXNzaW9uKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KworICAgIG1fcXVldWUuYXBwZW5kKGV4cHJlc3Npb24pOworfQorCit9IC8vIG5hbWVzcGFjZSBX ZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJJ bnNwZWN0b3JGcm9udGVuZEFQSURpc3BhdGNoZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJJbnNwZWN0b3JGcm9udGVuZEFQSURpc3BhdGNoZXIuaApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi45N2I3M2QxCi0tLSAvZGV2L251bGwKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkluc3BlY3RvckZyb250ZW5kQVBJRGlz cGF0Y2hlci5oCkBAIC0wLDAgKzEsNTggQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTQsIDIw MTUgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9u IGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICog bW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBj b25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBj b2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJl ZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29w eXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9s bG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhl ciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMg U09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBg YEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBN RVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBB UkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJ QlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFM LCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xV RElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBH T09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lO RVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9G IExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9S IFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4g QU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQg T0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVmIFdl Ykluc3BlY3RvckZyb250ZW5kQVBJRGlzcGF0Y2hlcl9oCisjZGVmaW5lIFdlYkluc3BlY3RvckZy b250ZW5kQVBJRGlzcGF0Y2hlcl9oCisKKyNpbmNsdWRlIDx3dGYvRGVxdWUuaD4KKyNpbmNsdWRl IDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KKworbmFtZXNwYWNlIFdlYktpdCB7CisKK2NsYXNzIFdl YlBhZ2U7CisKK2NsYXNzIFdlYkluc3BlY3RvckZyb250ZW5kQVBJRGlzcGF0Y2hlciB7CitwdWJs aWM6CisgICAgV2ViSW5zcGVjdG9yRnJvbnRlbmRBUElEaXNwYXRjaGVyKFdlYlBhZ2UmIHBhZ2Up OworCisgICAgdm9pZCByZXNldCgpOworICAgIHZvaWQgZnJvbnRlbmRMb2FkZWQoKTsKKworICAg IHZvaWQgZGlzcGF0Y2hDb21tYW5kKGNvbnN0IFN0cmluZyYgY29tbWFuZCk7CisgICAgdm9pZCBk aXNwYXRjaENvbW1hbmQoY29uc3QgU3RyaW5nJiBjb21tYW5kLCBjb25zdCBTdHJpbmcmIGFyZ3Vt ZW50KTsKKyAgICB2b2lkIGRpc3BhdGNoQ29tbWFuZChjb25zdCBTdHJpbmcmIGNvbW1hbmQsIGJv b2wgYXJndW1lbnQpOworICAgIHZvaWQgZGlzcGF0Y2hNZXNzYWdlQXN5bmMoY29uc3QgU3RyaW5n JiBtZXNzYWdlKTsKKworcHJpdmF0ZToKKyAgICB2b2lkIGV2YWx1YXRlRXhwcmVzc2lvbk9uTG9h ZChjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24pOworCisgICAgV2ViUGFnZSYgbV9wYWdlOworICAg IERlcXVlPFN0cmluZz4gbV9xdWV1ZTsKKyAgICBib29sIG1fZnJvbnRlbmRMb2FkZWQgeyBmYWxz ZSB9OworfTsKKworfSAvLyBuYW1lc3BhY2UgV2ViS2l0CisKKyNlbmRpZiAvLyBXZWJJbnNwZWN0 b3JGcm9udGVuZEFQSURpc3BhdGNoZXJfaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYkluc3BlY3RvclVJLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJJbnNwZWN0b3JVSS5jcHAKaW5kZXggY2FjNzcxYi4uYTYxNmJiNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkluc3BlY3Rv clVJLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVj dG9yVUkuY3BwCkBAIC0zMCwxMyArMzAsMTAgQEAKICNpbmNsdWRlICJXZWJJbnNwZWN0b3JQcm94 eU1lc3NhZ2VzLmgiCiAjaW5jbHVkZSAiV2ViUGFnZS5oIgogI2luY2x1ZGUgIldlYlByb2Nlc3Mu aCIKLSNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9TY3JpcHRWYWx1ZS5oPgogI2luY2x1ZGUgPFdl YkNvcmUvQ2hyb21lLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9ET01XcmFwcGVyV29ybGQuaD4KICNp bmNsdWRlIDxXZWJDb3JlL0luc3BlY3RvckNvbnRyb2xsZXIuaD4KLSNpbmNsdWRlIDxXZWJDb3Jl L01haW5GcmFtZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvTm90SW1wbGVtZW50ZWQuaD4KLSNpbmNs dWRlIDxXZWJDb3JlL1NjcmlwdENvbnRyb2xsZXIuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1Njcmlw dEdsb2JhbE9iamVjdC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvU2NyaXB0U3RhdGUuaD4KIApAQCAt NTEsMTMgKzQ4LDcgQEAgUmVmPFdlYkluc3BlY3RvclVJPiBXZWJJbnNwZWN0b3JVSTo6Y3JlYXRl KFdlYlBhZ2UmIHBhZ2UpCiAKIFdlYkluc3BlY3RvclVJOjpXZWJJbnNwZWN0b3JVSShXZWJQYWdl JiBwYWdlKQogICAgIDogbV9wYWdlKHBhZ2UpCi0gICAgLCBtX2luc3BlY3RlZFBhZ2VJZGVudGlm aWVyKDApCi0gICAgLCBtX3VuZGVyVGVzdChmYWxzZSkKLSAgICAsIG1fZnJvbnRlbmRMb2FkZWQo ZmFsc2UpCi0gICAgLCBtX2RvY2tTaWRlKERvY2tTaWRlOjpVbmRvY2tlZCkKLSNpZiBQTEFURk9S TShDT0NPQSkKLSAgICAsIG1faGFzTG9jYWxpemVkU3RyaW5nc1VSTChmYWxzZSkKLSNlbmRpZgor ICAgICwgbV9mcm9udGVuZEFQSURpc3BhdGNoZXIocGFnZSkKIHsKIH0KIApAQCAtNzYsNyArNjcs NyBAQCB2b2lkIFdlYkluc3BlY3RvclVJOjplc3RhYmxpc2hDb25uZWN0aW9uKElQQzo6QXR0YWNo bWVudCBlbmNvZGVkQ29ubmVjdGlvbklkZW50aQogICAgICAgICByZXR1cm47CiAKICAgICBtX2lu c3BlY3RlZFBhZ2VJZGVudGlmaWVyID0gaW5zcGVjdGVkUGFnZUlkZW50aWZpZXI7Ci0gICAgbV9m cm9udGVuZExvYWRlZCA9IGZhbHNlOworICAgIG1fZnJvbnRlbmRBUElEaXNwYXRjaGVyLnJlc2V0 KCk7CiAgICAgbV91bmRlclRlc3QgPSB1bmRlclRlc3Q7CiAKICAgICBtX3BhZ2UuY29yZVBhZ2Uo KS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLnNldEluc3BlY3RvckZyb250ZW5kQ2xpZW50KHRoaXMp OwpAQCAtOTYsOSArODcsOCBAQCB2b2lkIFdlYkluc3BlY3RvclVJOjp3aW5kb3dPYmplY3RDbGVh cmVkKCkKIAogdm9pZCBXZWJJbnNwZWN0b3JVSTo6ZnJvbnRlbmRMb2FkZWQoKQogewotICAgIG1f ZnJvbnRlbmRMb2FkZWQgPSB0cnVlOworICAgIG1fZnJvbnRlbmRBUElEaXNwYXRjaGVyLmZyb250 ZW5kTG9hZGVkKCk7CiAKLSAgICBldmFsdWF0ZVBlbmRpbmdFeHByZXNzaW9ucygpOwogICAgIGJy aW5nVG9Gcm9udCgpOwogfQogCkBAIC0xNjcsMTIgKzE1NywxMiBAQCB2b2lkIFdlYkluc3BlY3Rv clVJOjpzZXREb2NrU2lkZShEb2NrU2lkZSBzaWRlKQogCiAgICAgbV9kb2NrU2lkZSA9IHNpZGU7 CiAKLSAgICBldmFsdWF0ZUNvbW1hbmRPbkxvYWQoQVNDSUlMaXRlcmFsKCJzZXREb2NrU2lkZSIp LCBBU0NJSUxpdGVyYWwoc2lkZVN0cmluZykpOworICAgIG1fZnJvbnRlbmRBUElEaXNwYXRjaGVy LmRpc3BhdGNoQ29tbWFuZChBU0NJSUxpdGVyYWwoInNldERvY2tTaWRlIiksIFN0cmluZyhBU0NJ SUxpdGVyYWwoc2lkZVN0cmluZykpKTsKIH0KIAogdm9pZCBXZWJJbnNwZWN0b3JVSTo6c2V0RG9j a2luZ1VuYXZhaWxhYmxlKGJvb2wgdW5hdmFpbGFibGUpCiB7Ci0gICAgZXZhbHVhdGVDb21tYW5k T25Mb2FkKEFTQ0lJTGl0ZXJhbCgic2V0RG9ja2luZ1VuYXZhaWxhYmxlIiksIHVuYXZhaWxhYmxl KTsKKyAgICBtX2Zyb250ZW5kQVBJRGlzcGF0Y2hlci5kaXNwYXRjaENvbW1hbmQoQVNDSUlMaXRl cmFsKCJzZXREb2NraW5nVW5hdmFpbGFibGUiKSwgdW5hdmFpbGFibGUpOwogfQogCiB2b2lkIFdl Ykluc3BlY3RvclVJOjpjaGFuZ2VBdHRhY2hlZFdpbmRvd0hlaWdodCh1bnNpZ25lZCBoZWlnaHQp CkBAIC0yMTMsNDIgKzIwMyw0MiBAQCB2b2lkIFdlYkluc3BlY3RvclVJOjppbnNwZWN0ZWRVUkxD aGFuZ2VkKGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nKQogCiB2b2lkIFdlYkluc3BlY3RvclVJOjpz aG93Q29uc29sZSgpCiB7Ci0gICAgZXZhbHVhdGVDb21tYW5kT25Mb2FkKEFTQ0lJTGl0ZXJhbCgi c2hvd0NvbnNvbGUiKSk7CisgICAgbV9mcm9udGVuZEFQSURpc3BhdGNoZXIuZGlzcGF0Y2hDb21t YW5kKEFTQ0lJTGl0ZXJhbCgic2hvd0NvbnNvbGUiKSk7CiB9CiAKIHZvaWQgV2ViSW5zcGVjdG9y VUk6OnNob3dSZXNvdXJjZXMoKQogewotICAgIGV2YWx1YXRlQ29tbWFuZE9uTG9hZChBU0NJSUxp dGVyYWwoInNob3dSZXNvdXJjZXMiKSk7CisgICAgbV9mcm9udGVuZEFQSURpc3BhdGNoZXIuZGlz cGF0Y2hDb21tYW5kKEFTQ0lJTGl0ZXJhbCgic2hvd1Jlc291cmNlcyIpKTsKIH0KIAogdm9pZCBX ZWJJbnNwZWN0b3JVSTo6c2hvd01haW5SZXNvdXJjZUZvckZyYW1lKGNvbnN0IFN0cmluZyYgZnJh bWVJZGVudGlmaWVyKQogewotICAgIGV2YWx1YXRlQ29tbWFuZE9uTG9hZChBU0NJSUxpdGVyYWwo InNob3dNYWluUmVzb3VyY2VGb3JGcmFtZSIpLCBmcmFtZUlkZW50aWZpZXIpOworICAgIG1fZnJv bnRlbmRBUElEaXNwYXRjaGVyLmRpc3BhdGNoQ29tbWFuZChBU0NJSUxpdGVyYWwoInNob3dNYWlu UmVzb3VyY2VGb3JGcmFtZSIpLCBmcmFtZUlkZW50aWZpZXIpOwogfQogCiB2b2lkIFdlYkluc3Bl Y3RvclVJOjpzdGFydFBhZ2VQcm9maWxpbmcoKQogewotICAgIGV2YWx1YXRlQ29tbWFuZE9uTG9h ZChBU0NJSUxpdGVyYWwoInNldFRpbWVsaW5lUHJvZmlsaW5nRW5hYmxlZCIpLCB0cnVlKTsKKyAg ICBtX2Zyb250ZW5kQVBJRGlzcGF0Y2hlci5kaXNwYXRjaENvbW1hbmQoQVNDSUlMaXRlcmFsKCJz ZXRUaW1lbGluZVByb2ZpbGluZ0VuYWJsZWQiKSwgdHJ1ZSk7CiB9CiAKIHZvaWQgV2ViSW5zcGVj dG9yVUk6OnN0b3BQYWdlUHJvZmlsaW5nKCkKIHsKLSAgICBldmFsdWF0ZUNvbW1hbmRPbkxvYWQo QVNDSUlMaXRlcmFsKCJzZXRUaW1lbGluZVByb2ZpbGluZ0VuYWJsZWQiKSwgZmFsc2UpOworICAg IG1fZnJvbnRlbmRBUElEaXNwYXRjaGVyLmRpc3BhdGNoQ29tbWFuZChBU0NJSUxpdGVyYWwoInNl dFRpbWVsaW5lUHJvZmlsaW5nRW5hYmxlZCIpLCBmYWxzZSk7CiB9CiAKIHZvaWQgV2ViSW5zcGVj dG9yVUk6OmRpZFNhdmUoY29uc3QgU3RyaW5nJiB1cmwpCiB7Ci0gICAgZXZhbHVhdGVDb21tYW5k T25Mb2FkKEFTQ0lJTGl0ZXJhbCgic2F2ZWRVUkwiKSwgdXJsKTsKKyAgICBtX2Zyb250ZW5kQVBJ RGlzcGF0Y2hlci5kaXNwYXRjaENvbW1hbmQoQVNDSUlMaXRlcmFsKCJzYXZlZFVSTCIpLCB1cmwp OwogfQogCiB2b2lkIFdlYkluc3BlY3RvclVJOjpkaWRBcHBlbmQoY29uc3QgU3RyaW5nJiB1cmwp CiB7Ci0gICAgZXZhbHVhdGVDb21tYW5kT25Mb2FkKEFTQ0lJTGl0ZXJhbCgiYXBwZW5kZWRUb1VS TCIpLCB1cmwpOworICAgIG1fZnJvbnRlbmRBUElEaXNwYXRjaGVyLmRpc3BhdGNoQ29tbWFuZChB U0NJSUxpdGVyYWwoImFwcGVuZGVkVG9VUkwiKSwgdXJsKTsKIH0KIAogdm9pZCBXZWJJbnNwZWN0 b3JVSTo6c2VuZE1lc3NhZ2VUb0Zyb250ZW5kKGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKIHsKLSAg ICBldmFsdWF0ZUV4cHJlc3Npb25PbkxvYWQobWFrZVN0cmluZygiSW5zcGVjdG9yRnJvbnRlbmRB UEkuZGlzcGF0Y2hNZXNzYWdlQXN5bmMoIiwgbWVzc2FnZSwgIikiKSk7CisgICAgbV9mcm9udGVu ZEFQSURpc3BhdGNoZXIuZGlzcGF0Y2hNZXNzYWdlQXN5bmMobWVzc2FnZSk7CiB9CiAKIHZvaWQg V2ViSW5zcGVjdG9yVUk6OnNlbmRNZXNzYWdlVG9CYWNrZW5kKGNvbnN0IFN0cmluZyYgbWVzc2Fn ZSkKQEAgLTI1NywzOCArMjQ3LDQgQEAgdm9pZCBXZWJJbnNwZWN0b3JVSTo6c2VuZE1lc3NhZ2VU b0JhY2tlbmQoY29uc3QgU3RyaW5nJiBtZXNzYWdlKQogICAgICAgICBtX2JhY2tlbmRDb25uZWN0 aW9uLT5zZW5kKE1lc3NhZ2VzOjpXZWJJbnNwZWN0b3I6OlNlbmRNZXNzYWdlVG9CYWNrZW5kKG1l c3NhZ2UpLCAwKTsKIH0KIAotdm9pZCBXZWJJbnNwZWN0b3JVSTo6ZXZhbHVhdGVDb21tYW5kT25M b2FkKGNvbnN0IFN0cmluZyYgY29tbWFuZCwgY29uc3QgU3RyaW5nJiBhcmd1bWVudCkKLXsKLSAg ICBpZiAoYXJndW1lbnQuaXNOdWxsKCkpCi0gICAgICAgIGV2YWx1YXRlRXhwcmVzc2lvbk9uTG9h ZChtYWtlU3RyaW5nKCJJbnNwZWN0b3JGcm9udGVuZEFQSS5kaXNwYXRjaChbXCIiLCBjb21tYW5k LCAiXCJdKSIpKTsKLSAgICBlbHNlCi0gICAgICAgIGV2YWx1YXRlRXhwcmVzc2lvbk9uTG9hZCht YWtlU3RyaW5nKCJJbnNwZWN0b3JGcm9udGVuZEFQSS5kaXNwYXRjaChbXCIiLCBjb21tYW5kLCAi XCIsIFwiIiwgYXJndW1lbnQsICJcIl0pIikpOwotfQotCi12b2lkIFdlYkluc3BlY3RvclVJOjpl dmFsdWF0ZUNvbW1hbmRPbkxvYWQoY29uc3QgU3RyaW5nJiBjb21tYW5kLCBib29sIGFyZ3VtZW50 KQotewotICAgIGV2YWx1YXRlRXhwcmVzc2lvbk9uTG9hZChtYWtlU3RyaW5nKCJJbnNwZWN0b3JG cm9udGVuZEFQSS5kaXNwYXRjaChbXCIiLCBjb21tYW5kLCAiXCIsICIsIEFTQ0lJTGl0ZXJhbChh cmd1bWVudCA/ICJ0cnVlIiA6ICJmYWxzZSIpLCAiXSkiKSk7Ci19Ci0KLXZvaWQgV2ViSW5zcGVj dG9yVUk6OmV2YWx1YXRlRXhwcmVzc2lvbk9uTG9hZChjb25zdCBTdHJpbmcmIGV4cHJlc3Npb24p Ci17Ci0gICAgaWYgKG1fZnJvbnRlbmRMb2FkZWQpIHsKLSAgICAgICAgQVNTRVJUKG1fcXVldWUu aXNFbXB0eSgpKTsKLSAgICAgICAgbV9wYWdlLmNvcmVQYWdlKCktPm1haW5GcmFtZSgpLnNjcmlw dCgpLmV4ZWN1dGVTY3JpcHQoZXhwcmVzc2lvbik7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0K LSAgICBtX3F1ZXVlLmFwcGVuZChleHByZXNzaW9uKTsKLX0KLQotdm9pZCBXZWJJbnNwZWN0b3JV STo6ZXZhbHVhdGVQZW5kaW5nRXhwcmVzc2lvbnMoKQotewotICAgIEFTU0VSVChtX2Zyb250ZW5k TG9hZGVkKTsKLQotICAgIGZvciAoY29uc3QgU3RyaW5nJiBleHByZXNzaW9uIDogbV9xdWV1ZSkK LSAgICAgICAgbV9wYWdlLmNvcmVQYWdlKCktPm1haW5GcmFtZSgpLnNjcmlwdCgpLmV4ZWN1dGVT Y3JpcHQoZXhwcmVzc2lvbik7Ci0KLSAgICBtX3F1ZXVlLmNsZWFyKCk7Ci19Ci0KIH0gLy8gbmFt ZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYkluc3BlY3RvclVJLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViSW5zcGVjdG9yVUkuaAppbmRleCA3Mzk4NGI5Li43ZGI3YTUyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVjdG9yVUkuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViSW5zcGVjdG9yVUkuaApAQCAtMjYsOCAr MjYsOCBAQAogI2lmbmRlZiBXZWJJbnNwZWN0b3JVSV9oCiAjZGVmaW5lIFdlYkluc3BlY3RvclVJ X2gKIAotI2luY2x1ZGUgIkFQSU9iamVjdC5oIgogI2luY2x1ZGUgIkNvbm5lY3Rpb24uaCIKKyNp bmNsdWRlICJXZWJJbnNwZWN0b3JGcm9udGVuZEFQSURpc3BhdGNoZXIuaCIKICNpbmNsdWRlIDxX ZWJDb3JlL0luc3BlY3RvckZyb250ZW5kQ2xpZW50Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9JbnNw ZWN0b3JGcm9udGVuZEhvc3QuaD4KIApAQCAtMTA0LDI4ICsxMDQsMTggQEAgcHVibGljOgogcHJp dmF0ZToKICAgICBleHBsaWNpdCBXZWJJbnNwZWN0b3JVSShXZWJQYWdlJik7CiAKLSAgICB2b2lk IGV2YWx1YXRlQ29tbWFuZE9uTG9hZChjb25zdCBTdHJpbmcmIGNvbW1hbmQsIGNvbnN0IFN0cmlu ZyYgYXJndW1lbnQgPSBTdHJpbmcoKSk7Ci0gICAgdm9pZCBldmFsdWF0ZUNvbW1hbmRPbkxvYWQo Y29uc3QgU3RyaW5nJiBjb21tYW5kLCBjb25zdCBBU0NJSUxpdGVyYWwmIGFyZ3VtZW50KSB7IGV2 YWx1YXRlQ29tbWFuZE9uTG9hZChjb21tYW5kLCBTdHJpbmcoYXJndW1lbnQpKTsgfQotICAgIHZv aWQgZXZhbHVhdGVDb21tYW5kT25Mb2FkKGNvbnN0IFN0cmluZyYgY29tbWFuZCwgYm9vbCBhcmd1 bWVudCk7Ci0gICAgdm9pZCBldmFsdWF0ZUV4cHJlc3Npb25PbkxvYWQoY29uc3QgU3RyaW5nJiBl eHByZXNzaW9uKTsKLSAgICB2b2lkIGV2YWx1YXRlUGVuZGluZ0V4cHJlc3Npb25zKCk7Ci0KICAg ICBXZWJQYWdlJiBtX3BhZ2U7Ci0KLSAgICBSZWZQdHI8SVBDOjpDb25uZWN0aW9uPiBtX2JhY2tl bmRDb25uZWN0aW9uOwotICAgIHVpbnQ2NF90IG1faW5zcGVjdGVkUGFnZUlkZW50aWZpZXI7Ci0K LSAgICBib29sIG1fdW5kZXJUZXN0OwotICAgIGJvb2wgbV9mcm9udGVuZExvYWRlZDsKLSAgICBE ZXF1ZTxTdHJpbmc+IG1fcXVldWU7Ci0KKyAgICBXZWJJbnNwZWN0b3JGcm9udGVuZEFQSURpc3Bh dGNoZXIgbV9mcm9udGVuZEFQSURpc3BhdGNoZXI7CiAgICAgUmVmUHRyPFdlYkNvcmU6Okluc3Bl Y3RvckZyb250ZW5kSG9zdD4gbV9mcm9udGVuZEhvc3Q7CisgICAgUmVmUHRyPElQQzo6Q29ubmVj dGlvbj4gbV9iYWNrZW5kQ29ubmVjdGlvbjsKIAotICAgIERvY2tTaWRlIG1fZG9ja1NpZGU7Cisg ICAgdWludDY0X3QgbV9pbnNwZWN0ZWRQYWdlSWRlbnRpZmllciB7IDAgfTsKKyAgICBib29sIG1f dW5kZXJUZXN0IHsgZmFsc2UgfTsKKyAgICBEb2NrU2lkZSBtX2RvY2tTaWRlIHsgRG9ja1NpZGU6 OlVuZG9ja2VkIH07CiAKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBtdXRhYmxlIFN0cmluZyBt X2xvY2FsaXplZFN0cmluZ3NVUkw7Ci0gICAgbXV0YWJsZSBib29sIG1faGFzTG9jYWxpemVkU3Ry aW5nc1VSTDsKKyAgICBtdXRhYmxlIGJvb2wgbV9oYXNMb2NhbGl6ZWRTdHJpbmdzVVJMIHsgZmFs c2UgfTsKICNlbmRpZgogfTsKIAo=