146423 2015-06-29 13:42:22 -0700 Setting to enable/disable media controls sizing on page zoom 2015-06-29 13:55:27 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dino dino oldest_to_newest 1105480 0 dino 2015-06-29 13:42:22 -0700 Setting to enable/disable media controls sizing on page zoom 1105481 1 dino 2015-06-29 13:42:53 -0700 <rdar://problem/18379634> 1105482 2 255771 dino 2015-06-29 13:48:04 -0700 Created attachment 255771 Patch 1105486 3 dino 2015-06-29 13:55:27 -0700 Committed r186083: <http://trac.webkit.org/changeset/186083> 255771 2015-06-29 13:48:04 -0700 2015-06-29 13:50:55 -0700 Patch bug-146423-20150630064713.patch text/plain 16395 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2MDE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQwMjY5ZmYwMzIyMGZk NmE0Nzg0MDNjY2Y5ODQ3ZjgwYTkzYTY3Ny4uNzAyMWZmNjk3NmNiZDllYjkyMDYyZTc5Y2EzODA5 ZjE1MGUxZTExMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA2LTI5ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBTZXR0aW5nIHRvIGVuYWJsZS9k aXNhYmxlIG1lZGlhIGNvbnRyb2xzIHNpemluZyBvbiBwYWdlIHpvb20KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjQyMworICAgICAgICA8cmRhcjov L3Byb2JsZW0vMTgzNzk2MzQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIGEgbmV3IHNldHRpbmcgIk1lZGlhQ29udHJvbHNTY2FsZVdpdGhQYWdl Wm9vbSIgdGhhdCBjYW4gZGlzYWJsZQorICAgICAgICB0aGUgYmVoYXZpb3VyIHdlIGN1cnJlbnRs eSBpbXBsZW1lbnQgb24gaU9TLCB3aGVyZSB0aGUgbWVkaWEgY29udHJvbHMKKyAgICAgICAgYXR0 ZW1wdCB0byByZW1haW4gYXQgYSBmaXhlZCBzaXplIGluZGVwZW5kZW50IG9mIHBhZ2Ugem9vbS4K KworICAgICAgICAqIGh0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MTWVkaWFFbGVtZW50OjpzZXRNZWRpYUNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0 b3IpOiBEbyBub3QKKyAgICAgICAgc2V0IHRoaXMgdmFsdWUgdG8gdHJ1ZSBpZiB0aGUgbmV3IHNl dHRpbmcgaXMgZGlzYWJsZWQuCisgICAgICAgICogcGFnZS9TZXR0aW5ncy5jcHA6CisgICAgICAg ICogcGFnZS9TZXR0aW5ncy5pbjogQWRkIHRoZSBuZXcgc2V0dGluZy4KKwogMjAxNS0wNi0yNiAg RGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgUm9sbGluZyBvdXQg cjE4NDY2MApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IDI0NGNkYWViZDRiZGQzZDJhNzhkMTY4MzZhMmQz Mzg1Mzk1OTIyM2QuLjZhNjY2ZTdkMTkzNmY5MTcxN2E3ZjY1YzkxMzAxODA4N2E0OTU4MWYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0 L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxNS0wNi0yOSAgRGVhbiBKYWNrc29u ICA8ZGlub0BhcHBsZS5jb20+CisKKyAgICAgICAgU2V0dGluZyB0byBlbmFibGUvZGlzYWJsZSBt ZWRpYSBjb250cm9scyBzaXppbmcgb24gcGFnZSB6b29tCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDY0MjMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzE4Mzc5NjM0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZCBhIG5ldyBzZXR0aW5nICJNZWRpYUNvbnRyb2xzU2NhbGVXaXRoUGFnZVpvb20iIHRo YXQgY2FuIGRpc2FibGUKKyAgICAgICAgdGhlIGJlaGF2aW91ciB3ZSBjdXJyZW50bHkgaW1wbGVt ZW50IG9uIGlPUywgd2hlcmUgdGhlIG1lZGlhIGNvbnRyb2xzCisgICAgICAgIGF0dGVtcHQgdG8g cmVtYWluIGF0IGEgZml4ZWQgc2l6ZSBpbmRlcGVuZGVudCBvZiBwYWdlIHpvb20uCisKKyAgICAg ICAgKiBXZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oOgorICAgICAgICAqIFdlYlZp ZXcvV2ViUHJlZmVyZW5jZXMubW06CisgICAgICAgICgrW1dlYlByZWZlcmVuY2VzIGluaXRpYWxp emVdKTogSW5pdGlhbGl6ZSB0byBmYWxzZSBvbiBpT1MsIHRydWUgb3RoZXJ3aXNlLgorICAgICAg ICAoLVtXZWJQcmVmZXJlbmNlcyBtZWRpYUNvbnRyb2xzU2NhbGVXaXRoUGFnZVpvb21dKToKKyAg ICAgICAgKC1bV2ViUHJlZmVyZW5jZXMgc2V0TWVkaWFDb250cm9sc1NjYWxlV2l0aFBhZ2Vab29t Ol0pOgorICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmg6CisgICAgICAg ICogV2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9wcmVmZXJlbmNlc0No YW5nZWQ6XSk6CisKIDIwMTUtMDYtMjYgIEh5dW5nd29vayBMZWUgIDxoeXVuZ3dvb2subGVlQG5h dmVyY29ycC5jb20+CiAKICAgICAgICAgW1dpbl0gSW1wbGVtZW50IFdlYlZpZXdHcm91cCB0byBz dXBwb3J0IFdlYlZpZXc6OmFkZHh4eFRvR3JvdXAoKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBmZjAxMTc2Mjdh MTgzOWY5YWFhZmNhMzA3ZjFjMDdkZjlmODI0YzU3Li40YzEzMWY1MTI2MzE2ZjkwMDhkYWJiZTc3 MTE2ZjVmYzg3NGYxYWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTUtMDYtMjkg IERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAgICAgIFNldHRpbmcgdG8gZW5h YmxlL2Rpc2FibGUgbWVkaWEgY29udHJvbHMgc2l6aW5nIG9uIHBhZ2Ugem9vbQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ2NDIzCisgICAgICAgIDxy ZGFyOi8vcHJvYmxlbS8xODM3OTYzND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGQgYSBuZXcgc2V0dGluZyAiTWVkaWFDb250cm9sc1NjYWxlV2l0 aFBhZ2Vab29tIiB0aGF0IGNhbiBkaXNhYmxlCisgICAgICAgIHRoZSBiZWhhdmlvdXIgd2UgY3Vy cmVudGx5IGltcGxlbWVudCBvbiBpT1MsIHdoZXJlIHRoZSBtZWRpYSBjb250cm9scworICAgICAg ICBhdHRlbXB0IHRvIHJlbWFpbiBhdCBhIGZpeGVkIHNpemUgaW5kZXBlbmRlbnQgb2YgcGFnZSB6 b29tLgorCisgICAgICAgICogU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmaW5pdGlvbnMuaDogSW5p dGlhbGl6ZSB0byBmYWxzZSBvbiBpT1MsIHRydWUgb3RoZXJ3aXNlLgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcDoKKyAgICAgICAgKFdLUHJlZmVyZW5jZXNTZXRN ZWRpYUNvbnRyb2xzU2NhbGVXaXRoUGFnZVpvb20pOgorICAgICAgICAoV0tQcmVmZXJlbmNlc0dl dE1lZGlhQ29udHJvbHNTY2FsZVdpdGhQYWdlWm9vbSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9DL1dLUHJlZmVyZW5jZXNSZWZQcml2YXRlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1cGRhdGVQcmVmZXJl bmNlcyk6CisKIDIwMTUtMDYtMjYgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAg ICAgICAgIEdhcmRlaW5pbmc6IHJlbW92ZSBhbiBhc3NlcnRpb24gYW5kIGEgI2ltcG9ydCB0byBn cmVlbiB0aGUgYm90LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFF bGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKaW5k ZXggNjQzODBlZDE1ZDFjZDNjNzFhOGQzOTgxNzM3MDBhMDgwODY4OTY0Yi4uNTY5YTNmYjYxNzBm OTI0MTQ0MTcwMzUwZDkxZmMyZmYzZTFhZjE4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxN ZWRpYUVsZW1lbnQuY3BwCkBAIC02MTU0LDYgKzYxNTQsMTQgQEAgdm9pZCBIVE1MTWVkaWFFbGVt ZW50OjpkaWRBZGRVc2VyQWdlbnRTaGFkb3dSb290KFNoYWRvd1Jvb3QqIHJvb3QpCiB2b2lkIEhU TUxNZWRpYUVsZW1lbnQ6OnNldE1lZGlhQ29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3Rvcihi b29sIGRlcGVuZHNPblBhZ2VTY2FsZSkKIHsKICAgICBMT0coTWVkaWEsICJNZWRpYUVsZW1lbnQ6 OnNldE1lZGlhQ29udHJvbHNEZXBlbmRQYWdlU2NhbGVGYWN0b3IoJXApID0gJXMiLCB0aGlzLCBi b29sU3RyaW5nKGRlcGVuZHNPblBhZ2VTY2FsZSkpOworCisgICAgU2V0dGluZ3MqIHNldHRpbmdz ID0gZG9jdW1lbnQoKS5zZXR0aW5ncygpOworICAgIGlmIChzZXR0aW5ncyAmJiBzZXR0aW5ncy0+ bWVkaWFDb250cm9sc1NjYWxlV2l0aFBhZ2Vab29tKCkpIHsKKyAgICAgICAgTE9HKE1lZGlhLCAi TWVkaWFFbGVtZW50OjpzZXRNZWRpYUNvbnRyb2xzRGVwZW5kUGFnZVNjYWxlRmFjdG9yKCVwKSBm b3JjZWQgdG8gZmFsc2UgYnkgU2V0dGluZ3MgdmFsdWUiLCB0aGlzKTsKKyAgICAgICAgbV9tZWRp YUNvbnRyb2xzRGVwZW5kT25QYWdlU2NhbGVGYWN0b3IgPSBmYWxzZTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKwogICAgIGlmIChtX21lZGlhQ29udHJvbHNEZXBlbmRPblBhZ2VTY2FsZUZhY3Rv ciA9PSBkZXBlbmRzT25QYWdlU2NhbGUpCiAgICAgICAgIHJldHVybjsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Nl dHRpbmdzLmNwcAppbmRleCBmMjg0NDA5Zjg4YjUwZDM1ODZjYWZlYzY4NWFlZDUxN2NiODY4MDlm Li5iYTMwYmQ4MTBiY2Y0MmEzNDRlZDYxYzc1MzFhYzBmODRkMzJkZjJkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L1NldHRpbmdzLmNwcApAQCAtMTM1LDYgKzEzNSw3IEBAIHN0YXRpYyBjb25zdCBib29sIGRlZmF1 bHRBdWRpb1BsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZSA9IHRydWU7CiBzdGF0aWMgY29uc3Qg Ym9vbCBkZWZhdWx0U2hvdWxkUmVzcGVjdEltYWdlT3JpZW50YXRpb24gPSB0cnVlOwogc3RhdGlj IGNvbnN0IGJvb2wgZGVmYXVsdEltYWdlU3Vic2FtcGxpbmdFbmFibGVkID0gdHJ1ZTsKIHN0YXRp YyBjb25zdCBib29sIGRlZmF1bHRTY3JvbGxpbmdUcmVlSW5jbHVkZXNGcmFtZXMgPSB0cnVlOwor c3RhdGljIGNvbnN0IGJvb2wgZGVmYXVsdE1lZGlhQ29udHJvbHNTY2FsZVdpdGhQYWdlWm9vbSA9 IHRydWU7CiAjZWxzZQogc3RhdGljIGNvbnN0IGJvb2wgZGVmYXVsdEZpeGVkUG9zaXRpb25DcmVh dGVzU3RhY2tpbmdDb250ZXh0ID0gZmFsc2U7CiBzdGF0aWMgY29uc3QgYm9vbCBkZWZhdWx0Rml4 ZWRCYWNrZ3JvdW5kc1BhaW50UmVsYXRpdmVUb0RvY3VtZW50ID0gZmFsc2U7CkBAIC0xNDUsNiAr MTQ2LDcgQEAgc3RhdGljIGNvbnN0IGJvb2wgZGVmYXVsdEF1ZGlvUGxheWJhY2tSZXF1aXJlc1Vz ZXJHZXN0dXJlID0gZmFsc2U7CiBzdGF0aWMgY29uc3QgYm9vbCBkZWZhdWx0U2hvdWxkUmVzcGVj dEltYWdlT3JpZW50YXRpb24gPSBmYWxzZTsKIHN0YXRpYyBjb25zdCBib29sIGRlZmF1bHRJbWFn ZVN1YnNhbXBsaW5nRW5hYmxlZCA9IGZhbHNlOwogc3RhdGljIGNvbnN0IGJvb2wgZGVmYXVsdFNj cm9sbGluZ1RyZWVJbmNsdWRlc0ZyYW1lcyA9IGZhbHNlOworc3RhdGljIGNvbnN0IGJvb2wgZGVm YXVsdE1lZGlhQ29udHJvbHNTY2FsZVdpdGhQYWdlWm9vbSA9IHRydWU7CiAjZW5kaWYKIAogc3Rh dGljIGNvbnN0IGJvb2wgZGVmYXVsdEFsbG93c1BpY3R1cmVJblBpY3R1cmVNZWRpYVBsYXliYWNr ID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaW4gYi9T b3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCmluZGV4IDhkNzE3MzMxMGQzNTY3NjYyMDEw Nzc2ZWJjMDJiMmI5MzZlZTQ5MmMuLmQwNzE4MWVmMGJkNWE3NDg0ZGJhYjBjYmQxYTliMzA1ZDVi ZWVkZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaW4KKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5pbgpAQCAtMTI5LDYgKzEyOSw3IEBAIHJlcXVp cmVzVXNlckdlc3R1cmVGb3JNZWRpYVBsYXliYWNrIGluaXRpYWw9ZGVmYXVsdFJlcXVpcmVzVXNl ckdlc3R1cmVGb3JNZWRpYVBsCiBhdWRpb1BsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZSBpbml0 aWFsPWRlZmF1bHRBdWRpb1BsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZQogYWxsb3dzSW5saW5l TWVkaWFQbGF5YmFjayBpbml0aWFsPWRlZmF1bHRBbGxvd3NJbmxpbmVNZWRpYVBsYXliYWNrCiBh bGxvd3NQaWN0dXJlSW5QaWN0dXJlTWVkaWFQbGF5YmFjayBpbml0aWFsPWRlZmF1bHRBbGxvd3NQ aWN0dXJlSW5QaWN0dXJlTWVkaWFQbGF5YmFjaworbWVkaWFDb250cm9sc1NjYWxlV2l0aFBhZ2Va b29tIGluaXRpYWw9ZGVmYXVsdE1lZGlhQ29udHJvbHNTY2FsZVdpdGhQYWdlWm9vbQogcGFzc3dv cmRFY2hvRW5hYmxlZCBpbml0aWFsPWZhbHNlCiBzdXBwcmVzc2VzSW5jcmVtZW50YWxSZW5kZXJp bmcgaW5pdGlhbD1mYWxzZQogaW5jcmVtZW50YWxSZW5kZXJpbmdTdXBwcmVzc2lvblRpbWVvdXRJ blNlY29uZHMgdHlwZT1kb3VibGUsIGluaXRpYWw9ZGVmYXVsdEluY3JlbWVudGFsUmVuZGVyaW5n U3VwcHJlc3Npb25UaW1lb3V0SW5TZWNvbmRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9tYWMv V2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaAppbmRleCAzZjBjOGRkZWRiYTAzMGQ1 ZjJmMjc5YzIwYmYzN2Y2ZDZkZDlkODQzLi5mNWJlOTZmZjU0Y2ViOTA2ZDA4N2U5YTUzZDBmMzgx ZjYyZWY4ZmNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZl cmVuY2VLZXlzUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJl ZmVyZW5jZUtleXNQcml2YXRlLmgKQEAgLTEyMyw2ICsxMjMsNyBAQAogI2RlZmluZSBXZWJLaXRB bGxvd3NJbmxpbmVNZWRpYVBsYXliYWNrUHJlZmVyZW5jZUtleSBAIldlYktpdE1lZGlhUGxheWJh Y2tBbGxvd3NJbmxpbmUiCiAjZGVmaW5lIFdlYktpdEFsbG93c1BpY3R1cmVJblBpY3R1cmVNZWRp YVBsYXliYWNrUHJlZmVyZW5jZUtleSBAIldlYktpdEFsbG93c1BpY3R1cmVJblBpY3R1cmVNZWRp YVBsYXliYWNrIgogI2RlZmluZSBXZWJLaXRBbGxvd3NBaXJQbGF5Rm9yTWVkaWFQbGF5YmFja1By ZWZlcmVuY2VLZXkgQCJXZWJLaXRNZWRpYVBsYXliYWNrQWxsb3dzQWlyUGxheSIKKyNkZWZpbmUg V2ViS2l0TWVkaWFDb250cm9sc1NjYWxlV2l0aFBhZ2Vab29tUHJlZmVyZW5jZUtleSBAIldlYktp dE1lZGlhQ29udHJvbHNTY2FsZVdpdGhQYWdlWm9vbSIKICNkZWZpbmUgV2ViS2l0TW9ja1Njcm9s bGJhcnNFbmFibGVkUHJlZmVyZW5jZUtleSBAIldlYktpdE1vY2tTY3JvbGxiYXJzRW5hYmxlZCIK ICNkZWZpbmUgV2ViS2l0U2hvdWxkRGlzcGxheVN1YnRpdGxlc1ByZWZlcmVuY2VLZXkgQCJXZWJL aXRTaG91bGREaXNwbGF5U3VidGl0bGVzIgogI2RlZmluZSBXZWJLaXRTaG91bGREaXNwbGF5Q2Fw dGlvbnNQcmVmZXJlbmNlS2V5IEAiV2ViS2l0U2hvdWxkRGlzcGxheUNhcHRpb25zIgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbSBiL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0KaW5kZXggN2ZhODJkODZhYTky ZWUwYzY5YzQ4YjZjOTJiNDVjOGEzZTE1MTVlZi4uNmZlYzAyMTc1MDZiZWU1NTY3YzFmMDU0YzVj NGE3ZjA4ZjhlNTgzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQ cmVmZXJlbmNlcy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVu Y2VzLm1tCkBAIC01MTgsNiArNTE4LDcgQEAgcHVibGljOgogI2lmICFQTEFURk9STShJT1MpCiAg ICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpOT10sICAgV2ViS2l0UmVxdWlyZXNVc2Vy R2VzdHVyZUZvck1lZGlhUGxheWJhY2tQcmVmZXJlbmNlS2V5LAogICAgICAgICBbTlNOdW1iZXIg bnVtYmVyV2l0aEJvb2w6WUVTXSwgIFdlYktpdEFsbG93c0lubGluZU1lZGlhUGxheWJhY2tQcmVm ZXJlbmNlS2V5LAorICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwgIFdlYktp dE1lZGlhQ29udHJvbHNTY2FsZVdpdGhQYWdlWm9vbVByZWZlcmVuY2VLZXksCiAgICAgICAgIFtO U051bWJlciBudW1iZXJXaXRoQm9vbDpOT10sICAgV2ViS2l0V2ViQXVkaW9FbmFibGVkUHJlZmVy ZW5jZUtleSwKICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sICBXZWJLaXRC YWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZEtleSwKICAgICAgICAgW05TTnVtYmVyIG51bWJl cldpdGhCb29sOk5PXSwgICBXZWJLaXRTaG91bGREaXNwbGF5U3VidGl0bGVzUHJlZmVyZW5jZUtl eSwKQEAgLTUyOCw2ICs1MjksNyBAQCBwdWJsaWM6CiAjZWxzZQogICAgICAgICBbTlNOdW1iZXIg bnVtYmVyV2l0aEJvb2w6WUVTXSwgIFdlYktpdFJlcXVpcmVzVXNlckdlc3R1cmVGb3JNZWRpYVBs YXliYWNrUHJlZmVyZW5jZUtleSwKICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOk5P XSwgICBXZWJLaXRBbGxvd3NJbmxpbmVNZWRpYVBsYXliYWNrUHJlZmVyZW5jZUtleSwKKyAgICAg ICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOk5PXSwgICBXZWJLaXRNZWRpYUNvbnRyb2xzU2Nh bGVXaXRoUGFnZVpvb21QcmVmZXJlbmNlS2V5LAogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0 aFVuc2lnbmVkSW50OkF1ZGlvU2Vzc2lvbjo6Tm9uZV0sICBXZWJLaXRBdWRpb1Nlc3Npb25DYXRl Z29yeU92ZXJyaWRlLAogI2lmIEhBVkUoQVZLSVQpCiAgICAgICAgIFtOU051bWJlciBudW1iZXJX aXRoQm9vbDpZRVNdLCAgV2ViS2l0QVZLaXRFbmFibGVkLApAQCAtMjE5NSw2ICsyMTk3LDE2IEBA IHN0YXRpYyBOU1N0cmluZyAqY2xhc3NJQkNyZWF0b3JJRCA9IG5pbDsKICAgICBbc2VsZiBfc2V0 Qm9vbFZhbHVlOmZsYWcgZm9yS2V5OldlYktpdEFsbG93c0lubGluZU1lZGlhUGxheWJhY2tQcmVm ZXJlbmNlS2V5XTsKIH0KIAorLSAoQk9PTCltZWRpYUNvbnRyb2xzU2NhbGVXaXRoUGFnZVpvb20K K3sKKyAgICByZXR1cm4gW3NlbGYgX2Jvb2xWYWx1ZUZvcktleTpXZWJLaXRNZWRpYUNvbnRyb2xz U2NhbGVXaXRoUGFnZVpvb21QcmVmZXJlbmNlS2V5XTsKK30KKworLSAodm9pZClzZXRNZWRpYUNv bnRyb2xzU2NhbGVXaXRoUGFnZVpvb206KEJPT0wpZmxhZworeworICAgIFtzZWxmIF9zZXRCb29s VmFsdWU6ZmxhZyBmb3JLZXk6V2ViS2l0TWVkaWFDb250cm9sc1NjYWxlV2l0aFBhZ2Vab29tUHJl ZmVyZW5jZUtleV07Cit9CisKIC0gKEJPT0wpYWxsb3dzQWx0ZXJuYXRlRnVsbHNjcmVlbgogewog ICAgIHJldHVybiBbc2VsZiBhbGxvd3NQaWN0dXJlSW5QaWN0dXJlTWVkaWFQbGF5YmFja107CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0 ZS5oIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaApp bmRleCAzNDc3NjllZGQ0ZDhiZGFjMGY2ODRhOTY4MTdjZjFiMzJlNzczMTEwLi5iZmY5YzE0OGQ1 MmY2NGEyYzFiMjQ1NjEzZjU5YzQ1YTdkOTU5YmVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQv bWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmgKQEAgLTI1MCw2ICsyNTAsOSBAQCBl eHRlcm4gTlNTdHJpbmcgKldlYlByZWZlcmVuY2VzQ2FjaGVNb2RlbENoYW5nZWRJbnRlcm5hbE5v dGlmaWNhdGlvbjsKIC0gKHZvaWQpc2V0TWVkaWFQbGF5YmFja0FsbG93c0lubGluZTooQk9PTClm bGFnOwogLSAoQk9PTCltZWRpYVBsYXliYWNrQWxsb3dzSW5saW5lOwogCistICh2b2lkKXNldE1l ZGlhQ29udHJvbHNTY2FsZVdpdGhQYWdlWm9vbTooQk9PTClmbGFnOworLSAoQk9PTCltZWRpYUNv bnRyb2xzU2NhbGVXaXRoUGFnZVpvb207CisKIC0gKHZvaWQpc2V0QWxsb3dzQWx0ZXJuYXRlRnVs bHNjcmVlbjooQk9PTClmbGFnOwogLSAoQk9PTClhbGxvd3NBbHRlcm5hdGVGdWxsc2NyZWVuOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0gYi9Tb3Vy Y2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KaW5kZXggMTVlM2I3NDkwNjJjNWU5YmJj NmJmYzhiZTYzZmIxMGI1YzdmMDk0Yi4uMzUwYmE1NGIyY2FjMTc5ODM2ZWJiZTBkYjU4NGViYmNk ZTAyY2RlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQpAQCAtMjI5NSw2ICsy Mjk1LDcgQEAgc3RhdGljIGJvb2wgbmVlZHNTZWxmUmV0YWluV2hpbGVMb2FkaW5nUXVpcmsoKQog ICAgIHNldHRpbmdzLnNldFJlcXVpcmVzVXNlckdlc3R1cmVGb3JNZWRpYVBsYXliYWNrKFtwcmVm ZXJlbmNlcyBtZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZV0pOwogICAgIHNldHRpbmdz LnNldEFsbG93c0lubGluZU1lZGlhUGxheWJhY2soW3ByZWZlcmVuY2VzIG1lZGlhUGxheWJhY2tB bGxvd3NJbmxpbmVdKTsKICAgICBzZXR0aW5ncy5zZXRBbGxvd3NQaWN0dXJlSW5QaWN0dXJlTWVk aWFQbGF5YmFjayhbcHJlZmVyZW5jZXMgYWxsb3dzUGljdHVyZUluUGljdHVyZU1lZGlhUGxheWJh Y2tdICYmIHNob3VsZEFsbG93UGljdHVyZUluUGljdHVyZU1lZGlhUGxheWJhY2soKSk7CisgICAg c2V0dGluZ3Muc2V0TWVkaWFDb250cm9sc1NjYWxlV2l0aFBhZ2Vab29tKFtwcmVmZXJlbmNlcyBt ZWRpYUNvbnRyb2xzU2NhbGVXaXRoUGFnZVpvb21dKTsKICAgICBzZXR0aW5ncy5zZXRTdXBwcmVz c2VzSW5jcmVtZW50YWxSZW5kZXJpbmcoW3ByZWZlcmVuY2VzIHN1cHByZXNzZXNJbmNyZW1lbnRh bFJlbmRlcmluZ10pOwogICAgIHNldHRpbmdzLnNldEJhY2tzcGFjZUtleU5hdmlnYXRpb25FbmFi bGVkKFtwcmVmZXJlbmNlcyBiYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZF0pOwogICAgIHNl dHRpbmdzLnNldFdhbnRzQmFsYW5jZWRTZXREZWZlcnNMb2FkaW5nQmVoYXZpb3IoW3ByZWZlcmVu Y2VzIHdhbnRzQmFsYW5jZWRTZXREZWZlcnNMb2FkaW5nQmVoYXZpb3JdKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmluaXRpb25zLmggYi9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZpbml0aW9ucy5oCmluZGV4IDMwMGI2 MDcxYjFhZjY3ZmE4NmNkZWExNWI2NzhjZTVkMDZkZWExOTcuLjE0MjNjYWJlZmQwY2Y0YmI5OGRm ZWM4MTEzNDI3ZmFiYzY1ZTA2ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9X ZWJQcmVmZXJlbmNlc0RlZmluaXRpb25zLmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dl YlByZWZlcmVuY2VzRGVmaW5pdGlvbnMuaApAQCAtNTgsNiArNTgsNyBAQAogI2RlZmluZSBERUZB VUxUX1BBU1NXT1JEX0VDSE9fRU5BQkxFRCB0cnVlCiAjZGVmaW5lIERFRkFVTFRfQUxMT1dTX0lO TElORV9NRURJQV9QTEFZQkFDSyBmYWxzZQogI2RlZmluZSBERUZBVUxUX1JFUVVJUkVTX1VTRVJf R0VTVFVSRV9GT1JfTUVESUFfUExBWUJBQ0sgdHJ1ZQorI2RlZmluZSBERUZBVUxUX01FRElBX0NP TlRST0xTX1NDQUxFX1dJVEhfUEFHRV9aT09NIGZhbHNlCiAjZGVmaW5lIERFRkFVTFRfVEVNUE9S QVJZX1RJTEVfQ09IT1JUX1JFVEVOVElPTl9FTkFCTEVEIGZhbHNlCiAjZWxzZQogI2RlZmluZSBE RUZBVUxUX0ZSQU1FX0ZMQVRURU5JTkdfRU5BQkxFRCBmYWxzZQpAQCAtNjksNiArNzAsNyBAQAog I2RlZmluZSBERUZBVUxUX1BBU1NXT1JEX0VDSE9fRU5BQkxFRCBmYWxzZQogI2RlZmluZSBERUZB VUxUX0FMTE9XU19JTkxJTkVfTUVESUFfUExBWUJBQ0sgdHJ1ZQogI2RlZmluZSBERUZBVUxUX1JF UVVJUkVTX1VTRVJfR0VTVFVSRV9GT1JfTUVESUFfUExBWUJBQ0sgZmFsc2UKKyNkZWZpbmUgREVG QVVMVF9NRURJQV9DT05UUk9MU19TQ0FMRV9XSVRIX1BBR0VfWk9PTSB0cnVlCiAjZGVmaW5lIERF RkFVTFRfVEVNUE9SQVJZX1RJTEVfQ09IT1JUX1JFVEVOVElPTl9FTkFCTEVEIHRydWUKICNlbmRp ZgogCkBAIC0xMzIsNiArMTM0LDcgQEAKICAgICBtYWNybyhBbGxvd3NJbmxpbmVNZWRpYVBsYXli YWNrLCBhbGxvd3NJbmxpbmVNZWRpYVBsYXliYWNrLCBCb29sLCBib29sLCBERUZBVUxUX0FMTE9X U19JTkxJTkVfTUVESUFfUExBWUJBQ0spIFwKICAgICBtYWNybyhBbGxvd3NQaWN0dXJlSW5QaWN0 dXJlTWVkaWFQbGF5YmFjaywgYWxsb3dzUGljdHVyZUluUGljdHVyZU1lZGlhUGxheWJhY2ssIEJv b2wsIGJvb2wsIHRydWUpIFwKICAgICBtYWNybyhBbGxvd3NBaXJQbGF5Rm9yTWVkaWFQbGF5YmFj aywgYWxsb3dzQWlyUGxheUZvck1lZGlhUGxheWJhY2ssIEJvb2wsIGJvb2wsIHRydWUpIFwKKyAg ICBtYWNybyhNZWRpYUNvbnRyb2xzU2NhbGVXaXRoUGFnZVpvb20sIG1lZGlhQ29udHJvbHNTY2Fs ZVdpdGhQYWdlWm9vbSwgQm9vbCwgYm9vbCwgREVGQVVMVF9NRURJQV9DT05UUk9MU19TQ0FMRV9X SVRIX1BBR0VfWk9PTSkgXAogICAgIG1hY3JvKEluc3BlY3RvclN0YXJ0c0F0dGFjaGVkLCBpbnNw ZWN0b3JTdGFydHNBdHRhY2hlZCwgQm9vbCwgYm9vbCwgdHJ1ZSkgXAogICAgIG1hY3JvKFNob3dz VG9vbFRpcE92ZXJUcnVuY2F0ZWRUZXh0LCBzaG93c1Rvb2xUaXBPdmVyVHJ1bmNhdGVkVGV4dCwg Qm9vbCwgYm9vbCwgZmFsc2UpIFwKICAgICBtYWNybyhNb2NrU2Nyb2xsYmFyc0VuYWJsZWQsIG1v Y2tTY3JvbGxiYXJzRW5hYmxlZCwgQm9vbCwgYm9vbCwgZmFsc2UpIFwKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAppbmRleCBlMGU1OTIyYWZk ODMzZWRjZDg5YmExYjM5ODNjZDM0ZDk1MzdjMzZjLi41YTUzNGMwNjcyN2JiYjdkNzg2MzFlOGJj NzJmYWM0ZjA2MjY4MDFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0MvV0tQcmVmZXJlbmNlcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D L1dLUHJlZmVyZW5jZXMuY3BwCkBAIC03NDgsNiArNzQ4LDE2IEBAIGJvb2wgV0tQcmVmZXJlbmNl c0dldE1lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNl c1JlZikKICAgICByZXR1cm4gdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+YWxsb3dzSW5saW5lTWVk aWFQbGF5YmFjaygpOwogfQogCit2b2lkIFdLUHJlZmVyZW5jZXNTZXRNZWRpYUNvbnRyb2xzU2Nh bGVXaXRoUGFnZVpvb20oV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZiwgYm9vbCBmbGFn KQoreworICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldE1lZGlhQ29udHJvbHNTY2FsZVdp dGhQYWdlWm9vbShmbGFnKTsKK30KKworYm9vbCBXS1ByZWZlcmVuY2VzR2V0TWVkaWFDb250cm9s c1NjYWxlV2l0aFBhZ2Vab29tKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYpCit7Cisg ICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPm1lZGlhQ29udHJvbHNTY2FsZVdpdGhQ YWdlWm9vbSgpOworfQorCiB2b2lkIFdLUHJlZmVyZW5jZXNTZXRTaG93c1Rvb2xUaXBPdmVyVHJ1 bmNhdGVkVGV4dChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmLCBib29sIGZsYWcpCiB7 CiAgICAgdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+c2V0U2hvd3NUb29sVGlwT3ZlclRydW5jYXRl ZFRleHQoZmxhZyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mv V0tQcmVmZXJlbmNlc1JlZlByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Qy9XS1ByZWZlcmVuY2VzUmVmUHJpdmF0ZS5oCmluZGV4IDBjOWU5MzUxYTQxYThhMTUwZjFmY2Yy NzQ0YjZhYmZjMWY3MGNhOTkuLmU1OWE3ZmNlNzNmMGNlYzNiMjRkNGQwYjZkMGJiNzgyNjQ1YmM2 YjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVu Y2VzUmVmUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1By ZWZlcmVuY2VzUmVmUHJpdmF0ZS5oCkBAIC0xNzksNiArMTc5LDEwIEBAIFdLX0VYUE9SVCBib29s IFdLUHJlZmVyZW5jZXNHZXRNZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZShXS1ByZWZl cmVuY2VzUmVmCiBXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0TWVkaWFQbGF5YmFja0Fs bG93c0lubGluZShXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmLCBib29sIGZsYWcpOwog V0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldE1lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUo V0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZik7CiAKKy8vIERlZmF1bHRzIHRvIGZhbHNl IG9uIGlPUywgdHJ1ZSBlbHNld2hlcmUuCitXS19FWFBPUlQgdm9pZCBXS1ByZWZlcmVuY2VzU2V0 TWVkaWFDb250cm9sc1NjYWxlV2l0aFBhZ2Vab29tKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5j ZXNSZWYsIGJvb2wgZmxhZyk7CitXS19FWFBPUlQgYm9vbCBXS1ByZWZlcmVuY2VzR2V0TWVkaWFD b250cm9sc1NjYWxlV2l0aFBhZ2Vab29tKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYp OworCiAvLyBEZWZhdWx0cyB0byBmYWxzZS4KIFdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNT ZXRTaG93c1Rvb2xUaXBPdmVyVHJ1bmNhdGVkVGV4dChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVu Y2VzUmVmLCBib29sIGZsYWcpOwogV0tfRVhQT1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldFNob3dz VG9vbFRpcE92ZXJUcnVuY2F0ZWRUZXh0KFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4 IGRjNTA2NzU0YWFjNTk3ZmM0MTM3NDM4YmE1MTEzOWY4ZGIwNjEyMWMuLmE5YzZlZmM3YTlkNTU4 MGYzMGEyMzBlZDQxMDhjMDM3YWMxNmY1ZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTI3NzMsNiArMjc3Myw3IEBAIHZvaWQgV2ViUGFn ZTo6dXBkYXRlUHJlZmVyZW5jZXMoY29uc3QgV2ViUHJlZmVyZW5jZXNTdG9yZSYgc3RvcmUpCiAg ICAgc2V0dGluZ3Muc2V0UmVxdWlyZXNVc2VyR2VzdHVyZUZvck1lZGlhUGxheWJhY2soc3RvcmUu Z2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpyZXF1aXJlc1VzZXJHZXN0dXJl Rm9yTWVkaWFQbGF5YmFja0tleSgpKSk7CiAgICAgc2V0dGluZ3Muc2V0QWxsb3dzSW5saW5lTWVk aWFQbGF5YmFjayhzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmFs bG93c0lubGluZU1lZGlhUGxheWJhY2tLZXkoKSkpOwogICAgIHNldHRpbmdzLnNldEFsbG93c1Bp Y3R1cmVJblBpY3R1cmVNZWRpYVBsYXliYWNrKHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQ cmVmZXJlbmNlc0tleTo6YWxsb3dzUGljdHVyZUluUGljdHVyZU1lZGlhUGxheWJhY2tLZXkoKSkp OworICAgIHNldHRpbmdzLnNldE1lZGlhQ29udHJvbHNTY2FsZVdpdGhQYWdlWm9vbShzdG9yZS5n ZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6Om1lZGlhQ29udHJvbHNTY2FsZVdp dGhQYWdlWm9vbUtleSgpKSk7CiAgICAgc2V0dGluZ3Muc2V0TW9ja1Njcm9sbGJhcnNFbmFibGVk KHN0b3JlLmdldEJvb2xWYWx1ZUZvcktleShXZWJQcmVmZXJlbmNlc0tleTo6bW9ja1Njcm9sbGJh cnNFbmFibGVkS2V5KCkpKTsKICAgICBzZXR0aW5ncy5zZXRIeXBlcmxpbmtBdWRpdGluZ0VuYWJs ZWQoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpoeXBlcmxpbmtB dWRpdGluZ0VuYWJsZWRLZXkoKSkpOwogICAgIHNldHRpbmdzLnNldFJlcXVlc3RBbmltYXRpb25G cmFtZUVuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5Ojpy ZXF1ZXN0QW5pbWF0aW9uRnJhbWVFbmFibGVkS2V5KCkpKTsK