116195 2013-05-15 17:22:45 -0700 Fix FileChooserClient design 2013-05-15 17:48:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 889588 0 andersca 2013-05-15 17:22:45 -0700 Fix FileChooserClient design 889590 1 201901 andersca 2013-05-15 17:27:50 -0700 Created attachment 201901 Patch 889598 2 201901 kling 2013-05-15 17:44:18 -0700 Comment on attachment 201901 Patch This makes a lot more sense. 889599 3 andersca 2013-05-15 17:48:04 -0700 Committed r150163: <http://trac.webkit.org/changeset/150163> 201901 2013-05-15 17:27:50 -0700 2013-05-15 17:44:18 -0700 Patch bug-116195-20130515172646.patch text/plain 9177 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjcxMjM1ODMyMjM2YmVl NWE3ZWY2MDM1YzYyOTk3NDI5NGIyMzNjMC4uZTg1M2EzNjBlZWEyY2E4ODQ3ZjdmMmFiNjQ3YTE0 Y2Q0NWI4NzUwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEzLTA1LTE1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IEZpbGVDaG9v c2VyQ2xpZW50IGRlc2lnbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTE2MTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRmlsZUNob29zZXJDbGllbnQgZG9lc24ndCBtYXRjaCB0aGUgc3RhbmRhcmQgV2Vi Q29yZSBjbGllbnQgaWRpb20gb2Ygb25seSBoYXZpbmcgdmlydHVhbCBtZW1iZXIgZnVuY3Rpb25z LgorICAgICAgICBJbnN0ZWFkIGl0IGhvbGRzIG9uIHRvIGl0cyBGaWxlQ2hvb3NlciBhbmQgaXQn cyBldmVuIGEgZmFjdG9yeSBmb3IgY3JlYXRpbmcgbmV3IGZpbGUgY2hvb3NlcnMoISkuCisKKyAg ICAgICAgRml4IHRoaXMgYnkgbWFraW5nIGl0IGFuIGFic3RyYWN0IGNsYXNzLCBhbmQgbW92aW5n IEZpbGVDaG9vc2VyIGludG8gRmlsZUlucHV0VHlwZS4KKworICAgICAgICAqIGh0bWwvRmlsZUlu cHV0VHlwZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGaWxlSW5wdXRUeXBlOjp+RmlsZUlucHV0 VHlwZSk6CisgICAgICAgIEludmFsaWRhdGUgdGhlIGZpbGUgY2hvb3Nlci4KKworICAgICAgICAo V2ViQ29yZTo6RmlsZUlucHV0VHlwZTo6aGFuZGxlRE9NQWN0aXZhdGVFdmVudCk6CisgICAgICAg IEFwcGx5IHRoZSBmaWxlIGNob29zZXIgc2V0dGluZ3MuCisKKyAgICAgICAgKFdlYkNvcmU6OkZp bGVJbnB1dFR5cGU6OmFwcGx5RmlsZUNob29zZXJTZXR0aW5ncyk6CisgICAgICAgIFJlY3JlYXRl IHRoZSBmaWxlIGNob29zZXIgd2l0aCBuZXcgc2V0dGluZ3MuCisKKyAgICAgICAgKFdlYkNvcmU6 OkZpbGVJbnB1dFR5cGU6OnJlY2VpdmVEcm9wRm9yRGlyZWN0b3J5VXBsb2FkKToKKyAgICAgICAg QXBwbHkgdGhlIHNldHRpbmdzLgorCisgICAgICAgICogcGxhdGZvcm0vRmlsZUNob29zZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RmlsZUNob29zZXI6OmludmFsaWRhdGUpOgorICAgICAgICBT ZXQgbV9jbGllbnQgdG8gbnVsbC4KKworICAgICAgICAoV2ViQ29yZTo6RmlsZUNob29zZXI6OmNo b29zZUZpbGVzKToKKyAgICAgICAgRWFybHkgcmV0dXJuLgorCisgICAgICAgICogcGxhdGZvcm0v RmlsZUNob29zZXIuaDoKKwogMjAxMy0wNS0wOCAgR2F2aW4gQmFycmFjbG91Z2ggIDxiYXJyYWNs b3VnaEBhcHBsZS5jb20+CiAKICAgICAgICAgUHJvY2VzcyBzdXBwcmVzc2lvbiBzaG91bGQgdGhy b3R0bGUgc2NyaXB0ZWQgYW5pbWF0aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRt bC9GaWxlSW5wdXRUeXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvRmlsZUlucHV0VHlwZS5j cHAKaW5kZXggYjBjZmY4MzI3MmRlZjdkOWMwZGI4OGJjZTY4YjVlMGRhY2EyZDVlZi4uZTg1OTRk MzYwMmEyNTZjNDY1YmM4YjE4ZjUxM2ZkYTcyYWJhZWU2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9GaWxlSW5wdXRUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0Zp bGVJbnB1dFR5cGUuY3BwCkBAIC04NiwxNSArODYsMjEgQEAgY29uc3QgQXRvbWljU3RyaW5nJiBV cGxvYWRCdXR0b25FbGVtZW50OjpzaGFkb3dQc2V1ZG9JZCgpIGNvbnN0CiAgICAgcmV0dXJuIHBz ZXVkb0lkOwogfQogCi1pbmxpbmUgRmlsZUlucHV0VHlwZTo6RmlsZUlucHV0VHlwZShIVE1MSW5w dXRFbGVtZW50KiBlbGVtZW50KQorUGFzc093blB0cjxJbnB1dFR5cGU+IEZpbGVJbnB1dFR5cGU6 OmNyZWF0ZShIVE1MSW5wdXRFbGVtZW50KiBlbGVtZW50KQoreworICAgIHJldHVybiBhZG9wdFB0 cihuZXcgRmlsZUlucHV0VHlwZShlbGVtZW50KSk7Cit9CisKK0ZpbGVJbnB1dFR5cGU6OkZpbGVJ bnB1dFR5cGUoSFRNTElucHV0RWxlbWVudCogZWxlbWVudCkKICAgICA6IEJhc2VDbGlja2FibGVX aXRoS2V5SW5wdXRUeXBlKGVsZW1lbnQpCiAgICAgLCBtX2ZpbGVMaXN0KEZpbGVMaXN0OjpjcmVh dGUoKSkKIHsKIH0KIAotUGFzc093blB0cjxJbnB1dFR5cGU+IEZpbGVJbnB1dFR5cGU6OmNyZWF0 ZShIVE1MSW5wdXRFbGVtZW50KiBlbGVtZW50KQorRmlsZUlucHV0VHlwZTo6fkZpbGVJbnB1dFR5 cGUoKQogewotICAgIHJldHVybiBhZG9wdFB0cihuZXcgRmlsZUlucHV0VHlwZShlbGVtZW50KSk7 CisgICAgaWYgKG1fZmlsZUNob29zZXIpCisgICAgICAgIG1fZmlsZUNob29zZXItPmludmFsaWRh dGUoKTsKIH0KIAogVmVjdG9yPEZpbGVDaG9vc2VyRmlsZUluZm8+IEZpbGVJbnB1dFR5cGU6OmZp bGVzRnJvbUZvcm1Db250cm9sU3RhdGUoY29uc3QgRm9ybUNvbnRyb2xTdGF0ZSYgc3RhdGUpCkBA IC0xOTYsOCArMjAyLDExIEBAIHZvaWQgRmlsZUlucHV0VHlwZTo6aGFuZGxlRE9NQWN0aXZhdGVF dmVudChFdmVudCogZXZlbnQpCiAjaWYgRU5BQkxFKE1FRElBX0NBUFRVUkUpCiAgICAgICAgIHNl dHRpbmdzLmNhcHR1cmUgPSBpbnB1dC0+Y2FwdHVyZSgpOwogI2VuZGlmCi0gICAgICAgIGNocm9t ZS0+cnVuT3BlblBhbmVsKGlucHV0LT5kb2N1bWVudCgpLT5mcmFtZSgpLCBuZXdGaWxlQ2hvb3Nl cihzZXR0aW5ncykpOworCisgICAgICAgIGFwcGx5RmlsZUNob29zZXJTZXR0aW5ncyhzZXR0aW5n cyk7CisgICAgICAgIGNocm9tZS0+cnVuT3BlblBhbmVsKGlucHV0LT5kb2N1bWVudCgpLT5mcmFt ZSgpLCBtX2ZpbGVDaG9vc2VyKTsKICAgICB9CisKICAgICBldmVudC0+c2V0RGVmYXVsdEhhbmRs ZWQoKTsKIH0KIApAQCAtMzMwLDYgKzMzOSwxNCBAQCB2b2lkIEZpbGVJbnB1dFR5cGU6OnJlcXVl c3RJY29uKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBwYXRocykKICAgICAgICAgY2hyb21lLT5sb2Fk SWNvbkZvckZpbGVzKHBhdGhzLCBuZXdGaWxlSWNvbkxvYWRlcigpKTsKIH0KIAordm9pZCBGaWxl SW5wdXRUeXBlOjphcHBseUZpbGVDaG9vc2VyU2V0dGluZ3MoY29uc3QgRmlsZUNob29zZXJTZXR0 aW5ncyYgc2V0dGluZ3MpCit7CisgICAgaWYgKG1fZmlsZUNob29zZXIpCisgICAgICAgIG1fZmls ZUNob29zZXItPmludmFsaWRhdGUoKTsKKworICAgIG1fZmlsZUNob29zZXIgPSBGaWxlQ2hvb3Nl cjo6Y3JlYXRlKHRoaXMsIHNldHRpbmdzKTsKK30KKwogdm9pZCBGaWxlSW5wdXRUeXBlOjpzZXRG aWxlcyhQYXNzUmVmUHRyPEZpbGVMaXN0PiBmaWxlcykKIHsKICAgICBpZiAoIWZpbGVzKQpAQCAt Mzc5LDE2ICszOTYsMjAgQEAgdm9pZCBGaWxlSW5wdXRUeXBlOjpmaWxlc0Nob3Nlbihjb25zdCBW ZWN0b3I8RmlsZUNob29zZXJGaWxlSW5mbz4mIGZpbGVzKQogI2lmIEVOQUJMRShESVJFQ1RPUllf VVBMT0FEKQogdm9pZCBGaWxlSW5wdXRUeXBlOjpyZWNlaXZlRHJvcEZvckRpcmVjdG9yeVVwbG9h ZChjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGF0aHMpCiB7Ci0gICAgaWYgKENocm9tZSogY2hyb21l ID0gdGhpcy0+Y2hyb21lKCkpIHsKLSAgICAgICAgRmlsZUNob29zZXJTZXR0aW5ncyBzZXR0aW5n czsKLSAgICAgICAgSFRNTElucHV0RWxlbWVudCogaW5wdXQgPSBlbGVtZW50KCk7Ci0gICAgICAg IHNldHRpbmdzLmFsbG93c0RpcmVjdG9yeVVwbG9hZCA9IHRydWU7Ci0gICAgICAgIHNldHRpbmdz LmFsbG93c011bHRpcGxlRmlsZXMgPSB0cnVlOwotICAgICAgICBzZXR0aW5ncy5zZWxlY3RlZEZp bGVzLmFwcGVuZChwYXRoc1swXSk7Ci0gICAgICAgIHNldHRpbmdzLmFjY2VwdE1JTUVUeXBlcyA9 IGlucHV0LT5hY2NlcHRNSU1FVHlwZXMoKTsKLSAgICAgICAgc2V0dGluZ3MuYWNjZXB0RmlsZUV4 dGVuc2lvbnMgPSBpbnB1dC0+YWNjZXB0RmlsZUV4dGVuc2lvbnMoKTsKLSAgICAgICAgY2hyb21l LT5lbnVtZXJhdGVDaG9zZW5EaXJlY3RvcnkobmV3RmlsZUNob29zZXIoc2V0dGluZ3MpKTsKLSAg ICB9CisgICAgQ2hyb21lKiBjaHJvbWUgPSB0aGlzLT5jaHJvbWUoKTsKKyAgICBpZiAoIWNocm9t ZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgRmlsZUNob29zZXJTZXR0aW5ncyBzZXR0aW5nczsK KyAgICBIVE1MSW5wdXRFbGVtZW50KiBpbnB1dCA9IGVsZW1lbnQoKTsKKyAgICBzZXR0aW5ncy5h bGxvd3NEaXJlY3RvcnlVcGxvYWQgPSB0cnVlOworICAgIHNldHRpbmdzLmFsbG93c011bHRpcGxl RmlsZXMgPSB0cnVlOworICAgIHNldHRpbmdzLnNlbGVjdGVkRmlsZXMuYXBwZW5kKHBhdGhzWzBd KTsKKyAgICBzZXR0aW5ncy5hY2NlcHRNSU1FVHlwZXMgPSBpbnB1dC0+YWNjZXB0TUlNRVR5cGVz KCk7CisgICAgc2V0dGluZ3MuYWNjZXB0RmlsZUV4dGVuc2lvbnMgPSBpbnB1dC0+YWNjZXB0Rmls ZUV4dGVuc2lvbnMoKTsKKworICAgIGFwcGx5RmlsZUNob29zZXJTZXR0aW5ncyhzZXR0aW5ncyk7 CisgICAgY2hyb21lLT5lbnVtZXJhdGVDaG9zZW5EaXJlY3RvcnkobV9maWxlQ2hvb3Nlcik7CiB9 CiAjZW5kaWYKIApAQCAtNDY2LDQgKzQ4Nyw1IEBAIFN0cmluZyBGaWxlSW5wdXRUeXBlOjpkZWZh dWx0VG9vbFRpcCgpIGNvbnN0CiAgICAgcmV0dXJuIG5hbWVzLnRvU3RyaW5nKCk7CiB9CiAKKwog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9G aWxlSW5wdXRUeXBlLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0ZpbGVJbnB1dFR5cGUuaAppbmRl eCBhMGY0MjkyNjc2YjViYjQ2Y2JhZTk5ZTMyODc0ZTMwMGY4NjY1YWU1Li5lZGFhMWI0MDQyNmUw Mjc0YjAzN2ZhMjhhZWEwMGQ3ODFmNjNjOTIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL0ZpbGVJbnB1dFR5cGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0ZpbGVJbnB1dFR5 cGUuaApAQCAtNDUsMTAgKzQ1LDEzIEBAIGNsYXNzIEZpbGVMaXN0OwogY2xhc3MgRmlsZUlucHV0 VHlwZSA6IHB1YmxpYyBCYXNlQ2xpY2thYmxlV2l0aEtleUlucHV0VHlwZSwgcHJpdmF0ZSBGaWxl Q2hvb3NlckNsaWVudCwgcHJpdmF0ZSBGaWxlSWNvbkxvYWRlckNsaWVudCB7CiBwdWJsaWM6CiAg ICAgc3RhdGljIFBhc3NPd25QdHI8SW5wdXRUeXBlPiBjcmVhdGUoSFRNTElucHV0RWxlbWVudCop OworICAgIHZpcnR1YWwgfkZpbGVJbnB1dFR5cGUoKTsKKwogICAgIHN0YXRpYyBWZWN0b3I8Rmls ZUNob29zZXJGaWxlSW5mbz4gZmlsZXNGcm9tRm9ybUNvbnRyb2xTdGF0ZShjb25zdCBGb3JtQ29u dHJvbFN0YXRlJik7CiAKIHByaXZhdGU6CiAgICAgRmlsZUlucHV0VHlwZShIVE1MSW5wdXRFbGVt ZW50Kik7CisKICAgICB2aXJ0dWFsIGNvbnN0IEF0b21pY1N0cmluZyYgZm9ybUNvbnRyb2xUeXBl KCkgY29uc3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCBGb3JtQ29udHJvbFN0YXRlIHNhdmVGb3Jt Q29udHJvbFN0YXRlKCkgY29uc3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHJlc3RvcmVG b3JtQ29udHJvbFN0YXRlKGNvbnN0IEZvcm1Db250cm9sU3RhdGUmKSBPVkVSUklERTsKQEAgLTg3 LDYgKzkwLDEwIEBAIHByaXZhdGU6CiAjZW5kaWYKICAgICB2b2lkIHJlcXVlc3RJY29uKGNvbnN0 IFZlY3RvcjxTdHJpbmc+Jik7CiAKKyAgICB2b2lkIGFwcGx5RmlsZUNob29zZXJTZXR0aW5ncyhj b25zdCBGaWxlQ2hvb3NlclNldHRpbmdzJik7CisKKyAgICBSZWZQdHI8RmlsZUNob29zZXI+IG1f ZmlsZUNob29zZXI7CisKICAgICBSZWZQdHI8RmlsZUxpc3Q+IG1fZmlsZUxpc3Q7CiAgICAgUmVm UHRyPEljb24+IG1faWNvbjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v RmlsZUNob29zZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vRmlsZUNob29zZXIuY3Bw CmluZGV4IGNkNTBlZTJhMTYyZThmY2Y4ZDAwNmI1MmNlZTdjYmM1MGE4NDg3ZmIuLmRjOTcxYjM2 ZTdhZWVlMjQyNGFiZTEzYzFhOTZmNzRjMmQ3YzhlMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0ZpbGVDaG9vc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9GaWxlQ2hvb3Nlci5jcHAKQEAgLTMxLDI2ICszMSw3IEBACiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAotRmlsZUNob29zZXJDbGllbnQ6On5GaWxlQ2hvb3NlckNsaWVudCgpCi17Ci0gICAgZGlz Y2FyZENob29zZXIoKTsKLX0KLQotRmlsZUNob29zZXIqIEZpbGVDaG9vc2VyQ2xpZW50OjpuZXdG aWxlQ2hvb3Nlcihjb25zdCBGaWxlQ2hvb3NlclNldHRpbmdzJiBzZXR0aW5ncykKLXsKLSAgICBk aXNjYXJkQ2hvb3NlcigpOwotCi0gICAgbV9jaG9vc2VyID0gRmlsZUNob29zZXI6OmNyZWF0ZSh0 aGlzLCBzZXR0aW5ncyk7Ci0gICAgcmV0dXJuIG1fY2hvb3Nlci5nZXQoKTsKLX0KLQotdm9pZCBG aWxlQ2hvb3NlckNsaWVudDo6ZGlzY2FyZENob29zZXIoKQotewotICAgIGlmIChtX2Nob29zZXIp Ci0gICAgICAgIG1fY2hvb3Nlci0+ZGlzY29ubmVjdENsaWVudCgpOwotfQotCi1pbmxpbmUgRmls ZUNob29zZXI6OkZpbGVDaG9vc2VyKEZpbGVDaG9vc2VyQ2xpZW50KiBjbGllbnQsIGNvbnN0IEZp bGVDaG9vc2VyU2V0dGluZ3MmIHNldHRpbmdzKQorRmlsZUNob29zZXI6OkZpbGVDaG9vc2VyKEZp bGVDaG9vc2VyQ2xpZW50KiBjbGllbnQsIGNvbnN0IEZpbGVDaG9vc2VyU2V0dGluZ3MmIHNldHRp bmdzKQogICAgIDogbV9jbGllbnQoY2xpZW50KQogICAgICwgbV9zZXR0aW5ncyhzZXR0aW5ncykK IHsKQEAgLTY1LDYgKzQ2LDEzIEBAIEZpbGVDaG9vc2VyOjp+RmlsZUNob29zZXIoKQogewogfQog Cit2b2lkIEZpbGVDaG9vc2VyOjppbnZhbGlkYXRlKCkKK3sKKyAgICBBU1NFUlQobV9jbGllbnQp OworCisgICAgbV9jbGllbnQgPSAwOworfQorCiB2b2lkIEZpbGVDaG9vc2VyOjpjaG9vc2VGaWxl KGNvbnN0IFN0cmluZyYgZmlsZW5hbWUpCiB7CiAgICAgVmVjdG9yPFN0cmluZz4gZmlsZW5hbWVz OwpAQCAtNzgsMTIgKzY2LDEzIEBAIHZvaWQgRmlsZUNob29zZXI6OmNob29zZUZpbGVzKGNvbnN0 IFZlY3RvcjxTdHJpbmc+JiBmaWxlbmFtZXMpCiAgICAgaWYgKG1fc2V0dGluZ3Muc2VsZWN0ZWRG aWxlcyA9PSBmaWxlbmFtZXMpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChtX2NsaWVudCkg ewotICAgICAgICBWZWN0b3I8RmlsZUNob29zZXJGaWxlSW5mbz4gZmlsZXM7Ci0gICAgICAgIGZv ciAodW5zaWduZWQgaSA9IDA7IGkgPCBmaWxlbmFtZXMuc2l6ZSgpOyArK2kpCi0gICAgICAgICAg ICBmaWxlcy5hcHBlbmQoRmlsZUNob29zZXJGaWxlSW5mbyhmaWxlbmFtZXNbaV0pKTsKLSAgICAg ICAgbV9jbGllbnQtPmZpbGVzQ2hvc2VuKGZpbGVzKTsKLSAgICB9CisgICAgaWYgKCFtX2NsaWVu dCkKKyAgICAgICAgcmV0dXJuOworCisgICAgVmVjdG9yPEZpbGVDaG9vc2VyRmlsZUluZm8+IGZp bGVzOworICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBmaWxlbmFtZXMuc2l6ZSgpOyArK2kp CisgICAgICAgIGZpbGVzLmFwcGVuZChGaWxlQ2hvb3NlckZpbGVJbmZvKGZpbGVuYW1lc1tpXSkp OworICAgIG1fY2xpZW50LT5maWxlc0Nob3NlbihmaWxlcyk7CiB9CiAKIHZvaWQgRmlsZUNob29z ZXI6OmNob29zZUZpbGVzKGNvbnN0IFZlY3RvcjxGaWxlQ2hvb3NlckZpbGVJbmZvPiYgZmlsZXMp CkBAIC05Miw2ICs4MSw3IEBAIHZvaWQgRmlsZUNob29zZXI6OmNob29zZUZpbGVzKGNvbnN0IFZl Y3RvcjxGaWxlQ2hvb3NlckZpbGVJbmZvPiYgZmlsZXMpCiAgICAgVmVjdG9yPFN0cmluZz4gcGF0 aHM7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGZpbGVzLnNpemUoKTsgKytpKQogICAg ICAgICBwYXRocy5hcHBlbmQoZmlsZXNbaV0ucGF0aCk7CisKICAgICBpZiAobV9zZXR0aW5ncy5z ZWxlY3RlZEZpbGVzID09IHBhdGhzKQogICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL0ZpbGVDaG9vc2VyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9GaWxlQ2hvb3Nlci5oCmluZGV4IGU2ZjYxNDY2MjliMGFjOGNkM2Q4YmY5YTdhZGNiMDY4 MGJiY2NiYTEuLjZjMDIzZTNkNmRkZDNlZGQ5MDczMWQxYzFhYTg5Y2E5NzMxNzg4MDAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0ZpbGVDaG9vc2VyLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vRmlsZUNob29zZXIuaApAQCAtNjcsMTYgKzY3LDkgQEAgc3RydWN0 IEZpbGVDaG9vc2VyU2V0dGluZ3MgewogCiBjbGFzcyBGaWxlQ2hvb3NlckNsaWVudCB7CiBwdWJs aWM6Ci0gICAgdmlydHVhbCB2b2lkIGZpbGVzQ2hvc2VuKGNvbnN0IFZlY3RvcjxGaWxlQ2hvb3Nl ckZpbGVJbmZvPiYpID0gMDsKLSAgICB2aXJ0dWFsIH5GaWxlQ2hvb3NlckNsaWVudCgpOwotCi1w cm90ZWN0ZWQ6Ci0gICAgRmlsZUNob29zZXIqIG5ld0ZpbGVDaG9vc2VyKGNvbnN0IEZpbGVDaG9v c2VyU2V0dGluZ3MmKTsKKyAgICB2aXJ0dWFsIH5GaWxlQ2hvb3NlckNsaWVudCgpIHsgfQogCi1w cml2YXRlOgotICAgIHZvaWQgZGlzY2FyZENob29zZXIoKTsKLQotICAgIFJlZlB0cjxGaWxlQ2hv b3Nlcj4gbV9jaG9vc2VyOworICAgIHZpcnR1YWwgdm9pZCBmaWxlc0Nob3Nlbihjb25zdCBWZWN0 b3I8RmlsZUNob29zZXJGaWxlSW5mbz4mKSA9IDA7CiB9OwogCiBjbGFzcyBGaWxlQ2hvb3NlciA6 IHB1YmxpYyBSZWZDb3VudGVkPEZpbGVDaG9vc2VyPiB7CkBAIC04NCw3ICs3Nyw3IEBAIHB1Ymxp YzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxGaWxlQ2hvb3Nlcj4gY3JlYXRlKEZpbGVDaG9vc2Vy Q2xpZW50KiwgY29uc3QgRmlsZUNob29zZXJTZXR0aW5ncyYpOwogICAgIH5GaWxlQ2hvb3Nlcigp OwogCi0gICAgdm9pZCBkaXNjb25uZWN0Q2xpZW50KCkgeyBtX2NsaWVudCA9IDA7IH0KKyAgICB2 b2lkIGludmFsaWRhdGUoKTsKIAogICAgIHZvaWQgY2hvb3NlRmlsZShjb25zdCBTdHJpbmcmIHBh dGgpOwogICAgIHZvaWQgY2hvb3NlRmlsZXMoY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhdGhzKTsK