83469 2012-04-09 08:18:31 -0700 [BlackBerry] Cleanup LayoutTestControllerBlackBerry.cpp 2013-01-04 02:09:21 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rwlbuis rwlbuis tonikitoo oldest_to_newest 598285 0 rwlbuis 2012-04-09 08:18:31 -0700 This code can be cleaned up some more. 598287 1 136226 rwlbuis 2012-04-09 08:21:59 -0700 Created attachment 136226 Patch 598291 2 136227 rwlbuis 2012-04-09 08:26:20 -0700 Created attachment 136227 Patch 598561 3 136227 krit 2012-04-09 13:26:05 -0700 Comment on attachment 136227 Patch LGTM. r=me. 800103 4 rwlbuis 2013-01-04 02:09:21 -0800 This was landed in r113616, closing. 136226 2012-04-09 08:21:59 -0700 2012-04-09 08:26:15 -0700 Patch bug-83469-20120409112229.patch text/plain 5766 rwlbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNTc3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjkzZmY5MmEwMjk2MWJlZDlhYWI0ZjBhMjI4ZWIyYjRj NGI0MTczNC4uNDgxZjMxYmFhMTI2YzRkZTRhNmI0ODM5OTRlMzMxYzU0MzFlNzFhOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDEyLTA0LTA5ICBSb2IgQnVpcyAgPHJidWlzQHJpbS5jb20+CisKKyAgICAgICAgW0Js YWNrQmVycnldIENsZWFudXAgTGF5b3V0VGVzdENvbnRyb2xsZXJCbGFja0JlcnJ5LmNwcAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODM0NjkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgV1RGOjog cHJlZml4ZXMgYW5kIGZpeCBhIHdhcm5pbmcgd2l0aCB0aGUgbGVuZ3RoIHZhcmlhYmxlLgorCisg ICAgICAgICogRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJyeS9MYXlvdXRUZXN0Q29udHJvbGxlckJs YWNrQmVycnkuY3BwOgorICAgICAgICAoanNTdHJpbmdSZWZUb1dlYkNvcmVTdHJpbmcpOgorICAg ICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OmV4ZWNDb21tYW5kKToKKyAgICAgICAgKExheW91 dFRlc3RDb250cm9sbGVyOjppc0NvbW1hbmRFbmFibGVkKToKKyAgICAgICAgKExheW91dFRlc3RD b250cm9sbGVyOjpzZXRVc2VyU3R5bGVTaGVldExvY2F0aW9uKToKKyAgICAgICAgKExheW91dFRl c3RDb250cm9sbGVyOjpjb3VudGVyVmFsdWVGb3JFbGVtZW50QnlJZCk6CisgICAgICAgIChMYXlv dXRUZXN0Q29udHJvbGxlcjo6b3ZlcnJpZGVQcmVmZXJlbmNlKToKKyAgICAgICAgKExheW91dFRl c3RDb250cm9sbGVyOjpzZXRNb2NrR2VvbG9jYXRpb25FcnJvcik6CisgICAgICAgIChMYXlvdXRU ZXN0Q29udHJvbGxlcjo6ZmluZFN0cmluZyk6CisKIDIwMTItMDQtMDkgIFBhdHJpY2sgR2Fuc3Rl cmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQnVpbGQgZml4IGZvciBXaW5DRSBh ZnRlciByMTEzNTcwLgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJy eS9MYXlvdXRUZXN0Q29udHJvbGxlckJsYWNrQmVycnkuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRy ZWUvYmxhY2tiZXJyeS9MYXlvdXRUZXN0Q29udHJvbGxlckJsYWNrQmVycnkuY3BwCmluZGV4IGUw MjUwZWNiODNmMDVhYTIzZDdjNTJlZjUxMDFkNWJiODE4Njk1MGEuLjM5MGY0YWUzZDVlMDViMDYz NTkzNDY2NzBlOGQ5MWNmMjhlMTU3ZTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2JsYWNrYmVycnkvTGF5b3V0VGVzdENvbnRyb2xsZXJCbGFja0JlcnJ5LmNwcAorKysgYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9ibGFja2JlcnJ5L0xheW91dFRlc3RDb250cm9sbGVyQmxhY2tCZXJy eS5jcHAKQEAgLTEwNiwxMiArMTA2LDEyIEBAIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OmRp c3BsYXkoKQogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKLXN0YXRpYyBXVEY6OlN0cmluZyBq c1N0cmluZ1JlZlRvV2ViQ29yZVN0cmluZyhKU1N0cmluZ1JlZiBzdHIpCitzdGF0aWMgU3RyaW5n IGpzU3RyaW5nUmVmVG9XZWJDb3JlU3RyaW5nKEpTU3RyaW5nUmVmIHN0cikKIHsKICAgICBzaXpl X3Qgc3RyQXJyU2l6ZSA9IEpTU3RyaW5nR2V0TWF4aW11bVVURjhDU3RyaW5nU2l6ZShzdHIpOwog ICAgIE93bkFycmF5UHRyPGNoYXI+IHN0ckFyciA9IGFkb3B0QXJyYXlQdHIobmV3IGNoYXJbc3Ry QXJyU2l6ZV0pOwogICAgIEpTU3RyaW5nR2V0VVRGOENTdHJpbmcoc3RyLCBzdHJBcnIuZ2V0KCks IHN0ckFyclNpemUpOwotICAgIHJldHVybiBXVEY6OlN0cmluZzo6ZnJvbVVURjgoc3RyQXJyLmdl dCgpKTsKKyAgICByZXR1cm4gU3RyaW5nOjpmcm9tVVRGOChzdHJBcnIuZ2V0KCkpOwogfQogCiB2 b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpleGVjQ29tbWFuZChKU1N0cmluZ1JlZiBuYW1lLCBK U1N0cmluZ1JlZiB2YWx1ZSkKQEAgLTExOSw4ICsxMTksOCBAQCB2b2lkIExheW91dFRlc3RDb250 cm9sbGVyOjpleGVjQ29tbWFuZChKU1N0cmluZ1JlZiBuYW1lLCBKU1N0cmluZ1JlZiB2YWx1ZSkK ICAgICBpZiAoIW1haW5GcmFtZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgV1RGOjpTdHJpbmcg bmFtZVN0ciA9IGpzU3RyaW5nUmVmVG9XZWJDb3JlU3RyaW5nKG5hbWUpOwotICAgIFdURjo6U3Ry aW5nIHZhbHVlU3RyID0ganNTdHJpbmdSZWZUb1dlYkNvcmVTdHJpbmcodmFsdWUpOworICAgIFN0 cmluZyBuYW1lU3RyID0ganNTdHJpbmdSZWZUb1dlYkNvcmVTdHJpbmcobmFtZSk7CisgICAgU3Ry aW5nIHZhbHVlU3RyID0ganNTdHJpbmdSZWZUb1dlYkNvcmVTdHJpbmcodmFsdWUpOwogCiAgICAg bWFpbkZyYW1lLT5lZGl0b3IoKS0+Y29tbWFuZChuYW1lU3RyKS5leGVjdXRlKHZhbHVlU3RyKTsK IH0KQEAgLTEzMCw3ICsxMzAsNyBAQCBib29sIExheW91dFRlc3RDb250cm9sbGVyOjppc0NvbW1h bmRFbmFibGVkKEpTU3RyaW5nUmVmIG5hbWUpCiAgICAgaWYgKCFtYWluRnJhbWUpCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAotICAgIFdURjo6U3RyaW5nIG5hbWVTdHIgPSBqc1N0cmluZ1JlZlRv V2ViQ29yZVN0cmluZyhuYW1lKTsKKyAgICBTdHJpbmcgbmFtZVN0ciA9IGpzU3RyaW5nUmVmVG9X ZWJDb3JlU3RyaW5nKG5hbWUpOwogCiAgICAgcmV0dXJuIG1haW5GcmFtZS0+ZWRpdG9yKCktPmNv bW1hbmQobmFtZVN0cikuaXNFbmFibGVkKCk7CiB9CkBAIC0zMDEsNyArMzAxLDcgQEAgdm9pZCBM YXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0VXNlclN0eWxlU2hlZXRFbmFibGVkKGJvb2wgZmxhZykK IAogdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0VXNlclN0eWxlU2hlZXRMb2NhdGlvbihK U1N0cmluZ1JlZiBwYXRoKQogewotICAgIFdURjo6U3RyaW5nIHBhdGhTdHIgPSBqc1N0cmluZ1Jl ZlRvV2ViQ29yZVN0cmluZyhwYXRoKTsKKyAgICBTdHJpbmcgcGF0aFN0ciA9IGpzU3RyaW5nUmVm VG9XZWJDb3JlU3RyaW5nKHBhdGgpOwogICAgIEJsYWNrQmVycnk6OldlYktpdDo6RHVtcFJlbmRl clRyZWU6OmN1cnJlbnRJbnN0YW5jZSgpLT5wYWdlKCktPnNldHRpbmdzKCktPnNldFVzZXJTdHls ZVNoZWV0TG9jYXRpb24ocGF0aFN0ci51dGY4KCkuZGF0YSgpKTsKIH0KIApAQCAtNDM3LDcgKzQz Nyw3IEBAIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OmRpc2FibGVJbWFnZUxvYWRpbmcoKQog CiBKU1JldGFpblB0cjxKU1N0cmluZ1JlZj4gTGF5b3V0VGVzdENvbnRyb2xsZXI6OmNvdW50ZXJW YWx1ZUZvckVsZW1lbnRCeUlkKEpTU3RyaW5nUmVmIGlkKQogewotICAgIFdURjo6U3RyaW5nIGlk U3RyID0ganNTdHJpbmdSZWZUb1dlYkNvcmVTdHJpbmcoaWQpOworICAgIFN0cmluZyBpZFN0ciA9 IGpzU3RyaW5nUmVmVG9XZWJDb3JlU3RyaW5nKGlkKTsKICAgICBXZWJDb3JlOjpFbGVtZW50KiBj b3JlRWxlbWVudCA9IG1haW5GcmFtZS0+ZG9jdW1lbnQoKS0+Z2V0RWxlbWVudEJ5SWQoQXRvbWlj U3RyaW5nKGlkU3RyKSk7CiAgICAgaWYgKCFjb3JlRWxlbWVudCkKICAgICAgICAgcmV0dXJuIDA7 CkBAIC00NTUsOCArNDU1LDggQEAgdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6b3ZlcnJpZGVQ cmVmZXJlbmNlKEpTU3RyaW5nUmVmIGtleSwgSlNTdHJpbmdSZWYgdmFsdWUKICAgICBpZiAoIW1h aW5GcmFtZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgV1RGOjpTdHJpbmcga2V5U3RyID0ganNT dHJpbmdSZWZUb1dlYkNvcmVTdHJpbmcoa2V5KTsKLSAgICBXVEY6OlN0cmluZyB2YWx1ZVN0ciA9 IGpzU3RyaW5nUmVmVG9XZWJDb3JlU3RyaW5nKHZhbHVlKTsKKyAgICBTdHJpbmcga2V5U3RyID0g anNTdHJpbmdSZWZUb1dlYkNvcmVTdHJpbmcoa2V5KTsKKyAgICBTdHJpbmcgdmFsdWVTdHIgPSBq c1N0cmluZ1JlZlRvV2ViQ29yZVN0cmluZyh2YWx1ZSk7CiAKICAgICBpZiAoa2V5U3RyID09ICJX ZWJLaXRVc2VzUGFnZUNhY2hlUHJlZmVyZW5jZUtleSIpCiAgICAgICAgIEJsYWNrQmVycnk6Oldl YktpdDo6RHVtcFJlbmRlclRyZWU6OmN1cnJlbnRJbnN0YW5jZSgpLT5wYWdlKCktPnNldHRpbmdz KCktPnNldE1heGltdW1QYWdlc0luQ2FjaGUoMSk7CkBAIC00ODEsNyArNDgxLDcgQEAgdm9pZCBM YXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0TW9ja0dlb2xvY2F0aW9uUG9zaXRpb24oZG91YmxlIGxh dGl0dWRlLCBkb3VibGUgbG8KIAogdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0TW9ja0dl b2xvY2F0aW9uRXJyb3IoaW50IGNvZGUsIEpTU3RyaW5nUmVmIG1lc3NhZ2UpCiB7Ci0gICAgV1RG OjpTdHJpbmcgbWVzc2FnZVN0ciA9IGpzU3RyaW5nUmVmVG9XZWJDb3JlU3RyaW5nKG1lc3NhZ2Up OworICAgIFN0cmluZyBtZXNzYWdlU3RyID0ganNTdHJpbmdSZWZUb1dlYkNvcmVTdHJpbmcobWVz c2FnZSk7CiAgICAgRHVtcFJlbmRlclRyZWVTdXBwb3J0OjpzZXRNb2NrR2VvbG9jYXRpb25FcnJv cihCbGFja0JlcnJ5OjpXZWJLaXQ6OkR1bXBSZW5kZXJUcmVlOjpjdXJyZW50SW5zdGFuY2UoKS0+ cGFnZSgpLCBjb2RlLCBtZXNzYWdlU3RyKTsKIH0KIApAQCAtODA0LDE3ICs4MDQsMTcgQEAgYm9v bCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6ZmluZFN0cmluZyhKU0NvbnRleHRSZWYgY29udGV4dCwg SlNTdHJpbmdSZWYgdGFyZ2V0LAogewogICAgIFdlYkNvcmU6OkZpbmRPcHRpb25zIG9wdGlvbnMg PSAwOwogCisgICAgU3RyaW5nIG5hbWVTdHIgPSBqc1N0cmluZ1JlZlRvV2ViQ29yZVN0cmluZyh0 YXJnZXQpOworCiAgICAgSlNSZXRhaW5QdHI8SlNTdHJpbmdSZWY+IGxlbmd0aFByb3BlcnR5TmFt ZShBZG9wdCwgSlNTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoImxlbmd0aCIpKTsKLSAgICBK U1ZhbHVlUmVmIGxlbmd0aFZhbHVlOworICAgIHNpemVfdCBsZW5ndGggPSAwOwogICAgIGlmIChv cHRpb25zQXJyYXkpIHsKLSAgICAgICAgbGVuZ3RoVmFsdWUgPSBKU09iamVjdEdldFByb3BlcnR5 KGNvbnRleHQsIG9wdGlvbnNBcnJheSwgbGVuZ3RoUHJvcGVydHlOYW1lLmdldCgpLCAwKTsKKyAg ICAgICAgSlNWYWx1ZVJlZiBsZW5ndGhWYWx1ZSA9IEpTT2JqZWN0R2V0UHJvcGVydHkoY29udGV4 dCwgb3B0aW9uc0FycmF5LCBsZW5ndGhQcm9wZXJ0eU5hbWUuZ2V0KCksIDApOwogICAgICAgICBp ZiAoIUpTVmFsdWVJc051bWJlcihjb250ZXh0LCBsZW5ndGhWYWx1ZSkpCiAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgICAgIGxlbmd0aCA9IG9wdGlvbnNBcnJheSA/IHN0YXRpY19jYXN0 PHNpemVfdD4oSlNWYWx1ZVRvTnVtYmVyKGNvbnRleHQsIGxlbmd0aFZhbHVlLCAwKSkgOiAwOwog ICAgIH0KIAotICAgIFdURjo6U3RyaW5nIG5hbWVTdHIgPSBqc1N0cmluZ1JlZlRvV2ViQ29yZVN0 cmluZyh0YXJnZXQpOwotCi0gICAgc2l6ZV90IGxlbmd0aCA9IG9wdGlvbnNBcnJheSA/IHN0YXRp Y19jYXN0PHNpemVfdD4oSlNWYWx1ZVRvTnVtYmVyKGNvbnRleHQsIGxlbmd0aFZhbHVlLCAwKSkg OiAwOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbGVuZ3RoOyArK2kpIHsKICAgICAgICAg SlNWYWx1ZVJlZiB2YWx1ZSA9IEpTT2JqZWN0R2V0UHJvcGVydHlBdEluZGV4KGNvbnRleHQsIG9w dGlvbnNBcnJheSwgaSwgMCk7CiAgICAgICAgIGlmICghSlNWYWx1ZUlzU3RyaW5nKGNvbnRleHQs IHZhbHVlKSkK 136227 2012-04-09 08:26:20 -0700 2012-04-09 13:26:05 -0700 Patch bug-83469-20120409112650.patch text/plain 5747 rwlbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNTc3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjkzZmY5MmEwMjk2MWJlZDlhYWI0ZjBhMjI4ZWIyYjRj NGI0MTczNC4uNDgxZjMxYmFhMTI2YzRkZTRhNmI0ODM5OTRlMzMxYzU0MzFlNzFhOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDEyLTA0LTA5ICBSb2IgQnVpcyAgPHJidWlzQHJpbS5jb20+CisKKyAgICAgICAgW0Js YWNrQmVycnldIENsZWFudXAgTGF5b3V0VGVzdENvbnRyb2xsZXJCbGFja0JlcnJ5LmNwcAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODM0NjkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgV1RGOjog cHJlZml4ZXMgYW5kIGZpeCBhIHdhcm5pbmcgd2l0aCB0aGUgbGVuZ3RoIHZhcmlhYmxlLgorCisg ICAgICAgICogRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJyeS9MYXlvdXRUZXN0Q29udHJvbGxlckJs YWNrQmVycnkuY3BwOgorICAgICAgICAoanNTdHJpbmdSZWZUb1dlYkNvcmVTdHJpbmcpOgorICAg ICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OmV4ZWNDb21tYW5kKToKKyAgICAgICAgKExheW91 dFRlc3RDb250cm9sbGVyOjppc0NvbW1hbmRFbmFibGVkKToKKyAgICAgICAgKExheW91dFRlc3RD b250cm9sbGVyOjpzZXRVc2VyU3R5bGVTaGVldExvY2F0aW9uKToKKyAgICAgICAgKExheW91dFRl c3RDb250cm9sbGVyOjpjb3VudGVyVmFsdWVGb3JFbGVtZW50QnlJZCk6CisgICAgICAgIChMYXlv dXRUZXN0Q29udHJvbGxlcjo6b3ZlcnJpZGVQcmVmZXJlbmNlKToKKyAgICAgICAgKExheW91dFRl c3RDb250cm9sbGVyOjpzZXRNb2NrR2VvbG9jYXRpb25FcnJvcik6CisgICAgICAgIChMYXlvdXRU ZXN0Q29udHJvbGxlcjo6ZmluZFN0cmluZyk6CisKIDIwMTItMDQtMDkgIFBhdHJpY2sgR2Fuc3Rl cmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQnVpbGQgZml4IGZvciBXaW5DRSBh ZnRlciByMTEzNTcwLgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJy eS9MYXlvdXRUZXN0Q29udHJvbGxlckJsYWNrQmVycnkuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRy ZWUvYmxhY2tiZXJyeS9MYXlvdXRUZXN0Q29udHJvbGxlckJsYWNrQmVycnkuY3BwCmluZGV4IGUw MjUwZWNiODNmMDVhYTIzZDdjNTJlZjUxMDFkNWJiODE4Njk1MGEuLjBhNmM1ODAzN2U3NmFkOTI5 MjNhNDMxNzNiMDAxNGZjNjk2NmM3ODAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2JsYWNrYmVycnkvTGF5b3V0VGVzdENvbnRyb2xsZXJCbGFja0JlcnJ5LmNwcAorKysgYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9ibGFja2JlcnJ5L0xheW91dFRlc3RDb250cm9sbGVyQmxhY2tCZXJy eS5jcHAKQEAgLTEwNiwxMiArMTA2LDEyIEBAIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OmRp c3BsYXkoKQogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKLXN0YXRpYyBXVEY6OlN0cmluZyBq c1N0cmluZ1JlZlRvV2ViQ29yZVN0cmluZyhKU1N0cmluZ1JlZiBzdHIpCitzdGF0aWMgU3RyaW5n IGpzU3RyaW5nUmVmVG9XZWJDb3JlU3RyaW5nKEpTU3RyaW5nUmVmIHN0cikKIHsKICAgICBzaXpl X3Qgc3RyQXJyU2l6ZSA9IEpTU3RyaW5nR2V0TWF4aW11bVVURjhDU3RyaW5nU2l6ZShzdHIpOwog ICAgIE93bkFycmF5UHRyPGNoYXI+IHN0ckFyciA9IGFkb3B0QXJyYXlQdHIobmV3IGNoYXJbc3Ry QXJyU2l6ZV0pOwogICAgIEpTU3RyaW5nR2V0VVRGOENTdHJpbmcoc3RyLCBzdHJBcnIuZ2V0KCks IHN0ckFyclNpemUpOwotICAgIHJldHVybiBXVEY6OlN0cmluZzo6ZnJvbVVURjgoc3RyQXJyLmdl dCgpKTsKKyAgICByZXR1cm4gU3RyaW5nOjpmcm9tVVRGOChzdHJBcnIuZ2V0KCkpOwogfQogCiB2 b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpleGVjQ29tbWFuZChKU1N0cmluZ1JlZiBuYW1lLCBK U1N0cmluZ1JlZiB2YWx1ZSkKQEAgLTExOSw4ICsxMTksOCBAQCB2b2lkIExheW91dFRlc3RDb250 cm9sbGVyOjpleGVjQ29tbWFuZChKU1N0cmluZ1JlZiBuYW1lLCBKU1N0cmluZ1JlZiB2YWx1ZSkK ICAgICBpZiAoIW1haW5GcmFtZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgV1RGOjpTdHJpbmcg bmFtZVN0ciA9IGpzU3RyaW5nUmVmVG9XZWJDb3JlU3RyaW5nKG5hbWUpOwotICAgIFdURjo6U3Ry aW5nIHZhbHVlU3RyID0ganNTdHJpbmdSZWZUb1dlYkNvcmVTdHJpbmcodmFsdWUpOworICAgIFN0 cmluZyBuYW1lU3RyID0ganNTdHJpbmdSZWZUb1dlYkNvcmVTdHJpbmcobmFtZSk7CisgICAgU3Ry aW5nIHZhbHVlU3RyID0ganNTdHJpbmdSZWZUb1dlYkNvcmVTdHJpbmcodmFsdWUpOwogCiAgICAg bWFpbkZyYW1lLT5lZGl0b3IoKS0+Y29tbWFuZChuYW1lU3RyKS5leGVjdXRlKHZhbHVlU3RyKTsK IH0KQEAgLTEzMCw3ICsxMzAsNyBAQCBib29sIExheW91dFRlc3RDb250cm9sbGVyOjppc0NvbW1h bmRFbmFibGVkKEpTU3RyaW5nUmVmIG5hbWUpCiAgICAgaWYgKCFtYWluRnJhbWUpCiAgICAgICAg IHJldHVybiBmYWxzZTsKIAotICAgIFdURjo6U3RyaW5nIG5hbWVTdHIgPSBqc1N0cmluZ1JlZlRv V2ViQ29yZVN0cmluZyhuYW1lKTsKKyAgICBTdHJpbmcgbmFtZVN0ciA9IGpzU3RyaW5nUmVmVG9X ZWJDb3JlU3RyaW5nKG5hbWUpOwogCiAgICAgcmV0dXJuIG1haW5GcmFtZS0+ZWRpdG9yKCktPmNv bW1hbmQobmFtZVN0cikuaXNFbmFibGVkKCk7CiB9CkBAIC0zMDEsNyArMzAxLDcgQEAgdm9pZCBM YXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0VXNlclN0eWxlU2hlZXRFbmFibGVkKGJvb2wgZmxhZykK IAogdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0VXNlclN0eWxlU2hlZXRMb2NhdGlvbihK U1N0cmluZ1JlZiBwYXRoKQogewotICAgIFdURjo6U3RyaW5nIHBhdGhTdHIgPSBqc1N0cmluZ1Jl ZlRvV2ViQ29yZVN0cmluZyhwYXRoKTsKKyAgICBTdHJpbmcgcGF0aFN0ciA9IGpzU3RyaW5nUmVm VG9XZWJDb3JlU3RyaW5nKHBhdGgpOwogICAgIEJsYWNrQmVycnk6OldlYktpdDo6RHVtcFJlbmRl clRyZWU6OmN1cnJlbnRJbnN0YW5jZSgpLT5wYWdlKCktPnNldHRpbmdzKCktPnNldFVzZXJTdHls ZVNoZWV0TG9jYXRpb24ocGF0aFN0ci51dGY4KCkuZGF0YSgpKTsKIH0KIApAQCAtNDM3LDcgKzQz Nyw3IEBAIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OmRpc2FibGVJbWFnZUxvYWRpbmcoKQog CiBKU1JldGFpblB0cjxKU1N0cmluZ1JlZj4gTGF5b3V0VGVzdENvbnRyb2xsZXI6OmNvdW50ZXJW YWx1ZUZvckVsZW1lbnRCeUlkKEpTU3RyaW5nUmVmIGlkKQogewotICAgIFdURjo6U3RyaW5nIGlk U3RyID0ganNTdHJpbmdSZWZUb1dlYkNvcmVTdHJpbmcoaWQpOworICAgIFN0cmluZyBpZFN0ciA9 IGpzU3RyaW5nUmVmVG9XZWJDb3JlU3RyaW5nKGlkKTsKICAgICBXZWJDb3JlOjpFbGVtZW50KiBj b3JlRWxlbWVudCA9IG1haW5GcmFtZS0+ZG9jdW1lbnQoKS0+Z2V0RWxlbWVudEJ5SWQoQXRvbWlj U3RyaW5nKGlkU3RyKSk7CiAgICAgaWYgKCFjb3JlRWxlbWVudCkKICAgICAgICAgcmV0dXJuIDA7 CkBAIC00NTUsOCArNDU1LDggQEAgdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6b3ZlcnJpZGVQ cmVmZXJlbmNlKEpTU3RyaW5nUmVmIGtleSwgSlNTdHJpbmdSZWYgdmFsdWUKICAgICBpZiAoIW1h aW5GcmFtZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgV1RGOjpTdHJpbmcga2V5U3RyID0ganNT dHJpbmdSZWZUb1dlYkNvcmVTdHJpbmcoa2V5KTsKLSAgICBXVEY6OlN0cmluZyB2YWx1ZVN0ciA9 IGpzU3RyaW5nUmVmVG9XZWJDb3JlU3RyaW5nKHZhbHVlKTsKKyAgICBTdHJpbmcga2V5U3RyID0g anNTdHJpbmdSZWZUb1dlYkNvcmVTdHJpbmcoa2V5KTsKKyAgICBTdHJpbmcgdmFsdWVTdHIgPSBq c1N0cmluZ1JlZlRvV2ViQ29yZVN0cmluZyh2YWx1ZSk7CiAKICAgICBpZiAoa2V5U3RyID09ICJX ZWJLaXRVc2VzUGFnZUNhY2hlUHJlZmVyZW5jZUtleSIpCiAgICAgICAgIEJsYWNrQmVycnk6Oldl YktpdDo6RHVtcFJlbmRlclRyZWU6OmN1cnJlbnRJbnN0YW5jZSgpLT5wYWdlKCktPnNldHRpbmdz KCktPnNldE1heGltdW1QYWdlc0luQ2FjaGUoMSk7CkBAIC00ODEsNyArNDgxLDcgQEAgdm9pZCBM YXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0TW9ja0dlb2xvY2F0aW9uUG9zaXRpb24oZG91YmxlIGxh dGl0dWRlLCBkb3VibGUgbG8KIAogdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0TW9ja0dl b2xvY2F0aW9uRXJyb3IoaW50IGNvZGUsIEpTU3RyaW5nUmVmIG1lc3NhZ2UpCiB7Ci0gICAgV1RG OjpTdHJpbmcgbWVzc2FnZVN0ciA9IGpzU3RyaW5nUmVmVG9XZWJDb3JlU3RyaW5nKG1lc3NhZ2Up OworICAgIFN0cmluZyBtZXNzYWdlU3RyID0ganNTdHJpbmdSZWZUb1dlYkNvcmVTdHJpbmcobWVz c2FnZSk7CiAgICAgRHVtcFJlbmRlclRyZWVTdXBwb3J0OjpzZXRNb2NrR2VvbG9jYXRpb25FcnJv cihCbGFja0JlcnJ5OjpXZWJLaXQ6OkR1bXBSZW5kZXJUcmVlOjpjdXJyZW50SW5zdGFuY2UoKS0+ cGFnZSgpLCBjb2RlLCBtZXNzYWdlU3RyKTsKIH0KIApAQCAtODA0LDE3ICs4MDQsMTcgQEAgYm9v bCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6ZmluZFN0cmluZyhKU0NvbnRleHRSZWYgY29udGV4dCwg SlNTdHJpbmdSZWYgdGFyZ2V0LAogewogICAgIFdlYkNvcmU6OkZpbmRPcHRpb25zIG9wdGlvbnMg PSAwOwogCisgICAgU3RyaW5nIG5hbWVTdHIgPSBqc1N0cmluZ1JlZlRvV2ViQ29yZVN0cmluZyh0 YXJnZXQpOworCiAgICAgSlNSZXRhaW5QdHI8SlNTdHJpbmdSZWY+IGxlbmd0aFByb3BlcnR5TmFt ZShBZG9wdCwgSlNTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoImxlbmd0aCIpKTsKLSAgICBK U1ZhbHVlUmVmIGxlbmd0aFZhbHVlOworICAgIHNpemVfdCBsZW5ndGggPSAwOwogICAgIGlmIChv cHRpb25zQXJyYXkpIHsKLSAgICAgICAgbGVuZ3RoVmFsdWUgPSBKU09iamVjdEdldFByb3BlcnR5 KGNvbnRleHQsIG9wdGlvbnNBcnJheSwgbGVuZ3RoUHJvcGVydHlOYW1lLmdldCgpLCAwKTsKKyAg ICAgICAgSlNWYWx1ZVJlZiBsZW5ndGhWYWx1ZSA9IEpTT2JqZWN0R2V0UHJvcGVydHkoY29udGV4 dCwgb3B0aW9uc0FycmF5LCBsZW5ndGhQcm9wZXJ0eU5hbWUuZ2V0KCksIDApOwogICAgICAgICBp ZiAoIUpTVmFsdWVJc051bWJlcihjb250ZXh0LCBsZW5ndGhWYWx1ZSkpCiAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgICAgIGxlbmd0aCA9IHN0YXRpY19jYXN0PHNpemVfdD4oSlNWYWx1 ZVRvTnVtYmVyKGNvbnRleHQsIGxlbmd0aFZhbHVlLCAwKSk7CiAgICAgfQogCi0gICAgV1RGOjpT dHJpbmcgbmFtZVN0ciA9IGpzU3RyaW5nUmVmVG9XZWJDb3JlU3RyaW5nKHRhcmdldCk7Ci0KLSAg ICBzaXplX3QgbGVuZ3RoID0gb3B0aW9uc0FycmF5ID8gc3RhdGljX2Nhc3Q8c2l6ZV90PihKU1Zh bHVlVG9OdW1iZXIoY29udGV4dCwgbGVuZ3RoVmFsdWUsIDApKSA6IDA7CiAgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkgewogICAgICAgICBKU1ZhbHVlUmVmIHZhbHVlID0g SlNPYmplY3RHZXRQcm9wZXJ0eUF0SW5kZXgoY29udGV4dCwgb3B0aW9uc0FycmF5LCBpLCAwKTsK ICAgICAgICAgaWYgKCFKU1ZhbHVlSXNTdHJpbmcoY29udGV4dCwgdmFsdWUpKQo=