146127 2015-06-18 16:00:27 -0700 Web Inspector: use Optional<T> for optional parameters in generated command type signatures 2026-01-12 09:05:27 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All NEW InRadar P2 Normal --- 156394 147067 1 burg webkit-unassigned graouts inspector-bugzilla-changes jonowells webkit-bug-importer oldest_to_newest 1103069 0 burg 2015-06-18 16:00:27 -0700 This should eliminate a lot of junk in the individual dispatch methods, and get rid of occurences of const T* opt_in_foo in backend command type signatures. 1103070 1 255147 burg 2015-06-18 16:02:02 -0700 Created attachment 255147 WIP (early) 1110373 2 webkit-bug-importer 2015-07-18 12:56:10 -0700 <rdar://problem/21888718> 255147 2015-06-18 16:02:02 -0700 2015-06-18 16:02:23 -0700 WIP (early) bug-146127-20150618160125.patch text/plain 12075 burg U3VidmVyc2lvbiBSZXZpc2lvbjogMTg1NzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyLmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXIuY3BwCmlu ZGV4IGY4OGNmYmRhYmMxZGM5Y2VhZjhmNTAzMGM2NzVkNDk0ZDc2MDM4MTkuLmJiM2I4OTg4MTBk NWJlM2JjOGY0NzMxZWIzMjg0NzdiYmZkODM0YjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXIuY3BwCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZERpc3BhdGNoZXIu Y3BwCkBAIC0xODQsMzcgKzE4NCwyMCBAQCB2b2lkIEJhY2tlbmREaXNwYXRjaGVyOjpyZXBvcnRQ cm90b2NvbEVycm9yKGNvbnN0IGxvbmcqIGNvbnN0IGNhbGxJZCwgQ29tbW9uRXJybwogICAgIG1f ZnJvbnRlbmRDaGFubmVsLT5zZW5kTWVzc2FnZVRvRnJvbnRlbmQobWVzc2FnZS0+dG9KU09OU3Ry aW5nKCkpOwogfQogCi10ZW1wbGF0ZTx0eXBlbmFtZSBSZXR1cm5WYWx1ZVR5cGUsIHR5cGVuYW1l IFZhbHVlVHlwZSwgdHlwZW5hbWUgRGVmYXVsdFZhbHVlVHlwZT4KLXN0YXRpYyBSZXR1cm5WYWx1 ZVR5cGUgZ2V0UHJvcGVydHlWYWx1ZShJbnNwZWN0b3JPYmplY3QqIG9iamVjdCwgY29uc3QgU3Ry aW5nJiBuYW1lLCBib29sKiBvdXRfb3B0aW9uYWxWYWx1ZUZvdW5kLCBJbnNwZWN0b3I6OlByb3Rv Y29sOjpBcnJheTxTdHJpbmc+JiBwcm90b2NvbEVycm9ycywgRGVmYXVsdFZhbHVlVHlwZSBkZWZh dWx0VmFsdWUsIGJvb2wgKCphc01ldGhvZCkoSW5zcGVjdG9yVmFsdWUmLCBWYWx1ZVR5cGUmKSwg Y29uc3QgY2hhciogdHlwZU5hbWUpCit0ZW1wbGF0ZTx0eXBlbmFtZSBSZXR1cm5WYWx1ZVR5cGUs IHR5cGVuYW1lIFZhbHVlVHlwZT4KK3N0YXRpYyBSZXR1cm5WYWx1ZVR5cGUgZ2V0UHJvcGVydHlW YWx1ZShjb25zdCBJbnNwZWN0b3JPYmplY3QmIG9iamVjdCwgY29uc3QgU3RyaW5nJiBuYW1lLCBJ bnNwZWN0b3I6OlByb3RvY29sOjpBcnJheTxTdHJpbmc+JiBwcm90b2NvbEVycm9ycywgRGVmYXVs dFZhbHVlVHlwZSBkZWZhdWx0VmFsdWUsIGJvb2wgKCphc01ldGhvZCkoSW5zcGVjdG9yVmFsdWUm LCBWYWx1ZVR5cGUmKSwgY29uc3QgY2hhciogdHlwZU5hbWUpCiB7Ci0gICAgVmFsdWVUeXBlIHJl c3VsdCA9IGRlZmF1bHRWYWx1ZTsKLSAgICAvLyBvdXRfb3B0aW9uYWxWYWx1ZUZvdW5kIHNpZ25h bHMgdG8gdGhlIGNhbGxlciB3aGV0aGVyIGFuIG9wdGlvbmFsIHByb3BlcnR5IHdhcyBmb3VuZC4K LSAgICAvLyBpZiBvdXRfb3B0aW9uYWxWYWx1ZUZvdW5kID09IG51bGxwdHIsIHRoZW4gdGhpcyBp cyBhIHJlcXVpcmVkIHByb3BlcnR5LgotICAgIGlmIChvdXRfb3B0aW9uYWxWYWx1ZUZvdW5kKQot ICAgICAgICAqb3V0X29wdGlvbmFsVmFsdWVGb3VuZCA9IGZhbHNlOwotCi0gICAgaWYgKCFvYmpl Y3QpIHsKLSAgICAgICAgaWYgKCFvdXRfb3B0aW9uYWxWYWx1ZUZvdW5kKQotICAgICAgICAgICAg cHJvdG9jb2xFcnJvcnMuYWRkSXRlbShTdHJpbmc6OmZvcm1hdCgiJ3BhcmFtcycgb2JqZWN0IG11 c3QgY29udGFpbiByZXF1aXJlZCBwYXJhbWV0ZXIgJyVzJyB3aXRoIHR5cGUgJyVzJy4iLCBuYW1l LnV0ZjgoKS5kYXRhKCksIHR5cGVOYW1lKSk7Ci0gICAgICAgIHJldHVybiByZXN1bHQ7Ci0gICAg fQorICAgIC8vIERlZmF1bHQgY29uc3RydWN0b3Igd2lsbCBwcm9kdWNlIGVtcHR5IFJlZlB0ciBv ciBlbXB0eSBPcHRpb25hbC4KKyAgICBSZXR1cm5WYWx1ZVR5cGUgcHJvcGVydHlWYWx1ZTsKIAog ICAgIGF1dG8gZmluZFJlc3VsdCA9IG9iamVjdC0+ZmluZChuYW1lKTsKLSAgICBpZiAoZmluZFJl c3VsdCA9PSBvYmplY3QtPmVuZCgpKSB7Ci0gICAgICAgIGlmICghb3V0X29wdGlvbmFsVmFsdWVG b3VuZCkKLSAgICAgICAgICAgIHByb3RvY29sRXJyb3JzLmFkZEl0ZW0oU3RyaW5nOjpmb3JtYXQo IlBhcmFtZXRlciAnJXMnIHdpdGggdHlwZSAnJXMnIHdhcyBub3QgZm91bmQuIiwgbmFtZS51dGY4 KCkuZGF0YSgpLCB0eXBlTmFtZSkpOwotICAgICAgICByZXR1cm4gcmVzdWx0OwotICAgIH0KKyAg ICBpZiAoZmluZFJlc3VsdCA9PSBvYmplY3QtPmVuZCgpKQorICAgICAgICByZXR1cm4gcHJvcGVy dHlWYWx1ZTsKIAotICAgIGlmICghYXNNZXRob2QoKmZpbmRSZXN1bHQtPnZhbHVlLCByZXN1bHQp KSB7CisgICAgaWYgKCFhc01ldGhvZCgqZmluZFJlc3VsdC0+dmFsdWUsIHByb3BlcnR5VmFsdWUp KQogICAgICAgICBwcm90b2NvbEVycm9ycy5hZGRJdGVtKFN0cmluZzo6Zm9ybWF0KCJQYXJhbWV0 ZXIgJyVzJyBoYXMgd3JvbmcgdHlwZS4gSXQgbXVzdCBiZSAnJXMnLiIsIG5hbWUudXRmOCgpLmRh dGEoKSwgdHlwZU5hbWUpKTsKLSAgICAgICAgcmV0dXJuIHJlc3VsdDsKLSAgICB9Ci0KLSAgICBp ZiAob3V0X29wdGlvbmFsVmFsdWVGb3VuZCkKLSAgICAgICAgKm91dF9vcHRpb25hbFZhbHVlRm91 bmQgPSB0cnVlOwogCi0gICAgcmV0dXJuIHJlc3VsdDsKKyAgICByZXR1cm4gcHJvcGVydHlWYWx1 ZTsKIH0KIAogc3RydWN0IEFzTWV0aG9kQnJpZGdlcyB7CkBAIC0yMjcsMzkgKzIxMCwzOSBAQCBz dHJ1Y3QgQXNNZXRob2RCcmlkZ2VzIHsKICAgICBzdGF0aWMgYm9vbCBhc1ZhbHVlKEluc3BlY3Rv clZhbHVlJiB2YWx1ZSwgUmVmUHRyPEluc3BlY3RvclZhbHVlPiYgb3V0cHV0KSB7IHJldHVybiB2 YWx1ZS5hc1ZhbHVlKG91dHB1dCk7IH0KIH07CiAKLWludCBCYWNrZW5kRGlzcGF0Y2hlcjo6Z2V0 SW50ZWdlcihJbnNwZWN0b3JPYmplY3QqIG9iamVjdCwgY29uc3QgU3RyaW5nJiBuYW1lLCBib29s KiB2YWx1ZUZvdW5kLCBJbnNwZWN0b3I6OlByb3RvY29sOjpBcnJheTxTdHJpbmc+JiBwcm90b2Nv bEVycm9ycykKK09wdGlvbmFsPGludD4gQmFja2VuZERpc3BhdGNoZXI6OmdldEludGVnZXIoY29u c3QgSW5zcGVjdG9yT2JqZWN0JiBvYmplY3QsIGNvbnN0IFN0cmluZyYgbmFtZSwgSW5zcGVjdG9y OjpQcm90b2NvbDo6QXJyYXk8U3RyaW5nPiYgcHJvdG9jb2xFcnJvcnMpCiB7Ci0gICAgcmV0dXJu IGdldFByb3BlcnR5VmFsdWU8aW50LCBpbnQsIGludD4ob2JqZWN0LCBuYW1lLCB2YWx1ZUZvdW5k LCBwcm90b2NvbEVycm9ycywgMCwgQXNNZXRob2RCcmlkZ2VzOjphc0ludGVnZXIsICJJbnRlZ2Vy Iik7CisgICAgcmV0dXJuIGdldFByb3BlcnR5VmFsdWU8T3B0aW9uYWw8aW50PiwgaW50PihvYmpl Y3QsIG5hbWUsIHByb3RvY29sRXJyb3JzLCBOdWxsb3B0LCBBc01ldGhvZEJyaWRnZXM6OmFzSW50 ZWdlciwgIkludGVnZXIiKTsKIH0KIAotZG91YmxlIEJhY2tlbmREaXNwYXRjaGVyOjpnZXREb3Vi bGUoSW5zcGVjdG9yT2JqZWN0KiBvYmplY3QsIGNvbnN0IFN0cmluZyYgbmFtZSwgYm9vbCogdmFs dWVGb3VuZCwgSW5zcGVjdG9yOjpQcm90b2NvbDo6QXJyYXk8U3RyaW5nPiYgcHJvdG9jb2xFcnJv cnMpCitPcHRpb25hbDxkb3VibGU+IEJhY2tlbmREaXNwYXRjaGVyOjpnZXREb3VibGUoY29uc3Qg SW5zcGVjdG9yT2JqZWN0JiBvYmplY3QsIGNvbnN0IFN0cmluZyYgbmFtZSwgSW5zcGVjdG9yOjpQ cm90b2NvbDo6QXJyYXk8U3RyaW5nPiYgcHJvdG9jb2xFcnJvcnMpCiB7Ci0gICAgcmV0dXJuIGdl dFByb3BlcnR5VmFsdWU8ZG91YmxlLCBkb3VibGUsIGRvdWJsZT4ob2JqZWN0LCBuYW1lLCB2YWx1 ZUZvdW5kLCBwcm90b2NvbEVycm9ycywgMCwgQXNNZXRob2RCcmlkZ2VzOjphc0RvdWJsZSwgIk51 bWJlciIpOworICAgIHJldHVybiBnZXRQcm9wZXJ0eVZhbHVlPE9wdGlvbmFsPGRvdWJsZT4sIGRv dWJsZT4ob2JqZWN0LCBuYW1lLCBwcm90b2NvbEVycm9ycywgTnVsbG9wdCwgQXNNZXRob2RCcmlk Z2VzOjphc0RvdWJsZSwgIk51bWJlciIpOwogfQogCi1TdHJpbmcgQmFja2VuZERpc3BhdGNoZXI6 OmdldFN0cmluZyhJbnNwZWN0b3JPYmplY3QqIG9iamVjdCwgY29uc3QgU3RyaW5nJiBuYW1lLCBi b29sKiB2YWx1ZUZvdW5kLCBJbnNwZWN0b3I6OlByb3RvY29sOjpBcnJheTxTdHJpbmc+JiBwcm90 b2NvbEVycm9ycykKK09wdGlvbmFsPFN0cmluZz4gQmFja2VuZERpc3BhdGNoZXI6OmdldFN0cmlu Zyhjb25zdCBJbnNwZWN0b3JPYmplY3QmIG9iamVjdCwgY29uc3QgU3RyaW5nJiBuYW1lLCBJbnNw ZWN0b3I6OlByb3RvY29sOjpBcnJheTxTdHJpbmc+JiBwcm90b2NvbEVycm9ycykKIHsKLSAgICBy ZXR1cm4gZ2V0UHJvcGVydHlWYWx1ZTxTdHJpbmcsIFN0cmluZywgU3RyaW5nPihvYmplY3QsIG5h bWUsIHZhbHVlRm91bmQsIHByb3RvY29sRXJyb3JzLCAiIiwgQXNNZXRob2RCcmlkZ2VzOjphc1N0 cmluZywgIlN0cmluZyIpOworICAgIHJldHVybiBnZXRQcm9wZXJ0eVZhbHVlPE9wdGlvbmFsPFN0 cmluZz4sIFN0cmluZz4ob2JqZWN0LCBuYW1lLCBwcm90b2NvbEVycm9ycywgTnVsbG9wdCwgQXNN ZXRob2RCcmlkZ2VzOjphc1N0cmluZywgIlN0cmluZyIpOwogfQogCi1ib29sIEJhY2tlbmREaXNw YXRjaGVyOjpnZXRCb29sZWFuKEluc3BlY3Rvck9iamVjdCogb2JqZWN0LCBjb25zdCBTdHJpbmcm IG5hbWUsIGJvb2wqIHZhbHVlRm91bmQsIEluc3BlY3Rvcjo6UHJvdG9jb2w6OkFycmF5PFN0cmlu Zz4mIHByb3RvY29sRXJyb3JzKQorT3B0aW9uYWw8Ym9vbD4gQmFja2VuZERpc3BhdGNoZXI6Omdl dEJvb2xlYW4oY29uc3QgSW5zcGVjdG9yT2JqZWN0JiBvYmplY3QsIGNvbnN0IFN0cmluZyYgbmFt ZSwgSW5zcGVjdG9yOjpQcm90b2NvbDo6QXJyYXk8U3RyaW5nPiYgcHJvdG9jb2xFcnJvcnMpCiB7 Ci0gICAgcmV0dXJuIGdldFByb3BlcnR5VmFsdWU8Ym9vbCwgYm9vbCwgYm9vbD4ob2JqZWN0LCBu YW1lLCB2YWx1ZUZvdW5kLCBwcm90b2NvbEVycm9ycywgZmFsc2UsIEFzTWV0aG9kQnJpZGdlczo6 YXNCb29sZWFuLCAiQm9vbGVhbiIpOworICAgIHJldHVybiBnZXRQcm9wZXJ0eVZhbHVlPE9wdGlv bmFsPGJvb2w+LCBib29sPihvYmplY3QsIG5hbWUsIHByb3RvY29sRXJyb3JzLCBOdWxsb3B0LCBB c01ldGhvZEJyaWRnZXM6OmFzQm9vbGVhbiwgIkJvb2xlYW4iKTsKIH0KIAotUmVmUHRyPEluc3Bl Y3Rvck9iamVjdD4gQmFja2VuZERpc3BhdGNoZXI6OmdldE9iamVjdChJbnNwZWN0b3JPYmplY3Qq IG9iamVjdCwgY29uc3QgU3RyaW5nJiBuYW1lLCBib29sKiB2YWx1ZUZvdW5kLCBJbnNwZWN0b3I6 OlByb3RvY29sOjpBcnJheTxTdHJpbmc+JiBwcm90b2NvbEVycm9ycykKK1JlZlB0cjxJbnNwZWN0 b3JPYmplY3Q+IEJhY2tlbmREaXNwYXRjaGVyOjpnZXRPYmplY3QoY29uc3QgSW5zcGVjdG9yT2Jq ZWN0JiBvYmplY3QsIGNvbnN0IFN0cmluZyYgbmFtZSwgSW5zcGVjdG9yOjpQcm90b2NvbDo6QXJy YXk8U3RyaW5nPiYgcHJvdG9jb2xFcnJvcnMpCiB7Ci0gICAgcmV0dXJuIGdldFByb3BlcnR5VmFs dWU8UmVmUHRyPEluc3BlY3Rvck9iamVjdD4sIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+LCBJbnNw ZWN0b3JPYmplY3QqPihvYmplY3QsIG5hbWUsIHZhbHVlRm91bmQsIHByb3RvY29sRXJyb3JzLCBu dWxscHRyLCBBc01ldGhvZEJyaWRnZXM6OmFzT2JqZWN0LCAiT2JqZWN0Iik7CisgICAgcmV0dXJu IGdldFByb3BlcnR5VmFsdWU8UmVmUHRyPEluc3BlY3Rvck9iamVjdD4sIFJlZlB0cjxJbnNwZWN0 b3JPYmplY3Q+PihvYmplY3QsIG5hbWUsIHByb3RvY29sRXJyb3JzLCBBc01ldGhvZEJyaWRnZXM6 OmFzT2JqZWN0LCAiT2JqZWN0Iik7CiB9CiAKLVJlZlB0cjxJbnNwZWN0b3JBcnJheT4gQmFja2Vu ZERpc3BhdGNoZXI6OmdldEFycmF5KEluc3BlY3Rvck9iamVjdCogb2JqZWN0LCBjb25zdCBTdHJp bmcmIG5hbWUsIGJvb2wqIHZhbHVlRm91bmQsIEluc3BlY3Rvcjo6UHJvdG9jb2w6OkFycmF5PFN0 cmluZz4mIHByb3RvY29sRXJyb3JzKQorUmVmUHRyPEluc3BlY3RvckFycmF5PiBCYWNrZW5kRGlz cGF0Y2hlcjo6Z2V0QXJyYXkoY29uc3QgSW5zcGVjdG9yT2JqZWN0JiBvYmplY3QsIGNvbnN0IFN0 cmluZyYgbmFtZSwgSW5zcGVjdG9yOjpQcm90b2NvbDo6QXJyYXk8U3RyaW5nPiYgcHJvdG9jb2xF cnJvcnMpCiB7Ci0gICAgcmV0dXJuIGdldFByb3BlcnR5VmFsdWU8UmVmUHRyPEluc3BlY3RvckFy cmF5PiwgUmVmUHRyPEluc3BlY3RvckFycmF5PiwgSW5zcGVjdG9yQXJyYXkqPihvYmplY3QsIG5h bWUsIHZhbHVlRm91bmQsIHByb3RvY29sRXJyb3JzLCBudWxscHRyLCBBc01ldGhvZEJyaWRnZXM6 OmFzQXJyYXksICJBcnJheSIpOworICAgIHJldHVybiBnZXRQcm9wZXJ0eVZhbHVlPFJlZlB0cjxJ bnNwZWN0b3JBcnJheT4sIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4+KG9iamVjdCwgbmFtZSwgcHJv dG9jb2xFcnJvcnMsIEFzTWV0aG9kQnJpZGdlczo6YXNBcnJheSwgIkFycmF5Iik7CiB9CiAKLVJl ZlB0cjxJbnNwZWN0b3JWYWx1ZT4gQmFja2VuZERpc3BhdGNoZXI6OmdldFZhbHVlKEluc3BlY3Rv ck9iamVjdCogb2JqZWN0LCBjb25zdCBTdHJpbmcmIG5hbWUsIGJvb2wqIHZhbHVlRm91bmQsIElu c3BlY3Rvcjo6UHJvdG9jb2w6OkFycmF5PFN0cmluZz4mIHByb3RvY29sRXJyb3JzKQorUmVmUHRy PEluc3BlY3RvclZhbHVlPiBCYWNrZW5kRGlzcGF0Y2hlcjo6Z2V0VmFsdWUoY29uc3QgSW5zcGVj dG9yT2JqZWN0JiBvYmplY3QsIGNvbnN0IFN0cmluZyYgbmFtZSwgSW5zcGVjdG9yOjpQcm90b2Nv bDo6QXJyYXk8U3RyaW5nPiYgcHJvdG9jb2xFcnJvcnMpCiB7Ci0gICAgcmV0dXJuIGdldFByb3Bl cnR5VmFsdWU8UmVmUHRyPEluc3BlY3RvclZhbHVlPiwgUmVmUHRyPEluc3BlY3RvclZhbHVlPiwg SW5zcGVjdG9yVmFsdWUqPihvYmplY3QsIG5hbWUsIHZhbHVlRm91bmQsIHByb3RvY29sRXJyb3Jz LCBudWxscHRyLCBBc01ldGhvZEJyaWRnZXM6OmFzVmFsdWUsICJWYWx1ZSIpOworICAgIHJldHVy biBnZXRQcm9wZXJ0eVZhbHVlPFJlZlB0cjxJbnNwZWN0b3JWYWx1ZT4sIFJlZlB0cjxJbnNwZWN0 b3JWYWx1ZT4+KG9iamVjdCwgbmFtZSwgcHJvdG9jb2xFcnJvcnMsIEFzTWV0aG9kQnJpZGdlczo6 YXNWYWx1ZSwgIlZhbHVlIik7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIEluc3BlY3RvcgpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kRGlz cGF0Y2hlci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCYWNr ZW5kRGlzcGF0Y2hlci5oCmluZGV4IGIzMDM3MDBhMjA5YmIyMjI2NmJhZThmNGU0ZGU4ZGQzMjZm Yjk0YjcuLmUwNjVkMmVlN2M4YmI5NGI3ZTA0ODc5MTZiYzY3Njg4NTdhNTI4ODAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQmFja2VuZERpc3Bh dGNoZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJh Y2tlbmREaXNwYXRjaGVyLmgKQEAgLTg3LDEzICs4NywxMyBAQCBwdWJsaWM6CiAgICAgdm9pZCBy ZXBvcnRQcm90b2NvbEVycm9yKGNvbnN0IGxvbmcqIGNvbnN0IGNhbGxJZCwgQ29tbW9uRXJyb3JD b2RlLCBjb25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSkgY29uc3Q7CiAgICAgdm9pZCByZXBvcnRQ cm90b2NvbEVycm9yKGNvbnN0IGxvbmcqIGNvbnN0IGNhbGxJZCwgQ29tbW9uRXJyb3JDb2RlLCBj b25zdCBTdHJpbmcmIGVycm9yTWVzc2FnZSwgUmVmUHRyPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkFy cmF5PFN0cmluZz4+JiYgZGF0YSkgY29uc3Q7CiAKLSAgICBzdGF0aWMgaW50IGdldEludGVnZXIo SW5zcGVjdG9yT2JqZWN0KiwgY29uc3QgU3RyaW5nJiBuYW1lLCBib29sKiB2YWx1ZUZvdW5kLCBJ bnNwZWN0b3I6OlByb3RvY29sOjpBcnJheTxTdHJpbmc+JiBwcm90b2NvbEVycm9ycyk7Ci0gICAg c3RhdGljIGRvdWJsZSBnZXREb3VibGUoSW5zcGVjdG9yT2JqZWN0KiwgY29uc3QgU3RyaW5nJiBu YW1lLCBib29sKiB2YWx1ZUZvdW5kLCBJbnNwZWN0b3I6OlByb3RvY29sOjpBcnJheTxTdHJpbmc+ JiBwcm90b2NvbEVycm9ycyk7Ci0gICAgc3RhdGljIFN0cmluZyBnZXRTdHJpbmcoSW5zcGVjdG9y T2JqZWN0KiwgY29uc3QgU3RyaW5nJiBuYW1lLCBib29sKiB2YWx1ZUZvdW5kLCBJbnNwZWN0b3I6 OlByb3RvY29sOjpBcnJheTxTdHJpbmc+JiBwcm90b2NvbEVycm9ycyk7Ci0gICAgc3RhdGljIGJv b2wgZ2V0Qm9vbGVhbihJbnNwZWN0b3JPYmplY3QqLCBjb25zdCBTdHJpbmcmIG5hbWUsIGJvb2wq IHZhbHVlRm91bmQsIEluc3BlY3Rvcjo6UHJvdG9jb2w6OkFycmF5PFN0cmluZz4mIHByb3RvY29s RXJyb3JzKTsKLSAgICBzdGF0aWMgUmVmUHRyPEluc3BlY3RvclZhbHVlPiBnZXRWYWx1ZShJbnNw ZWN0b3JPYmplY3QqLCBjb25zdCBTdHJpbmcmIG5hbWUsIGJvb2wqIHZhbHVlRm91bmQsIEluc3Bl Y3Rvcjo6UHJvdG9jb2w6OkFycmF5PFN0cmluZz4mIHByb3RvY29sRXJyb3JzKTsKLSAgICBzdGF0 aWMgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZ2V0T2JqZWN0KEluc3BlY3Rvck9iamVjdCosIGNv bnN0IFN0cmluZyYgbmFtZSwgYm9vbCogdmFsdWVGb3VuZCwgSW5zcGVjdG9yOjpQcm90b2NvbDo6 QXJyYXk8U3RyaW5nPiYgcHJvdG9jb2xFcnJvcnMpOwotICAgIHN0YXRpYyBSZWZQdHI8SW5zcGVj dG9yQXJyYXk+IGdldEFycmF5KEluc3BlY3Rvck9iamVjdCosIGNvbnN0IFN0cmluZyYgbmFtZSwg Ym9vbCogdmFsdWVGb3VuZCwgSW5zcGVjdG9yOjpQcm90b2NvbDo6QXJyYXk8U3RyaW5nPiYgcHJv dG9jb2xFcnJvcnMpOworICAgIHN0YXRpYyBPcHRpb25hbDxpbnQ+IGdldEludGVnZXIoY29uc3Qg SW5zcGVjdG9yT2JqZWN0JiwgY29uc3QgU3RyaW5nJiBuYW1lLCBJbnNwZWN0b3I6OlByb3RvY29s OjpBcnJheTxTdHJpbmc+JiBwcm90b2NvbEVycm9ycyk7CisgICAgc3RhdGljIE9wdGlvbmFsPGRv dWJsZT4gZ2V0RG91YmxlKGNvbnN0IEluc3BlY3Rvck9iamVjdCYsIGNvbnN0IFN0cmluZyYgbmFt ZSwgSW5zcGVjdG9yOjpQcm90b2NvbDo6QXJyYXk8U3RyaW5nPiYgcHJvdG9jb2xFcnJvcnMpOwor ICAgIHN0YXRpYyBPcHRpb25hbDxTdHJpbmc+IGdldFN0cmluZyhjb25zdCBJbnNwZWN0b3JPYmpl Y3QmLCBjb25zdCBTdHJpbmcmIG5hbWUsIEluc3BlY3Rvcjo6UHJvdG9jb2w6OkFycmF5PFN0cmlu Zz4mIHByb3RvY29sRXJyb3JzKTsKKyAgICBzdGF0aWMgT3B0aW9uYWw8Ym9vbD4gZ2V0Qm9vbGVh bihjb25zdCBJbnNwZWN0b3JPYmplY3QmLCBjb25zdCBTdHJpbmcmIG5hbWUsIEluc3BlY3Rvcjo6 UHJvdG9jb2w6OkFycmF5PFN0cmluZz4mIHByb3RvY29sRXJyb3JzKTsKKyAgICBzdGF0aWMgUmVm UHRyPEluc3BlY3RvclZhbHVlPiBnZXRWYWx1ZShjb25zdCBJbnNwZWN0b3JPYmplY3QmLCBjb25z dCBTdHJpbmcmIG5hbWUsIEluc3BlY3Rvcjo6UHJvdG9jb2w6OkFycmF5PFN0cmluZz4mIHByb3Rv Y29sRXJyb3JzKTsKKyAgICBzdGF0aWMgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gZ2V0T2JqZWN0 KGNvbnN0IEluc3BlY3Rvck9iamVjdCYsIGNvbnN0IFN0cmluZyYgbmFtZSwgSW5zcGVjdG9yOjpQ cm90b2NvbDo6QXJyYXk8U3RyaW5nPiYgcHJvdG9jb2xFcnJvcnMpOworICAgIHN0YXRpYyBSZWZQ dHI8SW5zcGVjdG9yQXJyYXk+IGdldEFycmF5KGNvbnN0IEluc3BlY3Rvck9iamVjdCYsIGNvbnN0 IFN0cmluZyYgbmFtZSwgSW5zcGVjdG9yOjpQcm90b2NvbDo6QXJyYXk8U3RyaW5nPiYgcHJvdG9j b2xFcnJvcnMpOwogCiBwcml2YXRlOgogICAgIEJhY2tlbmREaXNwYXRjaGVyKEZyb250ZW5kQ2hh bm5lbCogRnJvbnRlbmRDaGFubmVsKQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vY3BwX2dlbmVyYXRvci5weSBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2NwcF9nZW5lcmF0b3IucHkKaW5k ZXggZWRkMzMwZGE0OGQwMWEzMjUwOTYzZmQwMWRlMmI5ODQxMGQ5MTBiMC4uOWI5ZGM2YzljYzYz MWZhMDEwZmUxZGQyNjNjZDYyNmQ4M2I5N2ViOSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2luc3BlY3Rvci9zY3JpcHRzL2NvZGVnZW4vY3BwX2dlbmVyYXRvci5weQorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9jcHBfZ2VuZXJh dG9yLnB5CkBAIC0xMjIsMTkgKzEyMiwxOSBAQCBjbGFzcyBDcHBHZW5lcmF0b3I6CiAgICAgICAg IGlmIGlzaW5zdGFuY2UoX3R5cGUsIE9iamVjdFR5cGUpIG9yIF90eXBlLnF1YWxpZmllZF9uYW1l KCkgaXMgJ29iamVjdCc6CiAgICAgICAgICAgICBjcHBfbmFtZSA9ICdJbnNwZWN0b3I6Okluc3Bl Y3Rvck9iamVjdCcKICAgICAgICAgICAgIGlmIHBhcmFtZXRlci5pc19vcHRpb25hbDoKLSAgICAg ICAgICAgICAgICByZXR1cm4gJ2NvbnN0ICVzKicgJSBjcHBfbmFtZQorICAgICAgICAgICAgICAg IHJldHVybiAnY29uc3QgT3B0aW9uYWw8JXM+JicgJSBjcHBfbmFtZQogICAgICAgICAgICAgZWxz ZToKICAgICAgICAgICAgICAgICByZXR1cm4gJ2NvbnN0ICVzJicgJSBjcHBfbmFtZQogICAgICAg ICBpZiBpc2luc3RhbmNlKF90eXBlLCBBcnJheVR5cGUpOgogICAgICAgICAgICAgY3BwX25hbWUg PSAnSW5zcGVjdG9yOjpJbnNwZWN0b3JBcnJheScKICAgICAgICAgICAgIGlmIHBhcmFtZXRlci5p c19vcHRpb25hbDoKLSAgICAgICAgICAgICAgICByZXR1cm4gJ2NvbnN0ICVzKicgJSBjcHBfbmFt ZQorICAgICAgICAgICAgICAgIHJldHVybiAnY29uc3QgT3B0aW9uYWw8JXM+JicgJSBjcHBfbmFt ZQogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICByZXR1cm4gJ2NvbnN0ICVzJicg JSBjcHBfbmFtZQogICAgICAgICBpZiBpc2luc3RhbmNlKF90eXBlLCBQcmltaXRpdmVUeXBlKToK ICAgICAgICAgICAgIGNwcF9uYW1lID0gQ3BwR2VuZXJhdG9yLmNwcF9uYW1lX2Zvcl9wcmltaXRp dmVfdHlwZShfdHlwZSkKICAgICAgICAgICAgIGlmIHBhcmFtZXRlci5pc19vcHRpb25hbDoKLSAg ICAgICAgICAgICAgICByZXR1cm4gJ2NvbnN0ICVzKicgJSBjcHBfbmFtZQorICAgICAgICAgICAg ICAgIHJldHVybiAnY29uc3QgT3B0aW9uYWw8JXM+JicgJSBjcHBfbmFtZQogICAgICAgICAgICAg ZWxpZiBfdHlwZS5yYXdfbmFtZSgpIGluIFsnc3RyaW5nJ106CiAgICAgICAgICAgICAgICAgcmV0 dXJuICdjb25zdCAlcyYnICUgY3BwX25hbWUKICAgICAgICAgICAgIGVsc2U6CmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL3NjcmlwdHMvY29kZWdlbi9nZW5lcmF0 ZV9jcHBfYmFja2VuZF9kaXNwYXRjaGVyX2hlYWRlci5weSBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRlX2NwcF9iYWNrZW5kX2Rpc3BhdGNo ZXJfaGVhZGVyLnB5CmluZGV4IDU0YmRiM2U5MWFjMDcxNWQ3YTZjZTJiMzZmNTVjYzNmMjQzMTVh ZDYuLjY4MzU3NWViMzg5Mjc1OWM1NDJiNjQzOTRjNTE2OWQ4Yzc1M2IwZjQgMTAwNzU1Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRl X2NwcF9iYWNrZW5kX2Rpc3BhdGNoZXJfaGVhZGVyLnB5CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9pbnNwZWN0b3Ivc2NyaXB0cy9jb2RlZ2VuL2dlbmVyYXRlX2NwcF9iYWNrZW5kX2Rpc3Bh dGNoZXJfaGVhZGVyLnB5CkBAIC01Miw2ICs1Miw3IEBAIGNsYXNzIENwcEJhY2tlbmREaXNwYXRj aGVySGVhZGVyR2VuZXJhdG9yKEdlbmVyYXRvcik6CiAgICAgICAgIGhlYWRlcnMgPSBbCiAgICAg ICAgICAgICAnIkluc3BlY3RvclByb3RvY29sT2JqZWN0cy5oIicsCiAgICAgICAgICAgICAnPGlu c3BlY3Rvci9JbnNwZWN0b3JCYWNrZW5kRGlzcGF0Y2hlci5oPicsCisgICAgICAgICAgICAnPHd0 Zi9PcHRpb25hbC5oPicsCiAgICAgICAgICAgICAnPHd0Zi90ZXh0L1dURlN0cmluZy5oPiddCiAK ICAgICAgICAgdHlwZWRlZnMgPSBbKCdTdHJpbmcnLCAnRXJyb3JTdHJpbmcnKV0K