52806 2011-01-20 05:46:19 -0800 Web Inspector: cleanup InspectorController's friends list. 2011-01-20 06:51:15 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 loislo loislo apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 337294 0 loislo 2011-01-20 05:46:19 -0800 %subj% 337304 1 79590 loislo 2011-01-20 06:10:39 -0800 Created attachment 79590 [patch] initial version 337319 2 79590 loislo 2011-01-20 06:50:57 -0800 Comment on attachment 79590 [patch] initial version Clearing flags on attachment: 79590 Committed r76240: <http://trac.webkit.org/changeset/76240> 337320 3 loislo 2011-01-20 06:51:15 -0800 All reviewed patches have been landed. Closing bug. 79590 2011-01-20 06:10:39 -0800 2011-01-20 06:50:56 -0800 [patch] initial version patch text/plain 20107 loislo ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiMzhjZWI4Li5kOWJhNzUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTAg QEAKKzIwMTEtMDEtMjAgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IGNsZWFudXAgSW5zcGVjdG9yQ29udHJvbGxlcidzIGZyaWVuZHMgbGlzdC4KKyAgICAg ICAgV2UgaGF2ZSBhIHBsYW4gdG8gZXh0cmFjdCBJbnNwZWN0b3JBZ2VudCBmcm9tIEluc3BlY3Rv ckNvbnRyb2xsZXIuCisgICAgICAgIEluc3BlY3RvckFnZW50IHdpbGwgYmUgYWNjZXNzaWJsZSBv bmx5IGZyb20gSW5zcGVjdG9yQ29udHJvbGxlci4KKyAgICAgICAgQXMgcmVzdWx0IHdlIGNhbiBz aW1wbHkgbWFkZSBzb21lIG1ldGhvZHMgcHVibGljIGFuZCByZW1vdmUgbG9uZworICAgICAgICBm cmllbmRzIGxpc3QuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTUyODA2CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRIb3N0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkluamVjdGVkU2NyaXB0SG9zdDo6ZGF0YWJhc2VGb3JJZCk6 CisgICAgICAgIChXZWJDb3JlOjpJbmplY3RlZFNjcmlwdEhvc3Q6OnNlbGVjdERhdGFiYXNlKToK KyAgICAgICAgKFdlYkNvcmU6OkluamVjdGVkU2NyaXB0SG9zdDo6c2VsZWN0RE9NU3RvcmFnZSk6 CisgICAgICAgIChXZWJDb3JlOjpJbmplY3RlZFNjcmlwdEhvc3Q6Omluc3BlY3RvckRPTUFnZW50 KToKKyAgICAgICAgKFdlYkNvcmU6OkluamVjdGVkU2NyaXB0SG9zdDo6ZnJvbnRlbmQpOgorICAg ICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JCcm93c2VyRGVidWdnZXJBZ2VudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JCcm93c2VyRGVidWdnZXJBZ2VudDo6c2V0RE9NQnJlYWtw b2ludCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JCcm93c2VyRGVidWdnZXJBZ2VudDo6 cmVtb3ZlRE9NQnJlYWtwb2ludCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JCcm93c2Vy RGVidWdnZXJBZ2VudDo6d2lsbEluc2VydERPTU5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5z cGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQ6OndpbGxSZW1vdmVET01Ob2RlKToKKyAgICAgICAg KFdlYkNvcmU6Okluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50Ojp3aWxsTW9kaWZ5RE9NQXR0 cik6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JCcm93c2VyRGVidWdnZXJBZ2VudDo6ZGVz Y3JpcHRpb25Gb3JET01FdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JCcm93c2Vy RGVidWdnZXJBZ2VudDo6cGF1c2VPbk5hdGl2ZUV2ZW50SWZOZWVkZWQpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQ6OndpbGxTZW5kWE1MSHR0cFJlcXVl c3QpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmg6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpmcm9udGVuZCk6CisgICAgICAgICogaW5z cGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxJbnNlcnRET01Ob2RlSW1wbCk6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZEluc2VydERPTU5vZGVJbXBs KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d2lsbFJlbW92 ZURPTU5vZGVJbXBsKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlv bjo6ZGlkUmVtb3ZlRE9NTm9kZUltcGwpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uOjp3aWxsTW9kaWZ5RE9NQXR0ckltcGwpOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRNb2RpZnlET01BdHRySW1wbCk6CisgICAgICAg IChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmNoYXJhY3RlckRhdGFNb2RpZmll ZEltcGwpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxs U2VuZFhNTEh0dHBSZXF1ZXN0SW1wbCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb246OmRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlSW1wbCk6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZEZhaWxMb2FkaW5nSW1wbCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnJlc291cmNlUmV0cmll dmVkQnlYTUxIdHRwUmVxdWVzdEltcGwpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5z dHJ1bWVudGF0aW9uOjphZGRTdGFydFByb2ZpbGluZ01lc3NhZ2VUb0NvbnNvbGVJbXBsKToKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6cGF1c2VPbk5hdGl2ZUV2 ZW50SWZOZWVkZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u OjpjYW5jZWxQYXVzZU9uTmF0aXZlRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjpyZXRyaWV2ZVRpbWVsaW5lQWdlbnQpOgorICAgICAgICAoV2ViQ29y ZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpyZXRyaWV2ZVJlc291cmNlQWdlbnQpOgorCiAy MDExLTAxLTE5ICBTdGVwaGVuIFdoaXRlICA8c2Vub3JibGFuY29AY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFtSZS1sYW5kIG9mIHI3NjE1OSB3aXRoIGEgY29tcGlsZSBmaXggZm9yIHRoZSBDaHJv bWl1bSBsaW51eCBzaGxpYgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu amVjdGVkU2NyaXB0SG9zdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRT Y3JpcHRIb3N0LmNwcAppbmRleCBiZTViMTIxLi5kNjdhZGFmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcApAQCAtMTMwLDIzICsxMzAsMjMg QEAgbG9uZyBJbmplY3RlZFNjcmlwdEhvc3Q6Omluc3BlY3RlZE5vZGUodW5zaWduZWQgbG9uZyBu dW0pCiAjaWYgRU5BQkxFKERBVEFCQVNFKQogRGF0YWJhc2UqIEluamVjdGVkU2NyaXB0SG9zdDo6 ZGF0YWJhc2VGb3JJZChsb25nIGRhdGFiYXNlSWQpCiB7Ci0gICAgaWYgKG1faW5zcGVjdG9yQ29u dHJvbGxlciAmJiBtX2luc3BlY3RvckNvbnRyb2xsZXItPm1fZGF0YWJhc2VBZ2VudCkKLSAgICAg ICAgcmV0dXJuIG1faW5zcGVjdG9yQ29udHJvbGxlci0+bV9kYXRhYmFzZUFnZW50LT5kYXRhYmFz ZUZvcklkKGRhdGFiYXNlSWQpOworICAgIGlmIChtX2luc3BlY3RvckNvbnRyb2xsZXIgJiYgbV9p bnNwZWN0b3JDb250cm9sbGVyLT5kYXRhYmFzZUFnZW50KCkpCisgICAgICAgIHJldHVybiBtX2lu c3BlY3RvckNvbnRyb2xsZXItPmRhdGFiYXNlQWdlbnQoKS0+ZGF0YWJhc2VGb3JJZChkYXRhYmFz ZUlkKTsKICAgICByZXR1cm4gMDsKIH0KIAogdm9pZCBJbmplY3RlZFNjcmlwdEhvc3Q6OnNlbGVj dERhdGFiYXNlKERhdGFiYXNlKiBkYXRhYmFzZSkKIHsKLSAgICBpZiAobV9pbnNwZWN0b3JDb250 cm9sbGVyICYmIG1faW5zcGVjdG9yQ29udHJvbGxlci0+bV9kYXRhYmFzZUFnZW50KQotICAgICAg ICBtX2luc3BlY3RvckNvbnRyb2xsZXItPm1fZGF0YWJhc2VBZ2VudC0+c2VsZWN0RGF0YWJhc2Uo ZGF0YWJhc2UpOworICAgIGlmIChtX2luc3BlY3RvckNvbnRyb2xsZXIgJiYgbV9pbnNwZWN0b3JD b250cm9sbGVyLT5kYXRhYmFzZUFnZW50KCkpCisgICAgICAgIG1faW5zcGVjdG9yQ29udHJvbGxl ci0+ZGF0YWJhc2VBZ2VudCgpLT5zZWxlY3REYXRhYmFzZShkYXRhYmFzZSk7CiB9CiAjZW5kaWYK IAogI2lmIEVOQUJMRShET01fU1RPUkFHRSkKIHZvaWQgSW5qZWN0ZWRTY3JpcHRIb3N0OjpzZWxl Y3RET01TdG9yYWdlKFN0b3JhZ2UqIHN0b3JhZ2UpCiB7Ci0gICAgaWYgKG1faW5zcGVjdG9yQ29u dHJvbGxlciAmJiBtX2luc3BlY3RvckNvbnRyb2xsZXItPm1fZG9tU3RvcmFnZUFnZW50KQotICAg ICAgICBtX2luc3BlY3RvckNvbnRyb2xsZXItPm1fZG9tU3RvcmFnZUFnZW50LT5zZWxlY3RET01T dG9yYWdlKHN0b3JhZ2UpOworICAgIGlmIChtX2luc3BlY3RvckNvbnRyb2xsZXIgJiYgbV9pbnNw ZWN0b3JDb250cm9sbGVyLT5kb21TdG9yYWdlQWdlbnQoKSkKKyAgICAgICAgbV9pbnNwZWN0b3JD b250cm9sbGVyLT5kb21TdG9yYWdlQWdlbnQoKS0+c2VsZWN0RE9NU3RvcmFnZShzdG9yYWdlKTsK IH0KICNlbmRpZgogCkBAIC0xOTQsMTQgKzE5NCwxNCBAQCBJbnNwZWN0b3JET01BZ2VudCogSW5q ZWN0ZWRTY3JpcHRIb3N0OjppbnNwZWN0b3JET01BZ2VudCgpCiB7CiAgICAgaWYgKCFtX2luc3Bl Y3RvckNvbnRyb2xsZXIpCiAgICAgICAgIHJldHVybiAwOwotICAgIHJldHVybiBtX2luc3BlY3Rv ckNvbnRyb2xsZXItPm1fZG9tQWdlbnQuZ2V0KCk7CisgICAgcmV0dXJuIG1faW5zcGVjdG9yQ29u dHJvbGxlci0+ZG9tQWdlbnQoKTsKIH0KIAogSW5zcGVjdG9yRnJvbnRlbmQqIEluamVjdGVkU2Ny aXB0SG9zdDo6ZnJvbnRlbmQoKQogewogICAgIGlmICghbV9pbnNwZWN0b3JDb250cm9sbGVyKQog ICAgICAgICByZXR1cm4gMDsKLSAgICByZXR1cm4gbV9pbnNwZWN0b3JDb250cm9sbGVyLT5tX2Zy b250ZW5kLmdldCgpOworICAgIHJldHVybiBtX2luc3BlY3RvckNvbnRyb2xsZXItPmZyb250ZW5k KCk7CiB9CiAKIFN0cmluZyBJbmplY3RlZFNjcmlwdEhvc3Q6OmluamVjdGVkU2NyaXB0U291cmNl KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCcm93c2Vy RGVidWdnZXJBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQnJv d3NlckRlYnVnZ2VyQWdlbnQuY3BwCmluZGV4IGEzM2JhY2MuLjkwNjE4MWUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JCcm93c2VyRGVidWdnZXJBZ2VudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckJyb3dzZXJEZWJ1Z2dl ckFnZW50LmNwcApAQCAtMTE2LDcgKzExNiw3IEBAIHZvaWQgSW5zcGVjdG9yQnJvd3NlckRlYnVn Z2VyQWdlbnQ6OmRpZFJlbW92ZURPTU5vZGUoTm9kZSogbm9kZSkKIAogdm9pZCBJbnNwZWN0b3JC cm93c2VyRGVidWdnZXJBZ2VudDo6c2V0RE9NQnJlYWtwb2ludChsb25nIG5vZGVJZCwgbG9uZyB0 eXBlKQogewotICAgIE5vZGUqIG5vZGUgPSBtX2luc3BlY3RvckNvbnRyb2xsZXItPm1fZG9tQWdl bnQtPm5vZGVGb3JJZChub2RlSWQpOworICAgIE5vZGUqIG5vZGUgPSBtX2luc3BlY3RvckNvbnRy b2xsZXItPmRvbUFnZW50KCktPm5vZGVGb3JJZChub2RlSWQpOwogICAgIGlmICghbm9kZSkKICAg ICAgICAgcmV0dXJuOwogCkBAIC0xMzAsNyArMTMwLDcgQEAgdm9pZCBJbnNwZWN0b3JCcm93c2Vy RGVidWdnZXJBZ2VudDo6c2V0RE9NQnJlYWtwb2ludChsb25nIG5vZGVJZCwgbG9uZyB0eXBlKQog CiB2b2lkIEluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50OjpyZW1vdmVET01CcmVha3BvaW50 KGxvbmcgbm9kZUlkLCBsb25nIHR5cGUpCiB7Ci0gICAgTm9kZSogbm9kZSA9IG1faW5zcGVjdG9y Q29udHJvbGxlci0+bV9kb21BZ2VudC0+bm9kZUZvcklkKG5vZGVJZCk7CisgICAgTm9kZSogbm9k ZSA9IG1faW5zcGVjdG9yQ29udHJvbGxlci0+ZG9tQWdlbnQoKS0+bm9kZUZvcklkKG5vZGVJZCk7 CiAgICAgaWYgKCFub2RlKQogICAgICAgICByZXR1cm47CiAKQEAgLTE0OSw3ICsxNDksNyBAQCB2 b2lkIEluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50OjpyZW1vdmVET01CcmVha3BvaW50KGxv bmcgbm9kZUlkLCBsb25nIHR5cGUpCiAKIHZvaWQgSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdl bnQ6OndpbGxJbnNlcnRET01Ob2RlKE5vZGUqLCBOb2RlKiBwYXJlbnQpCiB7Ci0gICAgSW5zcGVj dG9yRGVidWdnZXJBZ2VudCogZGVidWdnZXJBZ2VudCA9IG1faW5zcGVjdG9yQ29udHJvbGxlci0+ bV9kZWJ1Z2dlckFnZW50LmdldCgpOworICAgIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQqIGRlYnVn Z2VyQWdlbnQgPSBtX2luc3BlY3RvckNvbnRyb2xsZXItPmRlYnVnZ2VyQWdlbnQoKTsKICAgICBp ZiAoIWRlYnVnZ2VyQWdlbnQpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTYzLDcgKzE2Myw3IEBA IHZvaWQgSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQ6OndpbGxJbnNlcnRET01Ob2RlKE5v ZGUqLCBOb2RlKiBwYXJlbnQpCiAKIHZvaWQgSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQ6 OndpbGxSZW1vdmVET01Ob2RlKE5vZGUqIG5vZGUpCiB7Ci0gICAgSW5zcGVjdG9yRGVidWdnZXJB Z2VudCogZGVidWdnZXJBZ2VudCA9IG1faW5zcGVjdG9yQ29udHJvbGxlci0+bV9kZWJ1Z2dlckFn ZW50LmdldCgpOworICAgIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQqIGRlYnVnZ2VyQWdlbnQgPSBt X2luc3BlY3RvckNvbnRyb2xsZXItPmRlYnVnZ2VyQWdlbnQoKTsKICAgICBpZiAoIWRlYnVnZ2Vy QWdlbnQpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTgyLDcgKzE4Miw3IEBAIHZvaWQgSW5zcGVj dG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQ6OndpbGxSZW1vdmVET01Ob2RlKE5vZGUqIG5vZGUpCiAK IHZvaWQgSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQ6OndpbGxNb2RpZnlET01BdHRyKEVs ZW1lbnQqIGVsZW1lbnQpCiB7Ci0gICAgSW5zcGVjdG9yRGVidWdnZXJBZ2VudCogZGVidWdnZXJB Z2VudCA9IG1faW5zcGVjdG9yQ29udHJvbGxlci0+bV9kZWJ1Z2dlckFnZW50LmdldCgpOworICAg IEluc3BlY3RvckRlYnVnZ2VyQWdlbnQqIGRlYnVnZ2VyQWdlbnQgPSBtX2luc3BlY3RvckNvbnRy b2xsZXItPmRlYnVnZ2VyQWdlbnQoKTsKICAgICBpZiAoIWRlYnVnZ2VyQWdlbnQpCiAgICAgICAg IHJldHVybjsKIApAQCAtMjAyLDcgKzIwMiw3IEBAIHZvaWQgSW5zcGVjdG9yQnJvd3NlckRlYnVn Z2VyQWdlbnQ6OmRlc2NyaXB0aW9uRm9yRE9NRXZlbnQoTm9kZSogdGFyZ2V0LCBsb25nIGJyCiAg ICAgaWYgKCgxIDw8IGJyZWFrcG9pbnRUeXBlKSAmIGluaGVyaXRhYmxlRE9NQnJlYWtwb2ludFR5 cGVzTWFzaykgewogICAgICAgICAvLyBGb3IgaW5oZXJpdGFibGUgYnJlYWtwb2ludCB0eXBlcywg dGFyZ2V0IG5vZGUgaXNuJ3QgYWx3YXlzIHRoZSBzYW1lIGFzIHRoZSBub2RlIHRoYXQgb3ducyBh IGJyZWFrcG9pbnQuCiAgICAgICAgIC8vIFRhcmdldCBub2RlIG1heSBiZSB1bmtub3duIHRvIGZy b250ZW5kLCBzbyB3ZSBuZWVkIHRvIHB1c2ggaXQgZmlyc3QuCi0gICAgICAgIGxvbmcgdGFyZ2V0 Tm9kZUlkID0gbV9pbnNwZWN0b3JDb250cm9sbGVyLT5tX2RvbUFnZW50LT5wdXNoTm9kZVBhdGhU b0Zyb250ZW5kKHRhcmdldCk7CisgICAgICAgIGxvbmcgdGFyZ2V0Tm9kZUlkID0gbV9pbnNwZWN0 b3JDb250cm9sbGVyLT5kb21BZ2VudCgpLT5wdXNoTm9kZVBhdGhUb0Zyb250ZW5kKHRhcmdldCk7 CiAgICAgICAgIEFTU0VSVCh0YXJnZXROb2RlSWQpOwogICAgICAgICBkZXNjcmlwdGlvbi0+c2V0 TnVtYmVyKCJ0YXJnZXROb2RlSWQiLCB0YXJnZXROb2RlSWQpOwogCkBAIC0yMTksNyArMjE5LDcg QEAgdm9pZCBJbnNwZWN0b3JCcm93c2VyRGVidWdnZXJBZ2VudDo6ZGVzY3JpcHRpb25Gb3JET01F dmVudChOb2RlKiB0YXJnZXQsIGxvbmcgYnIKICAgICAgICAgICAgIGRlc2NyaXB0aW9uLT5zZXRC b29sZWFuKCJpbnNlcnRpb24iLCBpbnNlcnRpb24pOwogICAgIH0KIAotICAgIGxvbmcgYnJlYWtw b2ludE93bmVyTm9kZUlkID0gbV9pbnNwZWN0b3JDb250cm9sbGVyLT5tX2RvbUFnZW50LT5wdXNo Tm9kZVBhdGhUb0Zyb250ZW5kKGJyZWFrcG9pbnRPd25lcik7CisgICAgbG9uZyBicmVha3BvaW50 T3duZXJOb2RlSWQgPSBtX2luc3BlY3RvckNvbnRyb2xsZXItPmRvbUFnZW50KCktPnB1c2hOb2Rl UGF0aFRvRnJvbnRlbmQoYnJlYWtwb2ludE93bmVyKTsKICAgICBBU1NFUlQoYnJlYWtwb2ludE93 bmVyTm9kZUlkKTsKICAgICBkZXNjcmlwdGlvbi0+c2V0TnVtYmVyKCJub2RlSWQiLCBicmVha3Bv aW50T3duZXJOb2RlSWQpOwogICAgIGRlc2NyaXB0aW9uLT5zZXROdW1iZXIoInR5cGUiLCBicmVh a3BvaW50VHlwZSk7CkBAIC0yNTIsNyArMjUyLDcgQEAgdm9pZCBJbnNwZWN0b3JCcm93c2VyRGVi dWdnZXJBZ2VudDo6dXBkYXRlU3VidHJlZUJyZWFrcG9pbnRzKE5vZGUqIG5vZGUsIHVpbnQzMl8K IAogdm9pZCBJbnNwZWN0b3JCcm93c2VyRGVidWdnZXJBZ2VudDo6cGF1c2VPbk5hdGl2ZUV2ZW50 SWZOZWVkZWQoY29uc3QgU3RyaW5nJiBjYXRlZ29yeVR5cGUsIGNvbnN0IFN0cmluZyYgZXZlbnRO YW1lLCBib29sIHN5bmNocm9ub3VzKQogewotICAgIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQqIGRl YnVnZ2VyQWdlbnQgPSBtX2luc3BlY3RvckNvbnRyb2xsZXItPm1fZGVidWdnZXJBZ2VudC5nZXQo KTsKKyAgICBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50KiBkZWJ1Z2dlckFnZW50ID0gbV9pbnNwZWN0 b3JDb250cm9sbGVyLT5kZWJ1Z2dlckFnZW50KCk7CiAgICAgaWYgKCFkZWJ1Z2dlckFnZW50KQog ICAgICAgICByZXR1cm47CiAKQEAgLTI4Nyw3ICsyODcsNyBAQCB2b2lkIEluc3BlY3RvckJyb3dz ZXJEZWJ1Z2dlckFnZW50OjpyZW1vdmVYSFJCcmVha3BvaW50KGNvbnN0IFN0cmluZyYgdXJsKQog CiB2b2lkIEluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50Ojp3aWxsU2VuZFhNTEh0dHBSZXF1 ZXN0KGNvbnN0IFN0cmluZyYgdXJsKQogewotICAgIEluc3BlY3RvckRlYnVnZ2VyQWdlbnQqIGRl YnVnZ2VyQWdlbnQgPSBtX2luc3BlY3RvckNvbnRyb2xsZXItPm1fZGVidWdnZXJBZ2VudC5nZXQo KTsKKyAgICBJbnNwZWN0b3JEZWJ1Z2dlckFnZW50KiBkZWJ1Z2dlckFnZW50ID0gbV9pbnNwZWN0 b3JDb250cm9sbGVyLT5kZWJ1Z2dlckFnZW50KCk7CiAgICAgaWYgKCFkZWJ1Z2dlckFnZW50KQog ICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y Q29udHJvbGxlci5oCmluZGV4IGFkZWUxYmUuLjdmZjg4ZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaApAQCAtMTQ0LDYgKzE0NCw3IEBAIHB1 YmxpYzoKICAgICB2b2lkIGNvbm5lY3RGcm9udGVuZCgpOwogICAgIHZvaWQgcmV1c2VGcm9udGVu ZCgpOwogICAgIHZvaWQgZGlzY29ubmVjdEZyb250ZW5kKCk7CisgICAgSW5zcGVjdG9yRnJvbnRl bmQqIGZyb250ZW5kKCkgY29uc3QgeyByZXR1cm4gbV9mcm9udGVuZC5nZXQoKTsgfQogCiAgICAg SW5zcGVjdG9yQ29udHJvbGxlciogaW5zcGVjdG9yQWdlbnQoKSB7IHJldHVybiB0aGlzOyB9CiAg ICAgSW5zcGVjdG9yQ29uc29sZUFnZW50KiBjb25zb2xlQWdlbnQoKSBjb25zdCB7IHJldHVybiBt X2NvbnNvbGVBZ2VudC5nZXQoKTsgfQpAQCAtMjU5LDE4ICsyNjAsMTkgQEAgcHVibGljOgogICAg IEluc3BlY3RvclN0YXRlKiBzdGF0ZSgpIHsgcmV0dXJuIG1fc3RhdGUuZ2V0KCk7IH0KICAgICBJ bnNwZWN0b3JTZXR0aW5ncyogc2V0dGluZ3MoKSB7IHJldHVybiBtX3NldHRpbmdzLmdldCgpOyB9 CiAKLXByaXZhdGU6Ci0gICAgZnJpZW5kIGNsYXNzIEluc3BlY3RvckJhY2tlbmQ7Ci0gICAgZnJp ZW5kIGNsYXNzIEluc3BlY3RvckJhY2tlbmREaXNwYXRjaGVyOwotICAgIGZyaWVuZCBjbGFzcyBJ bnNwZWN0b3JCcm93c2VyRGVidWdnZXJBZ2VudDsKLSAgICBmcmllbmQgY2xhc3MgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOwotICAgIGZyaWVuZCBjbGFzcyBJbmplY3RlZFNjcmlwdEhvc3Q7Ci0K LSAgICB2b2lkIHdpbGxTZW5kUmVxdWVzdChSZXNvdXJjZVJlcXVlc3QmKTsKKyAgICAvLyBJbnNw ZWN0b3JBZ2VudCBBUEkKKyAgICB2b2lkIGdldEluc3BlY3RvclN0YXRlKFJlZlB0cjxJbnNwZWN0 b3JPYmplY3Q+KiBzdGF0ZSk7CisgICAgdm9pZCBzZXRNb25pdG9yaW5nWEhSRW5hYmxlZChib29s IGVuYWJsZWQsIGJvb2wqIG5ld1N0YXRlKTsKKyAgICB2b2lkIHBvcHVsYXRlU2NyaXB0T2JqZWN0 cygpOworICAgIC8vIEZvbGxvd2luZyBhcmUgdXNlZCBmcm9tIEluc3BlY3RvckJhY2tlbmQgYW5k IGludGVybmFsbHkuCisgICAgdm9pZCBzZXRTZWFyY2hpbmdGb3JOb2RlKGJvb2wgZW5hYmxlZCwg Ym9vbCogbmV3U3RhdGUpOworICAgIHZvaWQgZGlkRXZhbHVhdGVGb3JUZXN0SW5Gcm9udGVuZChs b25nIGNhbGxJZCwgY29uc3QgU3RyaW5nJiBqc29uUmVzdWx0KTsKIAorICAgIC8vIEluc3BlY3Rv ckluc3RydW1lbnRhdGlvbiBBUEkKICAgICB2b2lkIGVuc3VyZVNldHRpbmdzTG9hZGVkKCk7Cisg ICAgdm9pZCB3aWxsU2VuZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0Jik7CiAKLSAgICB2b2lkIHBv cHVsYXRlU2NyaXB0T2JqZWN0cygpOworcHJpdmF0ZToKICAgICB2b2lkIHB1c2hEYXRhQ29sbGVj dGVkT2ZmbGluZSgpOwogICAgIHZvaWQgcmVzdG9yZURlYnVnZ2VyKCk7CiAgICAgZW51bSBQcm9m aWxlclJlc3RvcmVBY3Rpb24gewpAQCAtMjgxLDkgKzI4Myw2IEBAIHByaXZhdGU6CiAgICAgdm9p ZCB1bmJpbmRBbGxSZXNvdXJjZXMoKTsKICAgICB2b2lkIHNldFNlYXJjaGluZ0Zvck5vZGUoYm9v bCBlbmFibGVkKTsKIAotICAgIC8vIEZvbGxvd2luZyBhcmUgdXNlZCBmcm9tIEluc3BlY3RvckJh Y2tlbmQgYW5kIGludGVybmFsbHkuCi0gICAgdm9pZCBzZXRTZWFyY2hpbmdGb3JOb2RlKGJvb2wg ZW5hYmxlZCwgYm9vbCogbmV3U3RhdGUpOwotCiAgICAgdm9pZCByZWxlYXNlRnJvbnRlbmRMaWZl dGltZUFnZW50cygpOwogCiAjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCkBAIC0yOTcs NyArMjk2LDYgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgZm9jdXNOb2RlKCk7CiAgICAgYm9vbCBp c01haW5SZXNvdXJjZUxvYWRlcihEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBLVVJMJiBy ZXF1ZXN0VXJsKTsKLSAgICB2b2lkIGRpZEV2YWx1YXRlRm9yVGVzdEluRnJvbnRlbmQobG9uZyBj YWxsSWQsIGNvbnN0IFN0cmluZyYganNvblJlc3VsdCk7CiAKICAgICBQYWdlKiBtX2luc3BlY3Rl ZFBhZ2U7CiAgICAgSW5zcGVjdG9yQ2xpZW50KiBtX2NsaWVudDsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAKaW5kZXggYWE5 NDFkZi4uYzI4YTgyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvckluc3RydW1lbnRhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3Rvckluc3RydW1lbnRhdGlvbi5jcHAKQEAgLTkzLDE3ICs5MywxNyBAQCB2b2lkIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6aW5zcGVjdGVkUGFnZURlc3Ryb3llZEltcGwoSW5zcGVjdG9y Q29udHJvbGxlciogaQogdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxJbnNlcnRE T01Ob2RlSW1wbChJbnNwZWN0b3JDb250cm9sbGVyKiBpbnNwZWN0b3JDb250cm9sbGVyLCBOb2Rl KiBub2RlLCBOb2RlKiBwYXJlbnQpCiB7CiAjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIp Ci0gICAgaWYgKEluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50KiBicm93c2VyRGVidWdnZXJB Z2VudCA9IGluc3BlY3RvckNvbnRyb2xsZXItPm1fYnJvd3NlckRlYnVnZ2VyQWdlbnQuZ2V0KCkp CisgICAgaWYgKEluc3BlY3RvckJyb3dzZXJEZWJ1Z2dlckFnZW50KiBicm93c2VyRGVidWdnZXJB Z2VudCA9IGluc3BlY3RvckNvbnRyb2xsZXItPmJyb3dzZXJEZWJ1Z2dlckFnZW50KCkpCiAgICAg ICAgIGJyb3dzZXJEZWJ1Z2dlckFnZW50LT53aWxsSW5zZXJ0RE9NTm9kZShub2RlLCBwYXJlbnQp OwogI2VuZGlmCiB9CiAKIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRJbnNlcnRE T01Ob2RlSW1wbChJbnNwZWN0b3JDb250cm9sbGVyKiBpbnNwZWN0b3JDb250cm9sbGVyLCBOb2Rl KiBub2RlKQogewotICAgIGlmIChJbnNwZWN0b3JET01BZ2VudCogZG9tQWdlbnQgPSBpbnNwZWN0 b3JDb250cm9sbGVyLT5tX2RvbUFnZW50LmdldCgpKQorICAgIGlmIChJbnNwZWN0b3JET01BZ2Vu dCogZG9tQWdlbnQgPSBpbnNwZWN0b3JDb250cm9sbGVyLT5kb21BZ2VudCgpKQogICAgICAgICBk b21BZ2VudC0+ZGlkSW5zZXJ0RE9NTm9kZShub2RlKTsKICNpZiBFTkFCTEUoSkFWQVNDUklQVF9E RUJVR0dFUikKLSAgICBpZiAoSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQqIGJyb3dzZXJE ZWJ1Z2dlckFnZW50ID0gaW5zcGVjdG9yQ29udHJvbGxlci0+bV9icm93c2VyRGVidWdnZXJBZ2Vu dC5nZXQoKSkKKyAgICBpZiAoSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQqIGJyb3dzZXJE ZWJ1Z2dlckFnZW50ID0gaW5zcGVjdG9yQ29udHJvbGxlci0+YnJvd3NlckRlYnVnZ2VyQWdlbnQo KSkKICAgICAgICAgYnJvd3NlckRlYnVnZ2VyQWdlbnQtPmRpZEluc2VydERPTU5vZGUobm9kZSk7 CiAjZW5kaWYKIH0KQEAgLTExMSw3ICsxMTEsNyBAQCB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRh dGlvbjo6ZGlkSW5zZXJ0RE9NTm9kZUltcGwoSW5zcGVjdG9yQ29udHJvbGxlciogaW5zcGVjdAog dm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndpbGxSZW1vdmVET01Ob2RlSW1wbChJbnNw ZWN0b3JDb250cm9sbGVyKiBpbnNwZWN0b3JDb250cm9sbGVyLCBOb2RlKiBub2RlKQogewogI2lm IEVOQUJMRShKQVZBU0NSSVBUX0RFQlVHR0VSKQotICAgIGlmIChJbnNwZWN0b3JCcm93c2VyRGVi dWdnZXJBZ2VudCogYnJvd3NlckRlYnVnZ2VyQWdlbnQgPSBpbnNwZWN0b3JDb250cm9sbGVyLT5t X2Jyb3dzZXJEZWJ1Z2dlckFnZW50LmdldCgpKQorICAgIGlmIChJbnNwZWN0b3JCcm93c2VyRGVi dWdnZXJBZ2VudCogYnJvd3NlckRlYnVnZ2VyQWdlbnQgPSBpbnNwZWN0b3JDb250cm9sbGVyLT5i cm93c2VyRGVidWdnZXJBZ2VudCgpKQogICAgICAgICBicm93c2VyRGVidWdnZXJBZ2VudC0+d2ls bFJlbW92ZURPTU5vZGUobm9kZSk7CiAjZW5kaWYKIH0KQEAgLTExOSwyNCArMTE5LDI0IEBAIHZv aWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxsUmVtb3ZlRE9NTm9kZUltcGwoSW5zcGVj dG9yQ29udHJvbGxlciogaW5zcGVjCiB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlk UmVtb3ZlRE9NTm9kZUltcGwoSW5zcGVjdG9yQ29udHJvbGxlciogaW5zcGVjdG9yQ29udHJvbGxl ciwgTm9kZSogbm9kZSkKIHsKICNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikKLSAgICBp ZiAoSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQqIGJyb3dzZXJEZWJ1Z2dlckFnZW50ID0g aW5zcGVjdG9yQ29udHJvbGxlci0+bV9icm93c2VyRGVidWdnZXJBZ2VudC5nZXQoKSkKKyAgICBp ZiAoSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQqIGJyb3dzZXJEZWJ1Z2dlckFnZW50ID0g aW5zcGVjdG9yQ29udHJvbGxlci0+YnJvd3NlckRlYnVnZ2VyQWdlbnQoKSkKICAgICAgICAgYnJv d3NlckRlYnVnZ2VyQWdlbnQtPmRpZFJlbW92ZURPTU5vZGUobm9kZSk7CiAjZW5kaWYKLSAgICBp ZiAoSW5zcGVjdG9yRE9NQWdlbnQqIGRvbUFnZW50ID0gaW5zcGVjdG9yQ29udHJvbGxlci0+bV9k b21BZ2VudC5nZXQoKSkKKyAgICBpZiAoSW5zcGVjdG9yRE9NQWdlbnQqIGRvbUFnZW50ID0gaW5z cGVjdG9yQ29udHJvbGxlci0+ZG9tQWdlbnQoKSkKICAgICAgICAgZG9tQWdlbnQtPmRpZFJlbW92 ZURPTU5vZGUobm9kZSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3aWxs TW9kaWZ5RE9NQXR0ckltcGwoSW5zcGVjdG9yQ29udHJvbGxlciogaW5zcGVjdG9yQ29udHJvbGxl ciwgRWxlbWVudCogZWxlbWVudCkKIHsKICNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikK LSAgICBpZiAoSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQqIGJyb3dzZXJEZWJ1Z2dlckFn ZW50ID0gaW5zcGVjdG9yQ29udHJvbGxlci0+bV9icm93c2VyRGVidWdnZXJBZ2VudC5nZXQoKSkK KyAgICBpZiAoSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQqIGJyb3dzZXJEZWJ1Z2dlckFn ZW50ID0gaW5zcGVjdG9yQ29udHJvbGxlci0+YnJvd3NlckRlYnVnZ2VyQWdlbnQoKSkKICAgICAg ICAgYnJvd3NlckRlYnVnZ2VyQWdlbnQtPndpbGxNb2RpZnlET01BdHRyKGVsZW1lbnQpOwogI2Vu ZGlmCiB9CiAKIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRNb2RpZnlET01BdHRy SW1wbChJbnNwZWN0b3JDb250cm9sbGVyKiBpbnNwZWN0b3JDb250cm9sbGVyLCBFbGVtZW50KiBl bGVtZW50KQogewotICAgIGlmIChJbnNwZWN0b3JET01BZ2VudCogZG9tQWdlbnQgPSBpbnNwZWN0 b3JDb250cm9sbGVyLT5tX2RvbUFnZW50LmdldCgpKQorICAgIGlmIChJbnNwZWN0b3JET01BZ2Vu dCogZG9tQWdlbnQgPSBpbnNwZWN0b3JDb250cm9sbGVyLT5kb21BZ2VudCgpKQogICAgICAgICBk b21BZ2VudC0+ZGlkTW9kaWZ5RE9NQXR0cihlbGVtZW50KTsKIH0KIApAQCAtMTUyLDE0ICsxNTIs MTQgQEAgYm9vbCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmhhbmRsZU1vdXNlUHJlc3NJbXBs KEluc3BlY3RvckNvbnRyb2xsZXIqIGluc3BlY3QKIAogdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50 YXRpb246OmNoYXJhY3RlckRhdGFNb2RpZmllZEltcGwoSW5zcGVjdG9yQ29udHJvbGxlciogaW5z cGVjdG9yQ29udHJvbGxlciwgQ2hhcmFjdGVyRGF0YSogY2hhcmFjdGVyRGF0YSkKIHsKLSAgICBp ZiAoSW5zcGVjdG9yRE9NQWdlbnQqIGRvbUFnZW50ID0gaW5zcGVjdG9yQ29udHJvbGxlci0+bV9k b21BZ2VudC5nZXQoKSkKKyAgICBpZiAoSW5zcGVjdG9yRE9NQWdlbnQqIGRvbUFnZW50ID0gaW5z cGVjdG9yQ29udHJvbGxlci0+ZG9tQWdlbnQoKSkKICAgICAgICAgZG9tQWdlbnQtPmNoYXJhY3Rl ckRhdGFNb2RpZmllZChjaGFyYWN0ZXJEYXRhKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JJbnN0cnVt ZW50YXRpb246OndpbGxTZW5kWE1MSHR0cFJlcXVlc3RJbXBsKEluc3BlY3RvckNvbnRyb2xsZXIq IGluc3BlY3RvckNvbnRyb2xsZXIsIGNvbnN0IFN0cmluZyYgdXJsKQogewogI2lmIEVOQUJMRShK QVZBU0NSSVBUX0RFQlVHR0VSKQotICAgIGlmIChJbnNwZWN0b3JCcm93c2VyRGVidWdnZXJBZ2Vu dCogYnJvd3NlckRlYnVnZ2VyQWdlbnQgPSBpbnNwZWN0b3JDb250cm9sbGVyLT5tX2Jyb3dzZXJE ZWJ1Z2dlckFnZW50LmdldCgpKQorICAgIGlmIChJbnNwZWN0b3JCcm93c2VyRGVidWdnZXJBZ2Vu dCogYnJvd3NlckRlYnVnZ2VyQWdlbnQgPSBpbnNwZWN0b3JDb250cm9sbGVyLT5icm93c2VyRGVi dWdnZXJBZ2VudCgpKQogICAgICAgICBicm93c2VyRGVidWdnZXJBZ2VudC0+d2lsbFNlbmRYTUxI dHRwUmVxdWVzdCh1cmwpOwogI2VuZGlmCiB9CkBAIC00MzMsNyArNDMzLDcgQEAgdm9pZCBJbnNw ZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZFJlY2VpdmVSZXNvdXJjZVJlc3BvbnNlSW1wbChjb25z dCBJbnNwZWN0b3JJbnMKICAgICBJbnNwZWN0b3JDb250cm9sbGVyKiBpYyA9IGNvb2tpZS5maXJz dDsKICAgICBpZiAoSW5zcGVjdG9yUmVzb3VyY2VBZ2VudCogcmVzb3VyY2VBZ2VudCA9IHJldHJp ZXZlUmVzb3VyY2VBZ2VudChpYykpCiAgICAgICAgIHJlc291cmNlQWdlbnQtPmRpZFJlY2VpdmVS ZXNwb25zZShpZGVudGlmaWVyLCBsb2FkZXIsIHJlc3BvbnNlKTsKLSAgICBpYy0+bV9jb25zb2xl QWdlbnQtPmRpZFJlY2VpdmVSZXNwb25zZShpZGVudGlmaWVyLCByZXNwb25zZSk7CisgICAgaWMt PmNvbnNvbGVBZ2VudCgpLT5kaWRSZWNlaXZlUmVzcG9uc2UoaWRlbnRpZmllciwgcmVzcG9uc2Up OwogICAgIGlmIChJbnNwZWN0b3JUaW1lbGluZUFnZW50KiB0aW1lbGluZUFnZW50ID0gcmV0cmll dmVUaW1lbGluZUFnZW50KGNvb2tpZSkpCiAgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZFJlY2Vp dmVSZXNvdXJjZVJlc3BvbnNlKCk7CiB9CkBAIC00NTQsNyArNDU0LDcgQEAgdm9pZCBJbnNwZWN0 b3JJbnN0cnVtZW50YXRpb246OmRpZEZpbmlzaExvYWRpbmdJbXBsKEluc3BlY3RvckNvbnRyb2xs ZXIqIGljLCB1bnMKIAogdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZEZhaWxMb2Fk aW5nSW1wbChJbnNwZWN0b3JDb250cm9sbGVyKiBpYywgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVy LCBjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKIHsKLSAgICBpYy0+bV9jb25zb2xlQWdlbnQt PmRpZEZhaWxMb2FkaW5nKGlkZW50aWZpZXIsIGVycm9yKTsKKyAgICBpYy0+Y29uc29sZUFnZW50 KCktPmRpZEZhaWxMb2FkaW5nKGlkZW50aWZpZXIsIGVycm9yKTsKICAgICBpZiAoSW5zcGVjdG9y VGltZWxpbmVBZ2VudCogdGltZWxpbmVBZ2VudCA9IHJldHJpZXZlVGltZWxpbmVBZ2VudChpYykp CiAgICAgICAgIHRpbWVsaW5lQWdlbnQtPmRpZEZpbmlzaExvYWRpbmdSZXNvdXJjZShpZGVudGlm aWVyLCB0cnVlLCAwKTsKICAgICBpZiAoSW5zcGVjdG9yUmVzb3VyY2VBZ2VudCogcmVzb3VyY2VB Z2VudCA9IHJldHJpZXZlUmVzb3VyY2VBZ2VudChpYykpCkBAIC00NjMsNyArNDYzLDcgQEAgdm9p ZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmRpZEZhaWxMb2FkaW5nSW1wbChJbnNwZWN0b3JD b250cm9sbGVyKiBpYywgdW5zaWcKIAogdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnJl c291cmNlUmV0cmlldmVkQnlYTUxIdHRwUmVxdWVzdEltcGwoSW5zcGVjdG9yQ29udHJvbGxlciog aWMsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBzb3VyY2VTdHJpbmcs IGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIHNlbmRVUkwsIHVuc2lnbmVkIHNlbmRM aW5lTnVtYmVyKQogewotICAgIGljLT5tX2NvbnNvbGVBZ2VudC0+cmVzb3VyY2VSZXRyaWV2ZWRC eVhNTEh0dHBSZXF1ZXN0KHVybCwgc2VuZFVSTCwgc2VuZExpbmVOdW1iZXIpOworICAgIGljLT5j b25zb2xlQWdlbnQoKS0+cmVzb3VyY2VSZXRyaWV2ZWRCeVhNTEh0dHBSZXF1ZXN0KHVybCwgc2Vu ZFVSTCwgc2VuZExpbmVOdW1iZXIpOwogICAgIGlmIChJbnNwZWN0b3JSZXNvdXJjZUFnZW50KiBy ZXNvdXJjZUFnZW50ID0gcmV0cmlldmVSZXNvdXJjZUFnZW50KGljKSkKICAgICAgICAgcmVzb3Vy Y2VBZ2VudC0+c2V0SW5pdGlhbENvbnRlbnQoaWRlbnRpZmllciwgc291cmNlU3RyaW5nLCAiWEhS Iik7CiB9CkBAIC01NDksNyArNTQ5LDcgQEAgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246 OmNvbnNvbGVNYXJrVGltZWxpbmVJbXBsKEluc3BlY3RvckNvbnRyb2xsZXIqIGluc3AKICNpZiBF TkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikKIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u OjphZGRTdGFydFByb2ZpbGluZ01lc3NhZ2VUb0NvbnNvbGVJbXBsKEluc3BlY3RvckNvbnRyb2xs ZXIqIGluc3BlY3RvckNvbnRyb2xsZXIsIGNvbnN0IFN0cmluZyYgdGl0bGUsIHVuc2lnbmVkIGxp bmVOdW1iZXIsIGNvbnN0IFN0cmluZyYgc291cmNlVVJMKQogewotICAgIGlmIChJbnNwZWN0b3JQ cm9maWxlckFnZW50KiBwcm9maWxlckFnZW50ID0gaW5zcGVjdG9yQ29udHJvbGxlci0+bV9wcm9m aWxlckFnZW50LmdldCgpKQorICAgIGlmIChJbnNwZWN0b3JQcm9maWxlckFnZW50KiBwcm9maWxl ckFnZW50ID0gaW5zcGVjdG9yQ29udHJvbGxlci0+cHJvZmlsZXJBZ2VudCgpKQogICAgICAgICBw cm9maWxlckFnZW50LT5hZGRTdGFydFByb2ZpbGluZ01lc3NhZ2VUb0NvbnNvbGUodGl0bGUsIGxp bmVOdW1iZXIsIHNvdXJjZVVSTCk7CiB9CiAjZW5kaWYKQEAgLTYyNCw3ICs2MjQsNyBAQCBib29s IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6aGFzRnJvbnRlbmQoSW5zcGVjdG9yQ29udHJvbGxl ciogaW5zcGVjdG9yQ29udHJvbAogdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OnBhdXNl T25OYXRpdmVFdmVudElmTmVlZGVkKEluc3BlY3RvckNvbnRyb2xsZXIqIGluc3BlY3RvckNvbnRy b2xsZXIsIGNvbnN0IFN0cmluZyYgY2F0ZWdvcnlUeXBlLCBjb25zdCBTdHJpbmcmIGV2ZW50TmFt ZSwgYm9vbCBzeW5jaHJvbm91cykKIHsKICNpZiBFTkFCTEUoSkFWQVNDUklQVF9ERUJVR0dFUikK LSAgICBpZiAoSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQqIGJyb3dzZXJEZWJ1Z2dlckFn ZW50ID0gaW5zcGVjdG9yQ29udHJvbGxlci0+bV9icm93c2VyRGVidWdnZXJBZ2VudC5nZXQoKSkK KyAgICBpZiAoSW5zcGVjdG9yQnJvd3NlckRlYnVnZ2VyQWdlbnQqIGJyb3dzZXJEZWJ1Z2dlckFn ZW50ID0gaW5zcGVjdG9yQ29udHJvbGxlci0+YnJvd3NlckRlYnVnZ2VyQWdlbnQoKSkKICAgICAg ICAgYnJvd3NlckRlYnVnZ2VyQWdlbnQtPnBhdXNlT25OYXRpdmVFdmVudElmTmVlZGVkKGNhdGVn b3J5VHlwZSwgZXZlbnROYW1lLCBzeW5jaHJvbm91cyk7CiAjZW5kaWYKIH0KQEAgLTYzMiwxNCAr NjMyLDE0IEBAIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpwYXVzZU9uTmF0aXZlRXZl bnRJZk5lZWRlZChJbnNwZWN0b3JDb250cm9sbGVyKiBpCiB2b2lkIEluc3BlY3Rvckluc3RydW1l bnRhdGlvbjo6Y2FuY2VsUGF1c2VPbk5hdGl2ZUV2ZW50KEluc3BlY3RvckNvbnRyb2xsZXIqIGlu c3BlY3RvckNvbnRyb2xsZXIpCiB7CiAjaWYgRU5BQkxFKEpBVkFTQ1JJUFRfREVCVUdHRVIpCi0g ICAgaWYgKEluc3BlY3RvckRlYnVnZ2VyQWdlbnQqIGRlYnVnZ2VyQWdlbnQgPSBpbnNwZWN0b3JD b250cm9sbGVyLT5tX2RlYnVnZ2VyQWdlbnQuZ2V0KCkpCisgICAgaWYgKEluc3BlY3RvckRlYnVn Z2VyQWdlbnQqIGRlYnVnZ2VyQWdlbnQgPSBpbnNwZWN0b3JDb250cm9sbGVyLT5kZWJ1Z2dlckFn ZW50KCkpCiAgICAgICAgIGRlYnVnZ2VyQWdlbnQtPmNhbmNlbFBhdXNlT25OZXh0U3RhdGVtZW50 KCk7CiAjZW5kaWYKIH0KIAogSW5zcGVjdG9yVGltZWxpbmVBZ2VudCogSW5zcGVjdG9ySW5zdHJ1 bWVudGF0aW9uOjpyZXRyaWV2ZVRpbWVsaW5lQWdlbnQoSW5zcGVjdG9yQ29udHJvbGxlciogaW5z cGVjdG9yQ29udHJvbGxlcikKIHsKLSAgICByZXR1cm4gaW5zcGVjdG9yQ29udHJvbGxlci0+bV90 aW1lbGluZUFnZW50LmdldCgpOworICAgIHJldHVybiBpbnNwZWN0b3JDb250cm9sbGVyLT50aW1l bGluZUFnZW50KCk7CiB9CiAKIEluc3BlY3RvclRpbWVsaW5lQWdlbnQqIEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6cmV0cmlldmVUaW1lbGluZUFnZW50KGNvbnN0IEluc3BlY3Rvckluc3RydW1l bnRhdGlvbkNvb2tpZSYgY29va2llKQpAQCAtNjUyLDcgKzY1Miw3IEBAIEluc3BlY3RvclRpbWVs aW5lQWdlbnQqIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6cmV0cmlldmVUaW1lbGluZUFnZW50 KGNvbnN0IEluCiAKIEluc3BlY3RvclJlc291cmNlQWdlbnQqIEluc3BlY3Rvckluc3RydW1lbnRh dGlvbjo6cmV0cmlldmVSZXNvdXJjZUFnZW50KEluc3BlY3RvckNvbnRyb2xsZXIqIGljKQogewot ICAgIHJldHVybiBpYy0+bV9yZXNvdXJjZUFnZW50LmdldCgpOworICAgIHJldHVybiBpYy0+cmVz b3VyY2VBZ2VudCgpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==