137931 2014-10-21 12:40:43 -0700 Web Inspector: Fix generator importing of protocol type "any", treat as value 2014-10-22 12:11:21 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 joepeck joepeck burg commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 1043254 0 joepeck 2014-10-21 12:40:43 -0700 The generator import of type "any" was using "getAny" which does not exist. Add the boilerplate for a "getValue". This is currently unused, otherwise we would have gotten compiler warnings. Arguably we could switch to disallow incoming "any" types, but it is supportable, so I just did a quick implementation. 1043257 1 240216 joepeck 2014-10-21 12:42:13 -0700 Created attachment 240216 [PATCH] Proposed Fix 1043259 2 commit-queue 2014-10-21 12:44:51 -0700 This patch modifies the inspector protocol generator. Please ensure that you have rebaselined any generator test results (i.e., by running `Tools/Scripts/run-inspector-generator-tests --reset-results`) 1043270 3 240221 joepeck 2014-10-21 13:52:02 -0700 Created attachment 240221 [PATCH] Proposed Fix 1043521 4 240221 commit-queue 2014-10-22 12:11:17 -0700 Comment on attachment 240221 [PATCH] Proposed Fix Clearing flags on attachment: 240221 Committed r175059: <http://trac.webkit.org/changeset/175059> 1043522 5 commit-queue 2014-10-22 12:11:21 -0700 All reviewed patches have been landed. Closing bug. 240216 2014-10-21 12:42:13 -0700 2014-10-21 13:52:02 -0700 [PATCH] Proposed Fix getvalue.patch text/plain 7271 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGI1ZTRiNDcuLmIxNzdlZDcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTEwLTIxICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IGdl bmVyYXRvciBpbXBvcnRpbmcgb2YgcHJvdG9jb2wgdHlwZSAiYW55IiwgdHJlYXQgYXMgdmFsdWUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzkzMQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRyZWF0IGlu Y29taW5nICJhbnkiIG9iamVjdHMgYXMgSW5zcGVjdG9yVmFsdWVzLCB3aGljaCBjYW4gYmUgYW55 IHR5cGUuCisgICAgICAgIEFkZCB0aGUgbmVjZXNzYXJ5IGJvaWxlcnBsYXRlIHRvIGltcG9ydC4K KworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlci5jcHA6Cisg ICAgICAgIChJbnNwZWN0b3I6OkFzTWV0aG9kQnJpZGdlczo6YXNWYWx1ZSk6CisgICAgICAgIChJ bnNwZWN0b3I6Okluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyOjpnZXRWYWx1ZSk6CisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyLmg6CisgICAgICAgICogaW5z cGVjdG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0b3IucHk6CisgICAgICAgIChHZW5lcmF0b3Iu a2V5ZWRfZ2V0X21ldGhvZF9mb3JfdHlwZSk6CisgICAgICAgICogaW5zcGVjdG9yL3NjcmlwdHMv dGVzdHMvZXhwZWN0ZWQvY29tbWFuZHMtd2l0aC1vcHRpb25hbC1jYWxsLXJldHVybi1wYXJhbWV0 ZXJzLmpzb24tcmVzdWx0OgorCiAyMDE0LTEwLTIwICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFy b0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogUHJvdmlkZSBhIHdheSB0byBo YXZlIGFsdGVybmF0ZSBpbnNwZWN0b3IgYWdlbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyLmNwcCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXIuY3Bw CmluZGV4IDlhYjI0OTEuLmM2ZGExMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXIuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXIuY3BwCkBA IC0yMjcsNiArMjI3LDcgQEAgc3RydWN0IEFzTWV0aG9kQnJpZGdlcyB7CiAgICAgc3RhdGljIGJv b2wgYXNCb29sZWFuKEluc3BlY3RvclZhbHVlJiB2YWx1ZSwgYm9vbCYgb3V0cHV0KSB7IHJldHVy biB2YWx1ZS5hc0Jvb2xlYW4ob3V0cHV0KTsgfQogICAgIHN0YXRpYyBib29sIGFzT2JqZWN0KElu c3BlY3RvclZhbHVlJiB2YWx1ZSwgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4mIG91dHB1dCkgeyBy ZXR1cm4gdmFsdWUuYXNPYmplY3Qob3V0cHV0KTsgfQogICAgIHN0YXRpYyBib29sIGFzQXJyYXko SW5zcGVjdG9yVmFsdWUmIHZhbHVlLCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+JiBvdXRwdXQpIHsg cmV0dXJuIHZhbHVlLmFzQXJyYXkob3V0cHV0KTsgfQorICAgIHN0YXRpYyBib29sIGFzVmFsdWUo SW5zcGVjdG9yVmFsdWUmIHZhbHVlLCBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+JiBvdXRwdXQpIHsg cmV0dXJuIHZhbHVlLmFzVmFsdWUob3V0cHV0KTsgfQogfTsKIAogaW50IEluc3BlY3RvckJhY2tl bmREaXNwYXRjaGVyOjpnZXRJbnRlZ2VyKEluc3BlY3Rvck9iamVjdCogb2JqZWN0LCBjb25zdCBT dHJpbmcmIG5hbWUsIGJvb2wqIHZhbHVlRm91bmQsIEluc3BlY3RvckFycmF5KiBwcm90b2NvbEVy cm9ycykKQEAgLTI1OSw2ICsyNjAsMTEgQEAgUGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gSW5z cGVjdG9yQmFja2VuZERpc3BhdGNoZXI6OmdldEFycmF5KEluc3BlY3Rvck9iamVjdCoKICAgICBy ZXR1cm4gZ2V0UHJvcGVydHlWYWx1ZTxQYXNzUmVmUHRyPEluc3BlY3RvckFycmF5PiwgUmVmUHRy PEluc3BlY3RvckFycmF5PiwgSW5zcGVjdG9yQXJyYXkqPihvYmplY3QsIG5hbWUsIHZhbHVlRm91 bmQsIHByb3RvY29sRXJyb3JzLCBudWxscHRyLCBBc01ldGhvZEJyaWRnZXM6OmFzQXJyYXksICJB cnJheSIpOwogfQogCitQYXNzUmVmUHRyPEluc3BlY3RvclZhbHVlPiBJbnNwZWN0b3JCYWNrZW5k RGlzcGF0Y2hlcjo6Z2V0VmFsdWUoSW5zcGVjdG9yVmFsdWUqIG9iamVjdCwgY29uc3QgU3RyaW5n JiBuYW1lLCBib29sKiB2YWx1ZUZvdW5kLCBJbnNwZWN0b3JBcnJheSogcHJvdG9jb2xFcnJvcnMp Cit7CisgICAgcmV0dXJuIGdldFByb3BlcnR5VmFsdWU8UGFzc1JlZlB0cjxJbnNwZWN0b3JWYWx1 ZT4sIFJlZlB0cjxJbnNwZWN0b3JWYWx1ZT4sIEluc3BlY3RvclZhbHVlKj4ob2JqZWN0LCBuYW1l LCB2YWx1ZUZvdW5kLCBwcm90b2NvbEVycm9ycywgbnVsbHB0ciwgQXNNZXRob2RCcmlkZ2VzOjph c1ZhbHVlLCAiVmFsdWUiKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgSW5zcGVjdG9yCiAKICNlbmRp ZiAvLyBFTkFCTEUoSU5TUEVDVE9SKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlci5oIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlci5oCmluZGV4IDI5NThh NGQuLjc1NmM5OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv aW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyLmgKQEAgLTkwLDYgKzkwLDcgQEAg cHVibGljOgogICAgIHN0YXRpYyBkb3VibGUgZ2V0RG91YmxlKEluc3BlY3Rvck9iamVjdCosIGNv bnN0IFN0cmluZyYgbmFtZSwgYm9vbCogdmFsdWVGb3VuZCwgSW5zcGVjdG9yQXJyYXkqIHByb3Rv Y29sRXJyb3JzKTsKICAgICBzdGF0aWMgU3RyaW5nIGdldFN0cmluZyhJbnNwZWN0b3JPYmplY3Qq LCBjb25zdCBTdHJpbmcmIG5hbWUsIGJvb2wqIHZhbHVlRm91bmQsIEluc3BlY3RvckFycmF5KiBw cm90b2NvbEVycm9ycyk7CiAgICAgc3RhdGljIGJvb2wgZ2V0Qm9vbGVhbihJbnNwZWN0b3JPYmpl Y3QqLCBjb25zdCBTdHJpbmcmIG5hbWUsIGJvb2wqIHZhbHVlRm91bmQsIEluc3BlY3RvckFycmF5 KiBwcm90b2NvbEVycm9ycyk7CisgICAgc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yVmFsdWU+ IGdldFZhbHVlKEluc3BlY3RvclZhbHVlKiwgY29uc3QgU3RyaW5nJiBuYW1lLCBib29sKiB2YWx1 ZUZvdW5kLCBJbnNwZWN0b3JBcnJheSogcHJvdG9jb2xFcnJvcnMpOwogICAgIHN0YXRpYyBQYXNz UmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZ2V0T2JqZWN0KEluc3BlY3Rvck9iamVjdCosIGNvbnN0 IFN0cmluZyYgbmFtZSwgYm9vbCogdmFsdWVGb3VuZCwgSW5zcGVjdG9yQXJyYXkqIHByb3RvY29s RXJyb3JzKTsKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JBcnJheT4gZ2V0QXJyYXko SW5zcGVjdG9yT2JqZWN0KiwgY29uc3QgU3RyaW5nJiBuYW1lLCBib29sKiB2YWx1ZUZvdW5kLCBJ bnNwZWN0b3JBcnJheSogcHJvdG9jb2xFcnJvcnMpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0b3IucHkgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0b3IucHkK aW5kZXggMmE2ZWI2Ny4uNTZiNDI2NSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vZ2VuZXJhdG9yLnB5CisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRvci5weQpAQCAtMjM1 LDYgKzIzNSw4IEBAIGNsYXNzIEdlbmVyYXRvcjoKICAgICAgICAgICAgICAgICByZXR1cm4gJ2dl dEludGVnZXInCiAgICAgICAgICAgICBlbGlmIF90eXBlLnJhd19uYW1lKCkgaXMgJ251bWJlcic6 CiAgICAgICAgICAgICAgICAgcmV0dXJuICdnZXREb3VibGUnCisgICAgICAgICAgICBlbGlmIF90 eXBlLnJhd19uYW1lKCkgaXMgJ2FueSc6CisgICAgICAgICAgICAgICAgcmV0dXJuICdnZXRWYWx1 ZScKICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgcmV0dXJuICdnZXQnICsgdWNm aXJzdChfdHlwZS5yYXdfbmFtZSgpKQogICAgICAgICBpZiBpc2luc3RhbmNlKF90eXBlLCBBbGlh c2VkVHlwZSk6CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Nj cmlwdHMvdGVzdHMvZXhwZWN0ZWQvY29tbWFuZHMtd2l0aC1vcHRpb25hbC1jYWxsLXJldHVybi1w YXJhbWV0ZXJzLmpzb24tcmVzdWx0IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9z Y3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2NvbW1hbmRzLXdpdGgtb3B0aW9uYWwtY2FsbC1yZXR1cm4t cGFyYW1ldGVycy5qc29uLXJlc3VsdAppbmRleCBlNjMyYzFiLi5kMzNhMDM2IDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvdGVzdHMvZXhwZWN0ZWQv Y29tbWFuZHMtd2l0aC1vcHRpb25hbC1jYWxsLXJldHVybi1wYXJhbWV0ZXJzLmpzb24tcmVzdWx0 CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy90ZXN0cy9leHBl Y3RlZC9jb21tYW5kcy13aXRoLW9wdGlvbmFsLWNhbGwtcmV0dXJuLXBhcmFtZXRlcnMuanNvbi1y ZXN1bHQKQEAgLTI4Miw3ICsyODIsNyBAQCB2b2lkIEluc3BlY3RvckRhdGFiYXNlQmFja2VuZERp c3BhdGNoZXI6OmV4ZWN1dGVBbGxPcHRpb25hbFBhcmFtZXRlcnMobG9uZyBjYWxsSQogICAgIGJv b2wgdmFsdWVzX3ZhbHVlRm91bmQgPSBmYWxzZTsKICAgICBSZWZQdHI8SW5zcGVjdG9yOjpJbnNw ZWN0b3JPYmplY3Q+IGluX3ZhbHVlcyA9IEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyOjpnZXRP YmplY3QocGFyYW1zQ29udGFpbmVyUHRyLCBBU0NJSUxpdGVyYWwoInZhbHVlcyIpLCAmdmFsdWVz X3ZhbHVlRm91bmQsIHByb3RvY29sRXJyb3JzUHRyKTsKICAgICBib29sIHBheWxvYWRfdmFsdWVG b3VuZCA9IGZhbHNlOwotICAgIFJlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3RvclZhbHVlPiBpbl9w YXlsb2FkID0gSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXI6OmdldEFueShwYXJhbXNDb250YWlu ZXJQdHIsIEFTQ0lJTGl0ZXJhbCgicGF5bG9hZCIpLCAmcGF5bG9hZF92YWx1ZUZvdW5kLCBwcm90 b2NvbEVycm9yc1B0cik7CisgICAgUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yVmFsdWU+IGlu X3BheWxvYWQgPSBJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlcjo6Z2V0VmFsdWUocGFyYW1zQ29u dGFpbmVyUHRyLCBBU0NJSUxpdGVyYWwoInBheWxvYWQiKSwgJnBheWxvYWRfdmFsdWVGb3VuZCwg cHJvdG9jb2xFcnJvcnNQdHIpOwogICAgIGJvb2wgZGF0YWJhc2VJZF92YWx1ZUZvdW5kID0gZmFs c2U7CiAgICAgaW50IGluX2RhdGFiYXNlSWQgPSBJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlcjo6 Z2V0SW50ZWdlcihwYXJhbXNDb250YWluZXJQdHIsIEFTQ0lJTGl0ZXJhbCgiZGF0YWJhc2VJZCIp LCAmZGF0YWJhc2VJZF92YWx1ZUZvdW5kLCBwcm90b2NvbEVycm9yc1B0cik7CiAgICAgYm9vbCBz cWxFcnJvcl92YWx1ZUZvdW5kID0gZmFsc2U7CkBAIC0zNTAsNyArMzUwLDcgQEAgdm9pZCBJbnNw ZWN0b3JEYXRhYmFzZUJhY2tlbmREaXNwYXRjaGVyOjpleGVjdXRlTm9PcHRpb25hbFBhcmFtZXRl cnMobG9uZyBjYWxsSWQKICAgICBTdHJpbmcgaW5fbm90ZXMgPSBJbnNwZWN0b3JCYWNrZW5kRGlz cGF0Y2hlcjo6Z2V0U3RyaW5nKHBhcmFtc0NvbnRhaW5lclB0ciwgQVNDSUlMaXRlcmFsKCJub3Rl cyIpLCBudWxscHRyLCBwcm90b2NvbEVycm9yc1B0cik7CiAgICAgZG91YmxlIGluX3RpbWVzdGFt cCA9IEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyOjpnZXREb3VibGUocGFyYW1zQ29udGFpbmVy UHRyLCBBU0NJSUxpdGVyYWwoInRpbWVzdGFtcCIpLCBudWxscHRyLCBwcm90b2NvbEVycm9yc1B0 cik7CiAgICAgUmVmUHRyPEluc3BlY3Rvcjo6SW5zcGVjdG9yT2JqZWN0PiBpbl92YWx1ZXMgPSBJ bnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlcjo6Z2V0T2JqZWN0KHBhcmFtc0NvbnRhaW5lclB0ciwg QVNDSUlMaXRlcmFsKCJ2YWx1ZXMiKSwgbnVsbHB0ciwgcHJvdG9jb2xFcnJvcnNQdHIpOwotICAg IFJlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3RvclZhbHVlPiBpbl9wYXlsb2FkID0gSW5zcGVjdG9y QmFja2VuZERpc3BhdGNoZXI6OmdldEFueShwYXJhbXNDb250YWluZXJQdHIsIEFTQ0lJTGl0ZXJh bCgicGF5bG9hZCIpLCBudWxscHRyLCBwcm90b2NvbEVycm9yc1B0cik7CisgICAgUmVmUHRyPElu c3BlY3Rvcjo6SW5zcGVjdG9yVmFsdWU+IGluX3BheWxvYWQgPSBJbnNwZWN0b3JCYWNrZW5kRGlz cGF0Y2hlcjo6Z2V0VmFsdWUocGFyYW1zQ29udGFpbmVyUHRyLCBBU0NJSUxpdGVyYWwoInBheWxv YWQiKSwgbnVsbHB0ciwgcHJvdG9jb2xFcnJvcnNQdHIpOwogICAgIGludCBpbl9kYXRhYmFzZUlk ID0gSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXI6OmdldEludGVnZXIocGFyYW1zQ29udGFpbmVy UHRyLCBBU0NJSUxpdGVyYWwoImRhdGFiYXNlSWQiKSwgbnVsbHB0ciwgcHJvdG9jb2xFcnJvcnNQ dHIpOwogICAgIFJlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gaW5fc3FsRXJyb3Ig PSBJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlcjo6Z2V0T2JqZWN0KHBhcmFtc0NvbnRhaW5lclB0 ciwgQVNDSUlMaXRlcmFsKCJzcWxFcnJvciIpLCBudWxscHRyLCBwcm90b2NvbEVycm9yc1B0cik7 CiAgICAgU3RyaW5nIGluX3NjcmVlbkNvbG9yID0gSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXI6 OmdldFN0cmluZyhwYXJhbXNDb250YWluZXJQdHIsIEFTQ0lJTGl0ZXJhbCgic2NyZWVuQ29sb3Ii KSwgbnVsbHB0ciwgcHJvdG9jb2xFcnJvcnNQdHIpOwo= 240221 2014-10-21 13:52:02 -0700 2014-10-22 12:11:17 -0700 [PATCH] Proposed Fix oops.patch text/plain 7275 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDUxNGU2YTkuLjYyNjhjYjAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTEwLTIxICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRml4IGdl bmVyYXRvciBpbXBvcnRpbmcgb2YgcHJvdG9jb2wgdHlwZSAiYW55IiwgdHJlYXQgYXMgdmFsdWUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzkzMQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRyZWF0IGlu Y29taW5nICJhbnkiIG9iamVjdHMgYXMgSW5zcGVjdG9yVmFsdWVzLCB3aGljaCBjYW4gYmUgYW55 IHR5cGUuCisgICAgICAgIEFkZCB0aGUgbmVjZXNzYXJ5IGJvaWxlcnBsYXRlIHRvIGltcG9ydC4K KworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlci5jcHA6Cisg ICAgICAgIChJbnNwZWN0b3I6OkFzTWV0aG9kQnJpZGdlczo6YXNWYWx1ZSk6CisgICAgICAgIChJ bnNwZWN0b3I6Okluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyOjpnZXRWYWx1ZSk6CisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyLmg6CisgICAgICAgICogaW5z cGVjdG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0b3IucHk6CisgICAgICAgIChHZW5lcmF0b3Iu a2V5ZWRfZ2V0X21ldGhvZF9mb3JfdHlwZSk6CisgICAgICAgICogaW5zcGVjdG9yL3NjcmlwdHMv dGVzdHMvZXhwZWN0ZWQvY29tbWFuZHMtd2l0aC1vcHRpb25hbC1jYWxsLXJldHVybi1wYXJhbWV0 ZXJzLmpzb24tcmVzdWx0OgorCiAyMDE0LTEwLTIwICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFy b0BhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBhZGQgYmFjayBjb3B5cmlnaHQgbGlu ZSB0aGF0IHdhcyBhY2NpZGVudGFsbHkgcmVtb3ZlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXIuY3BwIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlci5j cHAKaW5kZXggOWFiMjQ5MS4uZGJlNzkzZSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlci5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlci5jcHAK QEAgLTIyNyw2ICsyMjcsNyBAQCBzdHJ1Y3QgQXNNZXRob2RCcmlkZ2VzIHsKICAgICBzdGF0aWMg Ym9vbCBhc0Jvb2xlYW4oSW5zcGVjdG9yVmFsdWUmIHZhbHVlLCBib29sJiBvdXRwdXQpIHsgcmV0 dXJuIHZhbHVlLmFzQm9vbGVhbihvdXRwdXQpOyB9CiAgICAgc3RhdGljIGJvb2wgYXNPYmplY3Qo SW5zcGVjdG9yVmFsdWUmIHZhbHVlLCBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiYgb3V0cHV0KSB7 IHJldHVybiB2YWx1ZS5hc09iamVjdChvdXRwdXQpOyB9CiAgICAgc3RhdGljIGJvb2wgYXNBcnJh eShJbnNwZWN0b3JWYWx1ZSYgdmFsdWUsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4mIG91dHB1dCkg eyByZXR1cm4gdmFsdWUuYXNBcnJheShvdXRwdXQpOyB9CisgICAgc3RhdGljIGJvb2wgYXNWYWx1 ZShJbnNwZWN0b3JWYWx1ZSYgdmFsdWUsIFJlZlB0cjxJbnNwZWN0b3JWYWx1ZT4mIG91dHB1dCkg eyByZXR1cm4gdmFsdWUuYXNWYWx1ZShvdXRwdXQpOyB9CiB9OwogCiBpbnQgSW5zcGVjdG9yQmFj a2VuZERpc3BhdGNoZXI6OmdldEludGVnZXIoSW5zcGVjdG9yT2JqZWN0KiBvYmplY3QsIGNvbnN0 IFN0cmluZyYgbmFtZSwgYm9vbCogdmFsdWVGb3VuZCwgSW5zcGVjdG9yQXJyYXkqIHByb3RvY29s RXJyb3JzKQpAQCAtMjU5LDYgKzI2MCwxMSBAQCBQYXNzUmVmUHRyPEluc3BlY3RvckFycmF5PiBJ bnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlcjo6Z2V0QXJyYXkoSW5zcGVjdG9yT2JqZWN0KgogICAg IHJldHVybiBnZXRQcm9wZXJ0eVZhbHVlPFBhc3NSZWZQdHI8SW5zcGVjdG9yQXJyYXk+LCBSZWZQ dHI8SW5zcGVjdG9yQXJyYXk+LCBJbnNwZWN0b3JBcnJheSo+KG9iamVjdCwgbmFtZSwgdmFsdWVG b3VuZCwgcHJvdG9jb2xFcnJvcnMsIG51bGxwdHIsIEFzTWV0aG9kQnJpZGdlczo6YXNBcnJheSwg IkFycmF5Iik7CiB9CiAKK1Bhc3NSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IEluc3BlY3RvckJhY2tl bmREaXNwYXRjaGVyOjpnZXRWYWx1ZShJbnNwZWN0b3JPYmplY3QqIG9iamVjdCwgY29uc3QgU3Ry aW5nJiBuYW1lLCBib29sKiB2YWx1ZUZvdW5kLCBJbnNwZWN0b3JBcnJheSogcHJvdG9jb2xFcnJv cnMpCit7CisgICAgcmV0dXJuIGdldFByb3BlcnR5VmFsdWU8UGFzc1JlZlB0cjxJbnNwZWN0b3JW YWx1ZT4sIFJlZlB0cjxJbnNwZWN0b3JWYWx1ZT4sIEluc3BlY3RvclZhbHVlKj4ob2JqZWN0LCBu YW1lLCB2YWx1ZUZvdW5kLCBwcm90b2NvbEVycm9ycywgbnVsbHB0ciwgQXNNZXRob2RCcmlkZ2Vz Ojphc1ZhbHVlLCAiVmFsdWUiKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgSW5zcGVjdG9yCiAKICNl bmRpZiAvLyBFTkFCTEUoSU5TUEVDVE9SKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlci5oIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlci5oCmluZGV4IDI5 NThhNGQuLmE5OWU2ZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyLmgKQEAgLTkwLDYgKzkwLDcg QEAgcHVibGljOgogICAgIHN0YXRpYyBkb3VibGUgZ2V0RG91YmxlKEluc3BlY3Rvck9iamVjdCos IGNvbnN0IFN0cmluZyYgbmFtZSwgYm9vbCogdmFsdWVGb3VuZCwgSW5zcGVjdG9yQXJyYXkqIHBy b3RvY29sRXJyb3JzKTsKICAgICBzdGF0aWMgU3RyaW5nIGdldFN0cmluZyhJbnNwZWN0b3JPYmpl Y3QqLCBjb25zdCBTdHJpbmcmIG5hbWUsIGJvb2wqIHZhbHVlRm91bmQsIEluc3BlY3RvckFycmF5 KiBwcm90b2NvbEVycm9ycyk7CiAgICAgc3RhdGljIGJvb2wgZ2V0Qm9vbGVhbihJbnNwZWN0b3JP YmplY3QqLCBjb25zdCBTdHJpbmcmIG5hbWUsIGJvb2wqIHZhbHVlRm91bmQsIEluc3BlY3RvckFy cmF5KiBwcm90b2NvbEVycm9ycyk7CisgICAgc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yVmFs dWU+IGdldFZhbHVlKEluc3BlY3Rvck9iamVjdCosIGNvbnN0IFN0cmluZyYgbmFtZSwgYm9vbCog dmFsdWVGb3VuZCwgSW5zcGVjdG9yQXJyYXkqIHByb3RvY29sRXJyb3JzKTsKICAgICBzdGF0aWMg UGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGdldE9iamVjdChJbnNwZWN0b3JPYmplY3QqLCBj b25zdCBTdHJpbmcmIG5hbWUsIGJvb2wqIHZhbHVlRm91bmQsIEluc3BlY3RvckFycmF5KiBwcm90 b2NvbEVycm9ycyk7CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IGdldEFy cmF5KEluc3BlY3Rvck9iamVjdCosIGNvbnN0IFN0cmluZyYgbmFtZSwgYm9vbCogdmFsdWVGb3Vu ZCwgSW5zcGVjdG9yQXJyYXkqIHByb3RvY29sRXJyb3JzKTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vZ2VuZXJhdG9yLnB5IGIv U291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vZ2VuZXJhdG9y LnB5CmluZGV4IDJhNmViNjcuLjU2YjQyNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRvci5weQorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0b3IucHkKQEAg LTIzNSw2ICsyMzUsOCBAQCBjbGFzcyBHZW5lcmF0b3I6CiAgICAgICAgICAgICAgICAgcmV0dXJu ICdnZXRJbnRlZ2VyJwogICAgICAgICAgICAgZWxpZiBfdHlwZS5yYXdfbmFtZSgpIGlzICdudW1i ZXInOgogICAgICAgICAgICAgICAgIHJldHVybiAnZ2V0RG91YmxlJworICAgICAgICAgICAgZWxp ZiBfdHlwZS5yYXdfbmFtZSgpIGlzICdhbnknOgorICAgICAgICAgICAgICAgIHJldHVybiAnZ2V0 VmFsdWUnCiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgIHJldHVybiAnZ2V0JyAr IHVjZmlyc3QoX3R5cGUucmF3X25hbWUoKSkKICAgICAgICAgaWYgaXNpbnN0YW5jZShfdHlwZSwg QWxpYXNlZFR5cGUpOgpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rv ci9zY3JpcHRzL3Rlc3RzL2V4cGVjdGVkL2NvbW1hbmRzLXdpdGgtb3B0aW9uYWwtY2FsbC1yZXR1 cm4tcGFyYW1ldGVycy5qc29uLXJlc3VsdCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0 b3Ivc2NyaXB0cy90ZXN0cy9leHBlY3RlZC9jb21tYW5kcy13aXRoLW9wdGlvbmFsLWNhbGwtcmV0 dXJuLXBhcmFtZXRlcnMuanNvbi1yZXN1bHQKaW5kZXggYjEwYzYwNy4uYmMxZTVmOCAxMDA2NDQK LS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL3Rlc3RzL2V4cGVj dGVkL2NvbW1hbmRzLXdpdGgtb3B0aW9uYWwtY2FsbC1yZXR1cm4tcGFyYW1ldGVycy5qc29uLXJl c3VsdAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvdGVzdHMv ZXhwZWN0ZWQvY29tbWFuZHMtd2l0aC1vcHRpb25hbC1jYWxsLXJldHVybi1wYXJhbWV0ZXJzLmpz b24tcmVzdWx0CkBAIC0yMDQsNyArMjA0LDcgQEAgdm9pZCBJbnNwZWN0b3JEYXRhYmFzZUJhY2tl bmREaXNwYXRjaGVyOjpleGVjdXRlQWxsT3B0aW9uYWxQYXJhbWV0ZXJzKGxvbmcgY2FsbEkKICAg ICBib29sIHZhbHVlc192YWx1ZUZvdW5kID0gZmFsc2U7CiAgICAgUmVmUHRyPEluc3BlY3Rvcjo6 SW5zcGVjdG9yT2JqZWN0PiBpbl92YWx1ZXMgPSBJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlcjo6 Z2V0T2JqZWN0KHBhcmFtc0NvbnRhaW5lclB0ciwgQVNDSUlMaXRlcmFsKCJ2YWx1ZXMiKSwgJnZh bHVlc192YWx1ZUZvdW5kLCBwcm90b2NvbEVycm9yc1B0cik7CiAgICAgYm9vbCBwYXlsb2FkX3Zh bHVlRm91bmQgPSBmYWxzZTsKLSAgICBSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JWYWx1ZT4g aW5fcGF5bG9hZCA9IEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyOjpnZXRBbnkocGFyYW1zQ29u dGFpbmVyUHRyLCBBU0NJSUxpdGVyYWwoInBheWxvYWQiKSwgJnBheWxvYWRfdmFsdWVGb3VuZCwg cHJvdG9jb2xFcnJvcnNQdHIpOworICAgIFJlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3RvclZhbHVl PiBpbl9wYXlsb2FkID0gSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXI6OmdldFZhbHVlKHBhcmFt c0NvbnRhaW5lclB0ciwgQVNDSUlMaXRlcmFsKCJwYXlsb2FkIiksICZwYXlsb2FkX3ZhbHVlRm91 bmQsIHByb3RvY29sRXJyb3JzUHRyKTsKICAgICBib29sIGRhdGFiYXNlSWRfdmFsdWVGb3VuZCA9 IGZhbHNlOwogICAgIGludCBpbl9kYXRhYmFzZUlkID0gSW5zcGVjdG9yQmFja2VuZERpc3BhdGNo ZXI6OmdldEludGVnZXIocGFyYW1zQ29udGFpbmVyUHRyLCBBU0NJSUxpdGVyYWwoImRhdGFiYXNl SWQiKSwgJmRhdGFiYXNlSWRfdmFsdWVGb3VuZCwgcHJvdG9jb2xFcnJvcnNQdHIpOwogICAgIGJv b2wgc3FsRXJyb3JfdmFsdWVGb3VuZCA9IGZhbHNlOwpAQCAtMjY1LDcgKzI2NSw3IEBAIHZvaWQg SW5zcGVjdG9yRGF0YWJhc2VCYWNrZW5kRGlzcGF0Y2hlcjo6ZXhlY3V0ZU5vT3B0aW9uYWxQYXJh bWV0ZXJzKGxvbmcgY2FsbElkCiAgICAgU3RyaW5nIGluX25vdGVzID0gSW5zcGVjdG9yQmFja2Vu ZERpc3BhdGNoZXI6OmdldFN0cmluZyhwYXJhbXNDb250YWluZXJQdHIsIEFTQ0lJTGl0ZXJhbCgi bm90ZXMiKSwgbnVsbHB0ciwgcHJvdG9jb2xFcnJvcnNQdHIpOwogICAgIGRvdWJsZSBpbl90aW1l c3RhbXAgPSBJbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlcjo6Z2V0RG91YmxlKHBhcmFtc0NvbnRh aW5lclB0ciwgQVNDSUlMaXRlcmFsKCJ0aW1lc3RhbXAiKSwgbnVsbHB0ciwgcHJvdG9jb2xFcnJv cnNQdHIpOwogICAgIFJlZlB0cjxJbnNwZWN0b3I6Okluc3BlY3Rvck9iamVjdD4gaW5fdmFsdWVz ID0gSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXI6OmdldE9iamVjdChwYXJhbXNDb250YWluZXJQ dHIsIEFTQ0lJTGl0ZXJhbCgidmFsdWVzIiksIG51bGxwdHIsIHByb3RvY29sRXJyb3JzUHRyKTsK LSAgICBSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JWYWx1ZT4gaW5fcGF5bG9hZCA9IEluc3Bl Y3RvckJhY2tlbmREaXNwYXRjaGVyOjpnZXRBbnkocGFyYW1zQ29udGFpbmVyUHRyLCBBU0NJSUxp dGVyYWwoInBheWxvYWQiKSwgbnVsbHB0ciwgcHJvdG9jb2xFcnJvcnNQdHIpOworICAgIFJlZlB0 cjxJbnNwZWN0b3I6Okluc3BlY3RvclZhbHVlPiBpbl9wYXlsb2FkID0gSW5zcGVjdG9yQmFja2Vu ZERpc3BhdGNoZXI6OmdldFZhbHVlKHBhcmFtc0NvbnRhaW5lclB0ciwgQVNDSUlMaXRlcmFsKCJw YXlsb2FkIiksIG51bGxwdHIsIHByb3RvY29sRXJyb3JzUHRyKTsKICAgICBpbnQgaW5fZGF0YWJh c2VJZCA9IEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyOjpnZXRJbnRlZ2VyKHBhcmFtc0NvbnRh aW5lclB0ciwgQVNDSUlMaXRlcmFsKCJkYXRhYmFzZUlkIiksIG51bGxwdHIsIHByb3RvY29sRXJy b3JzUHRyKTsKICAgICBSZWZQdHI8SW5zcGVjdG9yOjpJbnNwZWN0b3JPYmplY3Q+IGluX3NxbEVy cm9yID0gSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXI6OmdldE9iamVjdChwYXJhbXNDb250YWlu ZXJQdHIsIEFTQ0lJTGl0ZXJhbCgic3FsRXJyb3IiKSwgbnVsbHB0ciwgcHJvdG9jb2xFcnJvcnNQ dHIpOwogICAgIFN0cmluZyBpbl9zY3JlZW5Db2xvciA9IEluc3BlY3RvckJhY2tlbmREaXNwYXRj aGVyOjpnZXRTdHJpbmcocGFyYW1zQ29udGFpbmVyUHRyLCBBU0NJSUxpdGVyYWwoInNjcmVlbkNv bG9yIiksIG51bGxwdHIsIHByb3RvY29sRXJyb3JzUHRyKTsK