225675 2021-05-11 15:53:20 -0700 [iOS] Mail compose web view doesn't scroll to reveal the selection in certain configurations 2021-05-11 20:46:38 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin hi megan_gardner thorton webkit-bug-importer oldest_to_newest 1759082 0 wenson_hsieh 2021-05-11 15:53:20 -0700 rdar://77095886 1759094 1 428324 wenson_hsieh 2021-05-11 16:12:57 -0700 Created attachment 428324 Patch 1759102 2 428324 wenson_hsieh 2021-05-11 16:49:52 -0700 Comment on attachment 428324 Patch Thanks for the review! (I will tweak the ChangeLog entry as discussed on Slack) 1759103 3 428328 wenson_hsieh 2021-05-11 16:54:15 -0700 Created attachment 428328 For landing 1759147 4 ews-feeder 2021-05-11 20:46:36 -0700 Committed r277352 (237610@main): <https://commits.webkit.org/237610@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428328. 428324 2021-05-11 16:12:57 -0700 2021-05-11 16:54:14 -0700 Patch bug-225675-20210511161256.patch text/plain 12490 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MzE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQxMWFlNWU2MDk3ZTNjOGJm Yjc1ZDk4ZWQ5N2EyMmVlOWQ2MzBkZTcuLjk2MTkyYThmMDczYjNmOWFiOTNhNzQzZjE2NzQxYjM5 MGZhYTA3YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDMgQEAKKzIwMjEtMDUtMTEgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTWFpbCBjb21w b3NlIHdlYiB2aWV3IGRvZXNuJ3Qgc2Nyb2xsIHRvIHJldmVhbCB0aGUgc2VsZWN0aW9uIGluIGNl cnRhaW4gY29uZmlndXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyNTY3NQorICAgICAgICByZGFyOi8vNzcwOTU4ODYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDdXJyZW50bHkgd2hlbiBjb21w dXRpbmcgaW5wdXQgdmlldyBib3VuZHMgdXBvbiByZWNlaXZpbmcgYFVJS2V5Ym9hcmREaWRDaGFu Z2VGcmFtZU5vdGlmaWNhdGlvbmAsIHdlIGF0dGVtcHQgdG8KKyAgICAgICAgbWFwIHRoZSBvbi1z Y3JlZW4gYm91bmRzIG9mIHRoZSBrZXlib2FyZCB0byB0aGUgd2luZG93J3MgY29vcmRpbmF0ZSBz cGFjZSwgYW5kIHNhdmUgdGhlIHJlc3VsdCBpbiBhbiBpdmFyIGluCisgICAgICAgIGBXS1dlYlZp ZXdgLCBgX2lucHV0Vmlld0JvdW5kc2AuIFRoZSBrZXlib2FyZCBmcmFtZSAod2hpY2ggY29ycmVz cG9uZHMgdG8gYFVJS2V5Ym9hcmRGcmFtZUVuZFVzZXJJbmZvS2V5YCBpbiB0aGUKKyAgICAgICAg bm90aWZpY2F0aW9uJ3MgdXNlckluZm8gZGljdGlvbmFyeSkgaXMgZ2l2ZW4gdG8gdXMgaW4gc2Ny ZWVuIGNvb3JkaW5hdGVzLCBhbmQgd2UgY3VycmVudGx5IHBhc3MgdGhpcyB0aHJvdWdoCisgICAg ICAgIGAtY29udmVydFJlY3Q6ZnJvbVdpbmRvdzpgLCB3aXRoIGEgbmlsIGBVSVdpbmRvd2AuCisK KyAgICAgICAgSG93ZXZlciwgY29udHJhcnkgdG8gdGhlIGNvbW1lbnRzIGluIGBVSVdpbmRvdy5o YCwgdGhpcyByZXN1bHRzIGluIG1hcHBpbmcgdGhlIHJlY3QgZnJvbSB0aGUgY29vcmRpbmF0ZSBz cGFjZSBvZgorICAgICAgICB0aGUgd2luZG93J3MgYFVJV2luZG93U2NlbmVgIHJhdGhlciB0aGFu IHRoZSB3aW5kb3cgc2NyZWVuLiBJbiBzaGlwcGluZyBNYWlsIG9uIGlPUywgdGhpcyBkb2Vzbid0 IG1hdHRlciBiZWNhdXNlCisgICAgICAgIHRoZSB3aW5kb3cgY29udGFpbmluZyB0aGUgY29tcG9z ZSB3ZWIgdmlldyBzaGFyZXMgdGhlIHNhbWUgY29vcmRpbmF0ZSBzcGFjZSBhcyB0aGUgc2NyZWVu LiBJbiBzb21lIG90aGVyCisgICAgICAgIGNvbmZpZ3VyYXRpb25zIG9mIE1vYmlsZU1haWwsIGhv d2V2ZXIsIHRoZSBjb21wb3NlIHdlYiB2aWV3IGFwcGVhcnMgaW5zaWRlIGl0cyBvd24gYFVJV2lu ZG93YCB0aGF0IGlzIGNlbnRlcmVkCisgICAgICAgIHdpdGggcmVzcGVjdCB0byB0aGUgcmVzdCBv ZiB0aGUgc2NyZWVuLCBhbmQgKGltcG9ydGFudGx5KSBzaG9ydGVyIHRoYW4gdGhlIHNjcmVlbiBp dHNlbGYuIFRoaXMgY2F1c2VzIHRoZSBhYm92ZQorICAgICAgICBjb29yZGluYXRlIGNvbnZlcnNp b24gbG9naWMgdG8gZmFpbCwgc2luY2Ugd2UgYXR0ZW1wdCB0byBtYXAgYSByZWN0IGdpdmVuIHRv IHVzIGluIHNjcmVlbiBjb29yZGluYXRlcyBmcm9tIHRoZQorICAgICAgICBjb21wb3NlIHdlYiB2 aWV3J3Mgd2luZG93IHNjZW5lJ3MgY29vcmRpbmF0ZSBzcGFjZSwgaW5zdGVhZCBvZiB0aGUgc2Ny ZWVuJ3MgY29vcmRpbmF0ZSBzcGFjZS4KKworICAgICAgICBXZSBmaXggdGhpcyBieSB1c2luZyBg LWNvbnZlcnRSZWN0OmZyb21Db29yZGluYXRlU3BhY2U6YCBpbnN0ZWFkLCBhbmQgZXhwbGljaXRs eSBwYXNzIGluCisgICAgICAgIGBzZWxmLndpbmRvdy5zY3JlZW4uY29vcmRpbmF0ZVNwYWNlYC4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJuYWwuaDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW06CisgICAgICAgICgtW1dL V2ViVmlldyBfdXBkYXRlU2Nyb2xsVmlld0ZvclRyYW5zYWN0aW9uOl0pOgorICAgICAgICAoLVtX S1dlYlZpZXcgX3pvb21Ub0ZvY3VzUmVjdDpzZWxlY3Rpb25SZWN0OmZvbnRTaXplOm1pbmltdW1T Y2FsZTptYXhpbXVtU2NhbGU6YWxsb3dTY2FsaW5nOmZvcmNlU2Nyb2xsOl0pOgorICAgICAgICAo LVtXS1dlYlZpZXcgX2NvbnRlbnRSZWN0Rm9yVXNlckludGVyYWN0aW9uXSk6CisgICAgICAgICgt W1dLV2ViVmlldyBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c10pOgorICAgICAgICAoLVtXS1dl YlZpZXcgX2tleWJvYXJkQ2hhbmdlZFdpdGhJbmZvOmFkanVzdFNjcm9sbFZpZXc6XSk6CisKKyAg ICAgICAgUmVuYW1lIGBfaW5wdXRWaWV3Qm91bmRzYCB0byBgX2lucHV0Vmlld0JvdW5kc0luV2lu ZG93YCBmb3IgY2xhcml0eS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmll d1ByaXZhdGVGb3JUZXN0aW5nSU9TLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tX ZWJWaWV3VGVzdGluZ0lPUy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9pbnB1dFZpZXdCb3Vu ZHNJbldpbmRvd10pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2lucHV0Vmlld0JvdW5kc10pOiBE ZWxldGVkLgorCiAyMDIxLTA1LTEwICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUu Y29tPgogCiAgICAgICAgIFttYWNPU10gQWxsb3cgaW1tZWRpYXRlIGFjdGlvbiBnZXN0dXJlcyB0 byBiZWdpbiB3aGVuIGZvcmNlIGNsaWNraW5nIHRleHQgaW5zaWRlIGltYWdlIG92ZXJsYXlzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50 ZXJuYWwuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRl cm5hbC5oCmluZGV4IGUxNGRiMmUyNWMxZGMyOWI3YzBiMWNhYjQ4ZTQ2MjQ3NjZjOTMzYjcuLjcx ZTY5Njk2MjBlZjc5YzE0ZTYyNjBmZTIxZWQ2ZDViZTRhNWE2ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oCkBAIC0x NTcsNyArMTU3LDcgQEAgY2xhc3MgVmlld0dlc3R1cmVDb250cm9sbGVyOwogICAgIE9wdGlvbmFs PFdlYkNvcmU6OkZsb2F0U2l6ZT4gX2xhc3RTZW50Vmlld0xheW91dFNpemU7CiAgICAgT3B0aW9u YWw8Q0dTaXplPiBfbWF4aW11bVVub2JzY3VyZWRTaXplT3ZlcnJpZGU7CiAgICAgT3B0aW9uYWw8 V2ViQ29yZTo6RmxvYXRTaXplPiBfbGFzdFNlbnRNYXhpbXVtVW5vYnNjdXJlZFNpemU7Ci0gICAg Q0dSZWN0IF9pbnB1dFZpZXdCb3VuZHM7CisgICAgQ0dSZWN0IF9pbnB1dFZpZXdCb3VuZHNJbldp bmRvdzsKIAogICAgIENHRmxvYXQgX3ZpZXdwb3J0TWV0YVRhZ1dpZHRoOwogICAgIEJPT0wgX3Zp ZXdwb3J0TWV0YVRhZ1dpZHRoV2FzRXhwbGljaXQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tCmluZGV4IGUwYWM5ZTlmMjM3NDA5ZGFhZTk4NTZl YmYyZmVjZWEyNWVmNjE3YWIuLjU1YWNiMDljYjk4YzMyNTcyY2UwMzkyYjAwNWQwOWUzODE2YzBh YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3 SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9T Lm1tCkBAIC04MDcsNyArODA3LDcgQEAgLSAodm9pZClfdXBkYXRlU2Nyb2xsVmlld0ZvclRyYW5z YWN0aW9uOihjb25zdCBXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW8KICAgICBbX3Nj cm9sbFZpZXcgc2V0TWF4aW11bVpvb21TY2FsZTpsYXllclRyZWVUcmFuc2FjdGlvbi5tYXhpbXVt U2NhbGVGYWN0b3IoKV07CiAgICAgW19zY3JvbGxWaWV3IF9zZXRab29tRW5hYmxlZEludGVybmFs OmxheWVyVHJlZVRyYW5zYWN0aW9uLmFsbG93c1VzZXJTY2FsaW5nKCldOwogCi0gICAgYm9vbCBo YXNEb2NrZWRJbnB1dFZpZXcgPSAhQ0dSZWN0SXNFbXB0eShfaW5wdXRWaWV3Qm91bmRzKTsKKyAg ICBib29sIGhhc0RvY2tlZElucHV0VmlldyA9ICFDR1JlY3RJc0VtcHR5KF9pbnB1dFZpZXdCb3Vu ZHNJbldpbmRvdyk7CiAgICAgYm9vbCBpc1pvb21lZCA9IGxheWVyVHJlZVRyYW5zYWN0aW9uLnBh Z2VTY2FsZUZhY3RvcigpID4gbGF5ZXJUcmVlVHJhbnNhY3Rpb24uaW5pdGlhbFNjYWxlRmFjdG9y KCk7CiAKICAgICBib29sIHNjcm9sbGluZ05lZWRlZFRvUmV2ZWFsVUkgPSBmYWxzZTsKQEAgLTEy NDIsNyArMTI0Miw3IEBAIC0gKHZvaWQpX3pvb21Ub0ZvY3VzUmVjdDooY29uc3QgV2ViQ29yZTo6 RmxvYXRSZWN0Jilmb2N1c2VkRWxlbWVudFJlY3RJbkRvY3VtZW50CiAKICAgICBDR1JlY3QgdW5v YnNjdXJlZFNjcm9sbFZpZXdSZWN0SW5XZWJWaWV3Q29vcmRpbmF0ZXMgPSBVSUVkZ2VJbnNldHNJ bnNldFJlY3QoW3NlbGYgYm91bmRzXSwgX29ic2N1cmVkSW5zZXRzKTsKICAgICBDR1JlY3Qgdmlz aWJsZVNjcm9sbFZpZXdCb3VuZHNJbldlYlZpZXdDb29yZGluYXRlcyA9IENHUmVjdEludGVyc2Vj dGlvbih1bm9ic2N1cmVkU2Nyb2xsVmlld1JlY3RJbldlYlZpZXdDb29yZGluYXRlcywgW2Z1bGxT Y3JlZW5WaWV3IGNvbnZlcnRSZWN0OltmdWxsU2NyZWVuVmlldyBib3VuZHNdIHRvVmlldzpzZWxm XSk7Ci0gICAgQ0dSZWN0IGZvcm1Bc3Npc3RhbnRGcmFtZUluV2ViVmlld0Nvb3JkaW5hdGVzID0g W3dpbmRvdyBjb252ZXJ0UmVjdDpfaW5wdXRWaWV3Qm91bmRzIHRvVmlldzpzZWxmXTsKKyAgICBD R1JlY3QgZm9ybUFzc2lzdGFudEZyYW1lSW5XZWJWaWV3Q29vcmRpbmF0ZXMgPSBbd2luZG93IGNv bnZlcnRSZWN0Ol9pbnB1dFZpZXdCb3VuZHNJbldpbmRvdyB0b1ZpZXc6c2VsZl07CiAgICAgQ0dS ZWN0IGludGVyc2VjdGlvbkJldHdlZW5TY3JvbGxWaWV3QW5kRm9ybUFzc2lzdGFudCA9IENHUmVj dEludGVyc2VjdGlvbih2aXNpYmxlU2Nyb2xsVmlld0JvdW5kc0luV2ViVmlld0Nvb3JkaW5hdGVz LCBmb3JtQXNzaXN0YW50RnJhbWVJbldlYlZpZXdDb29yZGluYXRlcyk7CiAgICAgQ0dTaXplIHZp c2libGVTaXplID0gdmlzaWJsZVNjcm9sbFZpZXdCb3VuZHNJbldlYlZpZXdDb29yZGluYXRlcy5z aXplOwogCkBAIC0xODgxLDcgKzE4ODEsNyBAQCAtIChDR1JlY3QpX2NvbnRlbnRSZWN0Rm9yVXNl ckludGVyYWN0aW9uCiB7CiAgICAgLy8gRklYTUU6IGhhbmRsZSBzcGxpdCBrZXlib2FyZC4KICAg ICBVSUVkZ2VJbnNldHMgb2JzY3VyZWRJbnNldHMgPSBfb2JzY3VyZWRJbnNldHM7Ci0gICAgb2Jz Y3VyZWRJbnNldHMuYm90dG9tID0gc3RkOjptYXgoX29ic2N1cmVkSW5zZXRzLmJvdHRvbSwgX2lu cHV0Vmlld0JvdW5kcy5zaXplLmhlaWdodCk7CisgICAgb2JzY3VyZWRJbnNldHMuYm90dG9tID0g c3RkOjptYXgoX29ic2N1cmVkSW5zZXRzLmJvdHRvbSwgX2lucHV0Vmlld0JvdW5kc0luV2luZG93 LnNpemUuaGVpZ2h0KTsKICAgICBDR1JlY3QgdW5vYnNjdXJlZFJlY3QgPSBVSUVkZ2VJbnNldHNJ bnNldFJlY3Qoc2VsZi5ib3VuZHMsIG9ic2N1cmVkSW5zZXRzKTsKICAgICByZXR1cm4gW3NlbGYg Y29udmVydFJlY3Q6dW5vYnNjdXJlZFJlY3QgdG9WaWV3OnNlbGYuX2N1cnJlbnRDb250ZW50Vmll d107CiB9CkBAIC0yMTQxLDcgKzIxNDEsNyBAQCAtICh2b2lkKV91cGRhdGVWaXNpYmxlQ29udGVu dFJlY3RzCiAgICAgICAgIHVub2JzY3VyZWRSZWN0SW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXM6dW5v YnNjdXJlZFJlY3QKICAgICAgICAgb2JzY3VyZWRJbnNldHM6X29ic2N1cmVkSW5zZXRzCiAgICAg ICAgIHVub2JzY3VyZWRTYWZlQXJlYUluc2V0czpbc2VsZiBfY29tcHV0ZWRVbm9ic2N1cmVkU2Fm ZUFyZWFJbnNldF0KLSAgICAgICAgaW5wdXRWaWV3Qm91bmRzOl9pbnB1dFZpZXdCb3VuZHMKKyAg ICAgICAgaW5wdXRWaWV3Qm91bmRzOl9pbnB1dFZpZXdCb3VuZHNJbldpbmRvdwogICAgICAgICBz Y2FsZTpzY2FsZUZhY3RvciBtaW5pbXVtU2NhbGU6W19zY3JvbGxWaWV3IG1pbmltdW1ab29tU2Nh bGVdCiAgICAgICAgIHZpZXdTdGFiaWxpdHk6dmlld1N0YWJpbGl0eQogICAgICAgICBlbmNsb3Nl ZEluU2Nyb2xsYWJsZUFuY2VzdG9yVmlldzpzY3JvbGxWaWV3Q2FuU2Nyb2xsKFtzZWxmIF9zY3Jv bGxlcl0pCkBAIC0yMjk4LDE5ICsyMjk4LDIyIEBAIC0gKHZvaWQpX2tleWJvYXJkQ2hhbmdlZFdp dGhJbmZvOihOU0RpY3Rpb25hcnkgKilrZXlib2FyZEluZm8gYWRqdXN0U2Nyb2xsVmlldzooCiAg ICAgaWYgKCFlbmRGcmFtZVZhbHVlKQogICAgICAgICByZXR1cm47CiAKLSAgICBhdXRvIHByZXZp b3VzSW5wdXRWaWV3Qm91bmRzID0gX2lucHV0Vmlld0JvdW5kczsKKyAgICBhdXRvIHByZXZpb3Vz SW5wdXRWaWV3Qm91bmRzID0gX2lucHV0Vmlld0JvdW5kc0luV2luZG93OwogICAgIEJPT0wgc2Vs ZWN0aW9uV2FzVmlzaWJsZSA9IHNlbGYuX3NlbGVjdGlvblJlY3RJc0Z1bGx5VmlzaWJsZUFuZE5v bkVtcHR5OwogCi0gICAgLy8gVGhlIGtleWJvYXJkIHJlY3QgaXMgYWx3YXlzIGluIHNjcmVlbiBj b29yZGluYXRlcy4gSW4gdGhlIHZpZXcgc2VydmljZXMgY2FzZSB0aGUgd2luZG93IGRvZXMgbm90 Ci0gICAgLy8gaGF2ZSB0aGUgaW50ZXJmYWNlIG9yaWVudGF0aW9uIHJvdGF0aW9uIHRyYW5zZm9y bWF0aW9uOyBpdHMgaG9zdCBkb2VzLiBTbywgaXQgbWFrZXMgbm8gc2Vuc2UgdG8KLSAgICAvLyBj bGlwIHRoZSBrZXlib2FyZCByZWN0IGFnYWluc3QgaXRzIHNjcmVlbi4KLSAgICBpZiAoW1tzZWxm IHdpbmRvd10gX2lzSG9zdGVkSW5Bbm90aGVyUHJvY2Vzc10pCi0gICAgICAgIF9pbnB1dFZpZXdC b3VuZHMgPSBbc2VsZi53aW5kb3cgY29udmVydFJlY3Q6W2VuZEZyYW1lVmFsdWUgQ0dSZWN0VmFs dWVdIGZyb21XaW5kb3c6bmlsXTsKLSAgICBlbHNlCi0gICAgICAgIF9pbnB1dFZpZXdCb3VuZHMg PSBbc2VsZi53aW5kb3cgY29udmVydFJlY3Q6Q0dSZWN0SW50ZXJzZWN0aW9uKFtlbmRGcmFtZVZh bHVlIENHUmVjdFZhbHVlXSwgc2VsZi53aW5kb3cuc2NyZWVuLmJvdW5kcykgZnJvbVdpbmRvdzpu aWxdOworICAgIF9pbnB1dFZpZXdCb3VuZHNJbldpbmRvdyA9IChbJl0geworICAgICAgICBpZiAo VUlQZXJpcGhlcmFsSG9zdC5zaGFyZWRJbnN0YW5jZS5pc1VuZG9ja2VkKQorICAgICAgICAgICAg cmV0dXJuIENHUmVjdFplcm87CisKKyAgICAgICAgYXV0byBrZXlib2FyZEZyYW1lSW5TY3JlZW4g PSBlbmRGcmFtZVZhbHVlLkNHUmVjdFZhbHVlOworICAgICAgICAvLyBUaGUga2V5Ym9hcmQgcmVj dCBpcyBhbHdheXMgaW4gc2NyZWVuIGNvb3JkaW5hdGVzLiBJbiB0aGUgdmlldyBzZXJ2aWNlcyBj YXNlIHRoZSB3aW5kb3cgZG9lcyBub3QKKyAgICAgICAgLy8gaGF2ZSB0aGUgaW50ZXJmYWNlIG9y aWVudGF0aW9uIHJvdGF0aW9uIHRyYW5zZm9ybWF0aW9uOyBpdHMgaG9zdCBkb2VzLiBTbywgaXQg bWFrZXMgbm8gc2Vuc2UgdG8KKyAgICAgICAgLy8gY2xpcCB0aGUga2V5Ym9hcmQgcmVjdCBhZ2Fp bnN0IGl0cyBzY3JlZW4uCisgICAgICAgIGlmICghc2VsZi53aW5kb3cuX2lzSG9zdGVkSW5Bbm90 aGVyUHJvY2VzcykKKyAgICAgICAgICAgIGtleWJvYXJkRnJhbWVJblNjcmVlbiA9IENHUmVjdElu dGVyc2VjdGlvbihrZXlib2FyZEZyYW1lSW5TY3JlZW4sIHNlbGYud2luZG93LnNjcmVlbi5ib3Vu ZHMpOwogCi0gICAgaWYgKFtbVUlQZXJpcGhlcmFsSG9zdCBzaGFyZWRJbnN0YW5jZV0gaXNVbmRv Y2tlZF0pCi0gICAgICAgIF9pbnB1dFZpZXdCb3VuZHMgPSBDR1JlY3RaZXJvOworICAgICAgICBy ZXR1cm4gW3NlbGYud2luZG93IGNvbnZlcnRSZWN0OmtleWJvYXJkRnJhbWVJblNjcmVlbiBmcm9t Q29vcmRpbmF0ZVNwYWNlOnNlbGYud2luZG93LnNjcmVlbi5jb29yZGluYXRlU3BhY2VdOworICAg IH0pKCk7CiAKICAgICBpZiAoYWRqdXN0U2Nyb2xsVmlldykgewogICAgICAgICBDR0Zsb2F0IGJv dHRvbUluc2V0QmVmb3JlQWRqdXN0bWVudCA9IFtfc2Nyb2xsVmlldyBjb250ZW50SW5zZXRdLmJv dHRvbTsKQEAgLTIzMjQsNyArMjMyNyw3IEBAIC0gKHZvaWQpX2tleWJvYXJkQ2hhbmdlZFdpdGhJ bmZvOihOU0RpY3Rpb25hcnkgKilrZXlib2FyZEluZm8gYWRqdXN0U2Nyb2xsVmlldzooCiAgICAg ICAgICAgICBfdG90YWxTY3JvbGxWaWV3Qm90dG9tSW5zZXRBZGp1c3RtZW50Rm9yS2V5Ym9hcmQg Kz0gYm90dG9tSW5zZXRBZnRlckFkanVzdG1lbnQgLSBib3R0b21JbnNldEJlZm9yZUFkanVzdG1l bnQ7CiAgICAgfQogCi0gICAgaWYgKHNlbGVjdGlvbldhc1Zpc2libGUgJiYgW19jb250ZW50Vmll dyBfaGFzRm9jdXNlZEVsZW1lbnRdICYmICFDR1JlY3RJc0VtcHR5KHByZXZpb3VzSW5wdXRWaWV3 Qm91bmRzKSAmJiAhQ0dSZWN0SXNFbXB0eShfaW5wdXRWaWV3Qm91bmRzKSAmJiAhQ0dSZWN0RXF1 YWxUb1JlY3QocHJldmlvdXNJbnB1dFZpZXdCb3VuZHMsIF9pbnB1dFZpZXdCb3VuZHMpKQorICAg IGlmIChzZWxlY3Rpb25XYXNWaXNpYmxlICYmIFtfY29udGVudFZpZXcgX2hhc0ZvY3VzZWRFbGVt ZW50XSAmJiAhQ0dSZWN0SXNFbXB0eShwcmV2aW91c0lucHV0Vmlld0JvdW5kcykgJiYgIUNHUmVj dElzRW1wdHkoX2lucHV0Vmlld0JvdW5kc0luV2luZG93KSAmJiAhQ0dSZWN0RXF1YWxUb1JlY3Qo cHJldmlvdXNJbnB1dFZpZXdCb3VuZHMsIF9pbnB1dFZpZXdCb3VuZHNJbldpbmRvdykpCiAgICAg ICAgIFtzZWxmIF9zY3JvbGxUb0FuZFJldmVhbFNlbGVjdGlvbklmTmVlZGVkXTsKIAogICAgIFtz ZWxmIF9zY2hlZHVsZVZpc2libGVDb250ZW50UmVjdFVwZGF0ZV07CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld1ByaXZhdGVGb3JUZXN0aW5nSU9T LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld1ByaXZhdGVGb3JU ZXN0aW5nSU9TLmgKaW5kZXggNjYyNmFhNWIyYjQ4MWMyZGYyNzY1NDMzOGJiOWM5MzFmMDIzZWY0 Ni4uMTNhM2U0MzhhNDNlNDU1NTY1MGYwZDIwODQ2Mzg1N2RjOTFmYWEwZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdQcml2YXRlRm9yVGVzdGlu Z0lPUy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3UHJp dmF0ZUZvclRlc3RpbmdJT1MuaApAQCAtMzksNyArMzksNyBAQAogQHByb3BlcnR5IChub25hdG9t aWMsIHJlYWRvbmx5KSBOU1N0cmluZyAqc2VsZWN0Rm9ybVBvcG92ZXJUaXRsZTsKIEBwcm9wZXJ0 eSAobm9uYXRvbWljLCByZWFkb25seSkgTlNTdHJpbmcgKmZvcm1JbnB1dExhYmVsOwogQHByb3Bl cnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBOU0FycmF5PE5TVmFsdWUgKj4gKl91aVRleHRTZWxl Y3Rpb25SZWN0czsKLUBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgQ0dSZWN0IF9pbnB1 dFZpZXdCb3VuZHM7CitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIENHUmVjdCBfaW5w dXRWaWV3Qm91bmRzSW5XaW5kb3c7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIE5T U3RyaW5nICpfc2Nyb2xsaW5nVHJlZUFzVGV4dDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFk b25seSkgTlNOdW1iZXIgKl9zdGFibGVTdGF0ZU92ZXJyaWRlOwogQHByb3BlcnR5IChub25hdG9t aWMsIHJlYWRvbmx5KSBDR1JlY3QgX2RyYWdDYXJldFJlY3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld1Rlc3RpbmdJT1MubW0gYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld1Rlc3RpbmdJT1MubW0KaW5kZXggODky NGM2NjQ0Y2MzNTI4YmM3MWQwZmE5Y2Q1YWMzNmVhOGVmNTU3NS4uZGEwZTRmOGUxNGUyY2UxYTli N2U4YjM5Y2E5ZDIxNmQxMDBkMjVlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL2lvcy9XS1dlYlZpZXdUZXN0aW5nSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3VGVzdGluZ0lPUy5tbQpAQCAtMjAzLDkgKzIwMyw5IEBA IC0gKE5TU3RyaW5nICopZm9ybUlucHV0TGFiZWwKICAgICByZXR1cm4gW19jb250ZW50VmlldyBm b3JtSW5wdXRMYWJlbF07CiB9CiAKLS0gKENHUmVjdClfaW5wdXRWaWV3Qm91bmRzCistIChDR1Jl Y3QpX2lucHV0Vmlld0JvdW5kc0luV2luZG93CiB7Ci0gICAgcmV0dXJuIF9pbnB1dFZpZXdCb3Vu ZHM7CisgICAgcmV0dXJuIF9pbnB1dFZpZXdCb3VuZHNJbldpbmRvdzsKIH0KIAogLSAoTlNBcnJh eTxOU1ZhbHVlICo+ICopX3VpVGV4dFNlbGVjdGlvblJlY3RzCmRpZmYgLS1naXQgYS9Ub29scy9D aGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjNjZjE1YWE4ZmVlYmE4MTE4YmVmZDQ2 NzJhYzk3Zjk5Yzc3MDA0OC4uNmFlNTliM2QxZDJjZjE0NDk0MTAyNGQzMWQ2ZTdhZGFjY2RiYzg0 MiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE2IEBACisyMDIxLTA1LTExICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBw bGUuY29tPgorCisgICAgICAgIFtpT1NdIE1haWwgY29tcG9zZSB3ZWIgdmlldyBkb2Vzbid0IHNj cm9sbCB0byByZXZlYWwgdGhlIHNlbGVjdGlvbiBpbiBjZXJ0YWluIGNvbmZpZ3VyYXRpb25zCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU2NzUKKyAg ICAgICAgcmRhcjovLzc3MDk1ODg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUmVuYW1lIHNvbWUgdGVzdGluZyBTUEkuIFNlZSBXZWJLaXQvQ2hhbmdl TG9nIGZvciBtb3JlIGluZm9ybWF0aW9uLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9p b3MvVUlTY3JpcHRDb250cm9sbGVySU9TLm1tOgorICAgICAgICAoV1RSOjpVSVNjcmlwdENvbnRy b2xsZXJJT1M6OmlucHV0Vmlld0JvdW5kcyBjb25zdCk6CisKIDIwMjEtMDUtMTAgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXSBBbGxvdyBp bW1lZGlhdGUgYWN0aW9uIGdlc3R1cmVzIHRvIGJlZ2luIHdoZW4gZm9yY2UgY2xpY2tpbmcgdGV4 dCBpbnNpZGUgaW1hZ2Ugb3ZlcmxheXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvaW9zL1VJU2NyaXB0Q29udHJvbGxlcklPUy5tbSBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv aW9zL1VJU2NyaXB0Q29udHJvbGxlcklPUy5tbQppbmRleCA4MjMzZWQzZDI3NmRlMjdmNTM3MGZl YTQyNDYxNjIzNzNjNzBmZTdhLi5lMmRkN2Q4ZGFkYzRkNzkxNzU2YTkzZGY4MjQyMTkwZDM5YjA1 MDM5IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2lvcy9VSVNjcmlwdENvbnRy b2xsZXJJT1MubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9pb3MvVUlTY3JpcHRDb250 cm9sbGVySU9TLm1tCkBAIC04NDksNyArODQ5LDcgQEAgSlNPYmplY3RSZWYgVUlTY3JpcHRDb250 cm9sbGVySU9TOjpzZWxlY3Rpb25SYW5nZVZpZXdSZWN0cygpIGNvbnN0CiAKIEpTT2JqZWN0UmVm IFVJU2NyaXB0Q29udHJvbGxlcklPUzo6aW5wdXRWaWV3Qm91bmRzKCkgY29uc3QKIHsKLSAgICBy ZXR1cm4gSlNWYWx1ZVRvT2JqZWN0KG1fY29udGV4dC0+anNDb250ZXh0KCksIFtKU1ZhbHVlIHZh bHVlV2l0aE9iamVjdDp0b05TRGljdGlvbmFyeSh3ZWJWaWV3KCkuX2lucHV0Vmlld0JvdW5kcykg aW5Db250ZXh0OltKU0NvbnRleHQgY29udGV4dFdpdGhKU0dsb2JhbENvbnRleHRSZWY6bV9jb250 ZXh0LT5qc0NvbnRleHQoKV1dLkpTVmFsdWVSZWYsIG51bGxwdHIpOworICAgIHJldHVybiBKU1Zh bHVlVG9PYmplY3QobV9jb250ZXh0LT5qc0NvbnRleHQoKSwgW0pTVmFsdWUgdmFsdWVXaXRoT2Jq ZWN0OnRvTlNEaWN0aW9uYXJ5KHdlYlZpZXcoKS5faW5wdXRWaWV3Qm91bmRzSW5XaW5kb3cpIGlu Q29udGV4dDpbSlNDb250ZXh0IGNvbnRleHRXaXRoSlNHbG9iYWxDb250ZXh0UmVmOm1fY29udGV4 dC0+anNDb250ZXh0KCldXS5KU1ZhbHVlUmVmLCBudWxscHRyKTsKIH0KIAogSlNSZXRhaW5QdHI8 SlNTdHJpbmdSZWY+IFVJU2NyaXB0Q29udHJvbGxlcklPUzo6c2Nyb2xsaW5nVHJlZUFzVGV4dCgp IGNvbnN0Cg== 428328 2021-05-11 16:54:15 -0700 2021-05-11 20:46:37 -0700 For landing bug-225675-20210511165414.patch text/plain 12325 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3MzE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQxMWFlNWU2MDk3ZTNjOGJm Yjc1ZDk4ZWQ5N2EyMmVlOWQ2MzBkZTcuLjJmZTE2NzFlMTA4YzIxZTFhZjgyNDQwOTljMTRlN2Nh M2ZmZWFkMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDIgQEAKKzIwMjEtMDUtMTEgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPU10gTWFpbCBjb21w b3NlIHdlYiB2aWV3IGRvZXNuJ3Qgc2Nyb2xsIHRvIHJldmVhbCB0aGUgc2VsZWN0aW9uIGluIGNl cnRhaW4gY29uZmlndXJhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIyNTY3NQorICAgICAgICByZGFyOi8vNzcwOTU4ODYKKworICAgICAgICBS ZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIEN1cnJlbnRseSB3aGVuIGNvbXB1dGlu ZyBpbnB1dCB2aWV3IGJvdW5kcyB1cG9uIHJlY2VpdmluZyBgVUlLZXlib2FyZERpZENoYW5nZUZy YW1lTm90aWZpY2F0aW9uYCwgd2UgYXR0ZW1wdCB0bworICAgICAgICBtYXAgdGhlIG9uLXNjcmVl biBib3VuZHMgb2YgdGhlIGtleWJvYXJkIHRvIHRoZSB3aW5kb3cncyBjb29yZGluYXRlIHNwYWNl LCBhbmQgc2F2ZSB0aGUgcmVzdWx0IGluIGFuIGl2YXIgaW4KKyAgICAgICAgYFdLV2ViVmlld2As IGBfaW5wdXRWaWV3Qm91bmRzYC4gVGhlIGtleWJvYXJkIGZyYW1lICh3aGljaCBjb3JyZXNwb25k cyB0byBgVUlLZXlib2FyZEZyYW1lRW5kVXNlckluZm9LZXlgIGluIHRoZQorICAgICAgICBub3Rp ZmljYXRpb24ncyB1c2VySW5mbyBkaWN0aW9uYXJ5KSBpcyBnaXZlbiB0byB1cyBpbiBzY3JlZW4g Y29vcmRpbmF0ZXMsIGFuZCB3ZSBjdXJyZW50bHkgcGFzcyB0aGlzIHRocm91Z2gKKyAgICAgICAg YC1jb252ZXJ0UmVjdDpmcm9tV2luZG93OmAsIHdpdGggYSBuaWwgYFVJV2luZG93YC4KKworICAg ICAgICBIb3dldmVyLCB0aGlzIHJlc3VsdHMgaW4gbWFwcGluZyB0aGUgcmVjdCBmcm9tIHRoZSBj b29yZGluYXRlIHNwYWNlIG9mIHRoZSB3aW5kb3cncyBgVUlXaW5kb3dTY2VuZWAgcmF0aGVyIHRo YW4KKyAgICAgICAgdGhlIHdpbmRvdyBzY3JlZW4uIEluIHNoaXBwaW5nIE1haWwgb24gaU9TLCB0 aGlzIGRvZXNuJ3QgbWF0dGVyIGJlY2F1c2UgdGhlIHdpbmRvdyBjb250YWluaW5nIHRoZSBjb21w b3NlIHdlYgorICAgICAgICB2aWV3IHNoYXJlcyB0aGUgc2FtZSBjb29yZGluYXRlIHNwYWNlIGFz IHRoZSBzY3JlZW4uIEluIHNvbWUgb3RoZXIgY29uZmlndXJhdGlvbnMgb2YgTW9iaWxlTWFpbCwg aG93ZXZlciwgdGhlCisgICAgICAgIGNvbXBvc2Ugd2ViIHZpZXcgYXBwZWFycyBpbnNpZGUgaXRz IG93biBgVUlXaW5kb3dgLiBUaGlzIGNhdXNlcyB0aGUgYWJvdmUgY29vcmRpbmF0ZSBjb252ZXJz aW9uIGxvZ2ljIHRvIGZhaWwsCisgICAgICAgIHNpbmNlIHdlIGF0dGVtcHQgdG8gbWFwIGEgcmVj dCBnaXZlbiB0byB1cyBpbiBzY3JlZW4gY29vcmRpbmF0ZXMgZnJvbSB0aGUgY29tcG9zZSB3ZWIg dmlldydzIHdpbmRvdyBzY2VuZSdzCisgICAgICAgIGNvb3JkaW5hdGUgc3BhY2UsIGluc3RlYWQg b2YgdGhlIHNjcmVlbidzIGNvb3JkaW5hdGUgc3BhY2UuCisKKyAgICAgICAgV2UgZml4IHRoaXMg YnkgdXNpbmcgYC1jb252ZXJ0UmVjdDpmcm9tQ29vcmRpbmF0ZVNwYWNlOmAgaW5zdGVhZCwgYW5k IGV4cGxpY2l0bHkgcGFzcyBpbgorICAgICAgICBgc2VsZi53aW5kb3cuc2NyZWVuLmNvb3JkaW5h dGVTcGFjZWAuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVy bmFsLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1tOgorICAg ICAgICAoLVtXS1dlYlZpZXcgX3VwZGF0ZVNjcm9sbFZpZXdGb3JUcmFuc2FjdGlvbjpdKToKKyAg ICAgICAgKC1bV0tXZWJWaWV3IF96b29tVG9Gb2N1c1JlY3Q6c2VsZWN0aW9uUmVjdDpmb250U2l6 ZTptaW5pbXVtU2NhbGU6bWF4aW11bVNjYWxlOmFsbG93U2NhbGluZzpmb3JjZVNjcm9sbDpdKToK KyAgICAgICAgKC1bV0tXZWJWaWV3IF9jb250ZW50UmVjdEZvclVzZXJJbnRlcmFjdGlvbl0pOgor ICAgICAgICAoLVtXS1dlYlZpZXcgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHNdKToKKyAgICAg ICAgKC1bV0tXZWJWaWV3IF9rZXlib2FyZENoYW5nZWRXaXRoSW5mbzphZGp1c3RTY3JvbGxWaWV3 Ol0pOgorCisgICAgICAgIFJlbmFtZSBgX2lucHV0Vmlld0JvdW5kc2AgdG8gYF9pbnB1dFZpZXdC b3VuZHNJbldpbmRvd2AgZm9yIGNsYXJpdHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2lv cy9XS1dlYlZpZXdQcml2YXRlRm9yVGVzdGluZ0lPUy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvaW9zL1dLV2ViVmlld1Rlc3RpbmdJT1MubW06CisgICAgICAgICgtW1dLV2ViVmlldyBfaW5w dXRWaWV3Qm91bmRzSW5XaW5kb3ddKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9pbnB1dFZpZXdC b3VuZHNdKTogRGVsZXRlZC4KKwogMjAyMS0wNS0xMCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hz aWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBbbWFjT1NdIEFsbG93IGltbWVkaWF0ZSBhY3Rpb24g Z2VzdHVyZXMgdG8gYmVnaW4gd2hlbiBmb3JjZSBjbGlja2luZyB0ZXh0IGluc2lkZSBpbWFnZSBv dmVybGF5cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlld0ludGVybmFsLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3SW50ZXJuYWwuaAppbmRleCBlMTRkYjJlMjVjMWRjMjliN2MwYjFjYWI0OGU0NjI0NzY2 YzkzM2I3Li43MWU2OTY5NjIwZWY3OWMxNGU2MjYwZmUyMWVkNmQ1YmU0YTVhNmQyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJuYWwu aAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3SW50ZXJu YWwuaApAQCAtMTU3LDcgKzE1Nyw3IEBAIGNsYXNzIFZpZXdHZXN0dXJlQ29udHJvbGxlcjsKICAg ICBPcHRpb25hbDxXZWJDb3JlOjpGbG9hdFNpemU+IF9sYXN0U2VudFZpZXdMYXlvdXRTaXplOwog ICAgIE9wdGlvbmFsPENHU2l6ZT4gX21heGltdW1Vbm9ic2N1cmVkU2l6ZU92ZXJyaWRlOwogICAg IE9wdGlvbmFsPFdlYkNvcmU6OkZsb2F0U2l6ZT4gX2xhc3RTZW50TWF4aW11bVVub2JzY3VyZWRT aXplOwotICAgIENHUmVjdCBfaW5wdXRWaWV3Qm91bmRzOworICAgIENHUmVjdCBfaW5wdXRWaWV3 Qm91bmRzSW5XaW5kb3c7CiAKICAgICBDR0Zsb2F0IF92aWV3cG9ydE1ldGFUYWdXaWR0aDsKICAg ICBCT09MIF92aWV3cG9ydE1ldGFUYWdXaWR0aFdhc0V4cGxpY2l0OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0gYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQppbmRleCBlMGFjOWU5ZjIzNzQw OWRhYWU5ODU2ZWJmMmZlY2VhMjVlZjYxN2FiLi41NWFjYjA5Y2I5OGMzMjU3MmNlMDM5MmIwMDVk MDllMzgxNmMwYWIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9z L1dLV2ViVmlld0lPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dL V2ViVmlld0lPUy5tbQpAQCAtODA3LDcgKzgwNyw3IEBAIC0gKHZvaWQpX3VwZGF0ZVNjcm9sbFZp ZXdGb3JUcmFuc2FjdGlvbjooY29uc3QgV2ViS2l0OjpSZW1vdGVMYXllclRyZWVUcmFuc2FjdGlv CiAgICAgW19zY3JvbGxWaWV3IHNldE1heGltdW1ab29tU2NhbGU6bGF5ZXJUcmVlVHJhbnNhY3Rp b24ubWF4aW11bVNjYWxlRmFjdG9yKCldOwogICAgIFtfc2Nyb2xsVmlldyBfc2V0Wm9vbUVuYWJs ZWRJbnRlcm5hbDpsYXllclRyZWVUcmFuc2FjdGlvbi5hbGxvd3NVc2VyU2NhbGluZygpXTsKIAot ICAgIGJvb2wgaGFzRG9ja2VkSW5wdXRWaWV3ID0gIUNHUmVjdElzRW1wdHkoX2lucHV0Vmlld0Jv dW5kcyk7CisgICAgYm9vbCBoYXNEb2NrZWRJbnB1dFZpZXcgPSAhQ0dSZWN0SXNFbXB0eShfaW5w dXRWaWV3Qm91bmRzSW5XaW5kb3cpOwogICAgIGJvb2wgaXNab29tZWQgPSBsYXllclRyZWVUcmFu c2FjdGlvbi5wYWdlU2NhbGVGYWN0b3IoKSA+IGxheWVyVHJlZVRyYW5zYWN0aW9uLmluaXRpYWxT Y2FsZUZhY3RvcigpOwogCiAgICAgYm9vbCBzY3JvbGxpbmdOZWVkZWRUb1JldmVhbFVJID0gZmFs c2U7CkBAIC0xMjQyLDcgKzEyNDIsNyBAQCAtICh2b2lkKV96b29tVG9Gb2N1c1JlY3Q6KGNvbnN0 IFdlYkNvcmU6OkZsb2F0UmVjdCYpZm9jdXNlZEVsZW1lbnRSZWN0SW5Eb2N1bWVudAogCiAgICAg Q0dSZWN0IHVub2JzY3VyZWRTY3JvbGxWaWV3UmVjdEluV2ViVmlld0Nvb3JkaW5hdGVzID0gVUlF ZGdlSW5zZXRzSW5zZXRSZWN0KFtzZWxmIGJvdW5kc10sIF9vYnNjdXJlZEluc2V0cyk7CiAgICAg Q0dSZWN0IHZpc2libGVTY3JvbGxWaWV3Qm91bmRzSW5XZWJWaWV3Q29vcmRpbmF0ZXMgPSBDR1Jl Y3RJbnRlcnNlY3Rpb24odW5vYnNjdXJlZFNjcm9sbFZpZXdSZWN0SW5XZWJWaWV3Q29vcmRpbmF0 ZXMsIFtmdWxsU2NyZWVuVmlldyBjb252ZXJ0UmVjdDpbZnVsbFNjcmVlblZpZXcgYm91bmRzXSB0 b1ZpZXc6c2VsZl0pOwotICAgIENHUmVjdCBmb3JtQXNzaXN0YW50RnJhbWVJbldlYlZpZXdDb29y ZGluYXRlcyA9IFt3aW5kb3cgY29udmVydFJlY3Q6X2lucHV0Vmlld0JvdW5kcyB0b1ZpZXc6c2Vs Zl07CisgICAgQ0dSZWN0IGZvcm1Bc3Npc3RhbnRGcmFtZUluV2ViVmlld0Nvb3JkaW5hdGVzID0g W3dpbmRvdyBjb252ZXJ0UmVjdDpfaW5wdXRWaWV3Qm91bmRzSW5XaW5kb3cgdG9WaWV3OnNlbGZd OwogICAgIENHUmVjdCBpbnRlcnNlY3Rpb25CZXR3ZWVuU2Nyb2xsVmlld0FuZEZvcm1Bc3Npc3Rh bnQgPSBDR1JlY3RJbnRlcnNlY3Rpb24odmlzaWJsZVNjcm9sbFZpZXdCb3VuZHNJbldlYlZpZXdD b29yZGluYXRlcywgZm9ybUFzc2lzdGFudEZyYW1lSW5XZWJWaWV3Q29vcmRpbmF0ZXMpOwogICAg IENHU2l6ZSB2aXNpYmxlU2l6ZSA9IHZpc2libGVTY3JvbGxWaWV3Qm91bmRzSW5XZWJWaWV3Q29v cmRpbmF0ZXMuc2l6ZTsKIApAQCAtMTg4MSw3ICsxODgxLDcgQEAgLSAoQ0dSZWN0KV9jb250ZW50 UmVjdEZvclVzZXJJbnRlcmFjdGlvbgogewogICAgIC8vIEZJWE1FOiBoYW5kbGUgc3BsaXQga2V5 Ym9hcmQuCiAgICAgVUlFZGdlSW5zZXRzIG9ic2N1cmVkSW5zZXRzID0gX29ic2N1cmVkSW5zZXRz OwotICAgIG9ic2N1cmVkSW5zZXRzLmJvdHRvbSA9IHN0ZDo6bWF4KF9vYnNjdXJlZEluc2V0cy5i b3R0b20sIF9pbnB1dFZpZXdCb3VuZHMuc2l6ZS5oZWlnaHQpOworICAgIG9ic2N1cmVkSW5zZXRz LmJvdHRvbSA9IHN0ZDo6bWF4KF9vYnNjdXJlZEluc2V0cy5ib3R0b20sIF9pbnB1dFZpZXdCb3Vu ZHNJbldpbmRvdy5zaXplLmhlaWdodCk7CiAgICAgQ0dSZWN0IHVub2JzY3VyZWRSZWN0ID0gVUlF ZGdlSW5zZXRzSW5zZXRSZWN0KHNlbGYuYm91bmRzLCBvYnNjdXJlZEluc2V0cyk7CiAgICAgcmV0 dXJuIFtzZWxmIGNvbnZlcnRSZWN0OnVub2JzY3VyZWRSZWN0IHRvVmlldzpzZWxmLl9jdXJyZW50 Q29udGVudFZpZXddOwogfQpAQCAtMjE0MSw3ICsyMTQxLDcgQEAgLSAodm9pZClfdXBkYXRlVmlz aWJsZUNvbnRlbnRSZWN0cwogICAgICAgICB1bm9ic2N1cmVkUmVjdEluU2Nyb2xsVmlld0Nvb3Jk aW5hdGVzOnVub2JzY3VyZWRSZWN0CiAgICAgICAgIG9ic2N1cmVkSW5zZXRzOl9vYnNjdXJlZElu c2V0cwogICAgICAgICB1bm9ic2N1cmVkU2FmZUFyZWFJbnNldHM6W3NlbGYgX2NvbXB1dGVkVW5v YnNjdXJlZFNhZmVBcmVhSW5zZXRdCi0gICAgICAgIGlucHV0Vmlld0JvdW5kczpfaW5wdXRWaWV3 Qm91bmRzCisgICAgICAgIGlucHV0Vmlld0JvdW5kczpfaW5wdXRWaWV3Qm91bmRzSW5XaW5kb3cK ICAgICAgICAgc2NhbGU6c2NhbGVGYWN0b3IgbWluaW11bVNjYWxlOltfc2Nyb2xsVmlldyBtaW5p bXVtWm9vbVNjYWxlXQogICAgICAgICB2aWV3U3RhYmlsaXR5OnZpZXdTdGFiaWxpdHkKICAgICAg ICAgZW5jbG9zZWRJblNjcm9sbGFibGVBbmNlc3RvclZpZXc6c2Nyb2xsVmlld0NhblNjcm9sbChb c2VsZiBfc2Nyb2xsZXJdKQpAQCAtMjI5OCwxOSArMjI5OCwyMiBAQCAtICh2b2lkKV9rZXlib2Fy ZENoYW5nZWRXaXRoSW5mbzooTlNEaWN0aW9uYXJ5ICopa2V5Ym9hcmRJbmZvIGFkanVzdFNjcm9s bFZpZXc6KAogICAgIGlmICghZW5kRnJhbWVWYWx1ZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAg YXV0byBwcmV2aW91c0lucHV0Vmlld0JvdW5kcyA9IF9pbnB1dFZpZXdCb3VuZHM7CisgICAgYXV0 byBwcmV2aW91c0lucHV0Vmlld0JvdW5kcyA9IF9pbnB1dFZpZXdCb3VuZHNJbldpbmRvdzsKICAg ICBCT09MIHNlbGVjdGlvbldhc1Zpc2libGUgPSBzZWxmLl9zZWxlY3Rpb25SZWN0SXNGdWxseVZp c2libGVBbmROb25FbXB0eTsKIAotICAgIC8vIFRoZSBrZXlib2FyZCByZWN0IGlzIGFsd2F5cyBp biBzY3JlZW4gY29vcmRpbmF0ZXMuIEluIHRoZSB2aWV3IHNlcnZpY2VzIGNhc2UgdGhlIHdpbmRv dyBkb2VzIG5vdAotICAgIC8vIGhhdmUgdGhlIGludGVyZmFjZSBvcmllbnRhdGlvbiByb3RhdGlv biB0cmFuc2Zvcm1hdGlvbjsgaXRzIGhvc3QgZG9lcy4gU28sIGl0IG1ha2VzIG5vIHNlbnNlIHRv Ci0gICAgLy8gY2xpcCB0aGUga2V5Ym9hcmQgcmVjdCBhZ2FpbnN0IGl0cyBzY3JlZW4uCi0gICAg aWYgKFtbc2VsZiB3aW5kb3ddIF9pc0hvc3RlZEluQW5vdGhlclByb2Nlc3NdKQotICAgICAgICBf aW5wdXRWaWV3Qm91bmRzID0gW3NlbGYud2luZG93IGNvbnZlcnRSZWN0OltlbmRGcmFtZVZhbHVl IENHUmVjdFZhbHVlXSBmcm9tV2luZG93Om5pbF07Ci0gICAgZWxzZQotICAgICAgICBfaW5wdXRW aWV3Qm91bmRzID0gW3NlbGYud2luZG93IGNvbnZlcnRSZWN0OkNHUmVjdEludGVyc2VjdGlvbihb ZW5kRnJhbWVWYWx1ZSBDR1JlY3RWYWx1ZV0sIHNlbGYud2luZG93LnNjcmVlbi5ib3VuZHMpIGZy b21XaW5kb3c6bmlsXTsKKyAgICBfaW5wdXRWaWV3Qm91bmRzSW5XaW5kb3cgPSAoWyZdIHsKKyAg ICAgICAgaWYgKFVJUGVyaXBoZXJhbEhvc3Quc2hhcmVkSW5zdGFuY2UuaXNVbmRvY2tlZCkKKyAg ICAgICAgICAgIHJldHVybiBDR1JlY3RaZXJvOworCisgICAgICAgIGF1dG8ga2V5Ym9hcmRGcmFt ZUluU2NyZWVuID0gZW5kRnJhbWVWYWx1ZS5DR1JlY3RWYWx1ZTsKKyAgICAgICAgLy8gVGhlIGtl eWJvYXJkIHJlY3QgaXMgYWx3YXlzIGluIHNjcmVlbiBjb29yZGluYXRlcy4gSW4gdGhlIHZpZXcg c2VydmljZXMgY2FzZSB0aGUgd2luZG93IGRvZXMgbm90CisgICAgICAgIC8vIGhhdmUgdGhlIGlu dGVyZmFjZSBvcmllbnRhdGlvbiByb3RhdGlvbiB0cmFuc2Zvcm1hdGlvbjsgaXRzIGhvc3QgZG9l cy4gU28sIGl0IG1ha2VzIG5vIHNlbnNlIHRvCisgICAgICAgIC8vIGNsaXAgdGhlIGtleWJvYXJk IHJlY3QgYWdhaW5zdCBpdHMgc2NyZWVuLgorICAgICAgICBpZiAoIXNlbGYud2luZG93Ll9pc0hv c3RlZEluQW5vdGhlclByb2Nlc3MpCisgICAgICAgICAgICBrZXlib2FyZEZyYW1lSW5TY3JlZW4g PSBDR1JlY3RJbnRlcnNlY3Rpb24oa2V5Ym9hcmRGcmFtZUluU2NyZWVuLCBzZWxmLndpbmRvdy5z Y3JlZW4uYm91bmRzKTsKIAotICAgIGlmIChbW1VJUGVyaXBoZXJhbEhvc3Qgc2hhcmVkSW5zdGFu Y2VdIGlzVW5kb2NrZWRdKQotICAgICAgICBfaW5wdXRWaWV3Qm91bmRzID0gQ0dSZWN0WmVybzsK KyAgICAgICAgcmV0dXJuIFtzZWxmLndpbmRvdyBjb252ZXJ0UmVjdDprZXlib2FyZEZyYW1lSW5T Y3JlZW4gZnJvbUNvb3JkaW5hdGVTcGFjZTpzZWxmLndpbmRvdy5zY3JlZW4uY29vcmRpbmF0ZVNw YWNlXTsKKyAgICB9KSgpOwogCiAgICAgaWYgKGFkanVzdFNjcm9sbFZpZXcpIHsKICAgICAgICAg Q0dGbG9hdCBib3R0b21JbnNldEJlZm9yZUFkanVzdG1lbnQgPSBbX3Njcm9sbFZpZXcgY29udGVu dEluc2V0XS5ib3R0b207CkBAIC0yMzI0LDcgKzIzMjcsNyBAQCAtICh2b2lkKV9rZXlib2FyZENo YW5nZWRXaXRoSW5mbzooTlNEaWN0aW9uYXJ5ICopa2V5Ym9hcmRJbmZvIGFkanVzdFNjcm9sbFZp ZXc6KAogICAgICAgICAgICAgX3RvdGFsU2Nyb2xsVmlld0JvdHRvbUluc2V0QWRqdXN0bWVudEZv cktleWJvYXJkICs9IGJvdHRvbUluc2V0QWZ0ZXJBZGp1c3RtZW50IC0gYm90dG9tSW5zZXRCZWZv cmVBZGp1c3RtZW50OwogICAgIH0KIAotICAgIGlmIChzZWxlY3Rpb25XYXNWaXNpYmxlICYmIFtf Y29udGVudFZpZXcgX2hhc0ZvY3VzZWRFbGVtZW50XSAmJiAhQ0dSZWN0SXNFbXB0eShwcmV2aW91 c0lucHV0Vmlld0JvdW5kcykgJiYgIUNHUmVjdElzRW1wdHkoX2lucHV0Vmlld0JvdW5kcykgJiYg IUNHUmVjdEVxdWFsVG9SZWN0KHByZXZpb3VzSW5wdXRWaWV3Qm91bmRzLCBfaW5wdXRWaWV3Qm91 bmRzKSkKKyAgICBpZiAoc2VsZWN0aW9uV2FzVmlzaWJsZSAmJiBbX2NvbnRlbnRWaWV3IF9oYXNG b2N1c2VkRWxlbWVudF0gJiYgIUNHUmVjdElzRW1wdHkocHJldmlvdXNJbnB1dFZpZXdCb3VuZHMp ICYmICFDR1JlY3RJc0VtcHR5KF9pbnB1dFZpZXdCb3VuZHNJbldpbmRvdykgJiYgIUNHUmVjdEVx dWFsVG9SZWN0KHByZXZpb3VzSW5wdXRWaWV3Qm91bmRzLCBfaW5wdXRWaWV3Qm91bmRzSW5XaW5k b3cpKQogICAgICAgICBbc2VsZiBfc2Nyb2xsVG9BbmRSZXZlYWxTZWxlY3Rpb25JZk5lZWRlZF07 CiAKICAgICBbc2VsZiBfc2NoZWR1bGVWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVdOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdQcml2YXRlRm9y VGVzdGluZ0lPUy5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdQ cml2YXRlRm9yVGVzdGluZ0lPUy5oCmluZGV4IDY2MjZhYTViMmI0ODFjMmRmMjc2NTQzMzhiYjlj OTMxZjAyM2VmNDYuLjEzYTNlNDM4YTQzZTQ1NTU2NTBmMGQyMDg0NjM4NTdkYzkxZmFhMGYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3UHJpdmF0 ZUZvclRlc3RpbmdJT1MuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dL V2ViVmlld1ByaXZhdGVGb3JUZXN0aW5nSU9TLmgKQEAgLTM5LDcgKzM5LDcgQEAKIEBwcm9wZXJ0 eSAobm9uYXRvbWljLCByZWFkb25seSkgTlNTdHJpbmcgKnNlbGVjdEZvcm1Qb3BvdmVyVGl0bGU7 CiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIE5TU3RyaW5nICpmb3JtSW5wdXRMYWJl bDsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCByZWFkb25seSkgTlNBcnJheTxOU1ZhbHVlICo+ICpf dWlUZXh0U2VsZWN0aW9uUmVjdHM7Ci1AcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIENH UmVjdCBfaW5wdXRWaWV3Qm91bmRzOworQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBD R1JlY3QgX2lucHV0Vmlld0JvdW5kc0luV2luZG93OwogQHByb3BlcnR5IChub25hdG9taWMsIHJl YWRvbmx5KSBOU1N0cmluZyAqX3Njcm9sbGluZ1RyZWVBc1RleHQ7CiBAcHJvcGVydHkgKG5vbmF0 b21pYywgcmVhZG9ubHkpIE5TTnVtYmVyICpfc3RhYmxlU3RhdGVPdmVycmlkZTsKIEBwcm9wZXJ0 eSAobm9uYXRvbWljLCByZWFkb25seSkgQ0dSZWN0IF9kcmFnQ2FyZXRSZWN0OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdUZXN0aW5nSU9TLm1t IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdUZXN0aW5nSU9TLm1t CmluZGV4IDg5MjRjNjY0NGNjMzUyOGJjNzFkMGZhOWNkNWFjMzZlYThlZjU1NzUuLmRhMGU0Zjhl MTRlMmNlMWE5YjdlOGIzOWNhOWQyMTZkMTAwZDI1ZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3VGVzdGluZ0lPUy5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld1Rlc3RpbmdJT1MubW0KQEAgLTIwMyw5 ICsyMDMsOSBAQCAtIChOU1N0cmluZyAqKWZvcm1JbnB1dExhYmVsCiAgICAgcmV0dXJuIFtfY29u dGVudFZpZXcgZm9ybUlucHV0TGFiZWxdOwogfQogCi0tIChDR1JlY3QpX2lucHV0Vmlld0JvdW5k cworLSAoQ0dSZWN0KV9pbnB1dFZpZXdCb3VuZHNJbldpbmRvdwogewotICAgIHJldHVybiBfaW5w dXRWaWV3Qm91bmRzOworICAgIHJldHVybiBfaW5wdXRWaWV3Qm91bmRzSW5XaW5kb3c7CiB9CiAK IC0gKE5TQXJyYXk8TlNWYWx1ZSAqPiAqKV91aVRleHRTZWxlY3Rpb25SZWN0cwpkaWZmIC0tZ2l0 IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGIzY2YxNWFhOGZlZWJh ODExOGJlZmQ0NjcyYWM5N2Y5OWM3NzAwNDguLmJjZTUzMzdhYWE1YjM0ZGQ2N2QxYzNjMTc4ZjIy MDAxZGU4OWFlODYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0wNS0xMSAgV2Vuc29uIEhzaWVoICA8d2Vuc29u X2hzaWVoQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBNYWlsIGNvbXBvc2Ugd2ViIHZpZXcg ZG9lc24ndCBzY3JvbGwgdG8gcmV2ZWFsIHRoZSBzZWxlY3Rpb24gaW4gY2VydGFpbiBjb25maWd1 cmF0aW9ucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI1Njc1CisgICAgICAgIHJkYXI6Ly83NzA5NTg4NgorCisgICAgICAgIFJldmlld2VkIGJ5IFRp bSBIb3J0b24uCisKKyAgICAgICAgUmVuYW1lIHNvbWUgdGVzdGluZyBTUEkuIFNlZSBXZWJLaXQv Q2hhbmdlTG9nIGZvciBtb3JlIGluZm9ybWF0aW9uLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1 bm5lci9pb3MvVUlTY3JpcHRDb250cm9sbGVySU9TLm1tOgorICAgICAgICAoV1RSOjpVSVNjcmlw dENvbnRyb2xsZXJJT1M6OmlucHV0Vmlld0JvdW5kcyBjb25zdCk6CisKIDIwMjEtMDUtMTAgIFdl bnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXSBB bGxvdyBpbW1lZGlhdGUgYWN0aW9uIGdlc3R1cmVzIHRvIGJlZ2luIHdoZW4gZm9yY2UgY2xpY2tp bmcgdGV4dCBpbnNpZGUgaW1hZ2Ugb3ZlcmxheXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvaW9zL1VJU2NyaXB0Q29udHJvbGxlcklPUy5tbSBiL1Rvb2xzL1dlYktpdFRlc3RS dW5uZXIvaW9zL1VJU2NyaXB0Q29udHJvbGxlcklPUy5tbQppbmRleCA4MjMzZWQzZDI3NmRlMjdm NTM3MGZlYTQyNDYxNjIzNzNjNzBmZTdhLi5lMmRkN2Q4ZGFkYzRkNzkxNzU2YTkzZGY4MjQyMTkw ZDM5YjA1MDM5IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2lvcy9VSVNjcmlw dENvbnRyb2xsZXJJT1MubW0KKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9pb3MvVUlTY3Jp cHRDb250cm9sbGVySU9TLm1tCkBAIC04NDksNyArODQ5LDcgQEAgSlNPYmplY3RSZWYgVUlTY3Jp cHRDb250cm9sbGVySU9TOjpzZWxlY3Rpb25SYW5nZVZpZXdSZWN0cygpIGNvbnN0CiAKIEpTT2Jq ZWN0UmVmIFVJU2NyaXB0Q29udHJvbGxlcklPUzo6aW5wdXRWaWV3Qm91bmRzKCkgY29uc3QKIHsK LSAgICByZXR1cm4gSlNWYWx1ZVRvT2JqZWN0KG1fY29udGV4dC0+anNDb250ZXh0KCksIFtKU1Zh bHVlIHZhbHVlV2l0aE9iamVjdDp0b05TRGljdGlvbmFyeSh3ZWJWaWV3KCkuX2lucHV0Vmlld0Jv dW5kcykgaW5Db250ZXh0OltKU0NvbnRleHQgY29udGV4dFdpdGhKU0dsb2JhbENvbnRleHRSZWY6 bV9jb250ZXh0LT5qc0NvbnRleHQoKV1dLkpTVmFsdWVSZWYsIG51bGxwdHIpOworICAgIHJldHVy biBKU1ZhbHVlVG9PYmplY3QobV9jb250ZXh0LT5qc0NvbnRleHQoKSwgW0pTVmFsdWUgdmFsdWVX aXRoT2JqZWN0OnRvTlNEaWN0aW9uYXJ5KHdlYlZpZXcoKS5faW5wdXRWaWV3Qm91bmRzSW5XaW5k b3cpIGluQ29udGV4dDpbSlNDb250ZXh0IGNvbnRleHRXaXRoSlNHbG9iYWxDb250ZXh0UmVmOm1f Y29udGV4dC0+anNDb250ZXh0KCldXS5KU1ZhbHVlUmVmLCBudWxscHRyKTsKIH0KIAogSlNSZXRh aW5QdHI8SlNTdHJpbmdSZWY+IFVJU2NyaXB0Q29udHJvbGxlcklPUzo6c2Nyb2xsaW5nVHJlZUFz VGV4dCgpIGNvbnN0Cg==