205377 2019-12-17 23:11:48 -0800 Move m_exposedContentRect into the DelegatedScrollingGeometry optional 2019-12-18 09:02:22 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue simon.fraser thorton webkit-bug-importer oldest_to_newest 1599695 0 simon.fraser 2019-12-17 23:11:48 -0800 Move m_exposedContentRect into the DelegatedScrollingGeometry optional 1599697 1 385940 simon.fraser 2019-12-17 23:14:34 -0800 Created attachment 385940 Patch 1599702 2 385942 simon.fraser 2019-12-17 23:32:56 -0800 Created attachment 385942 Patch 1599834 3 385942 commit-queue 2019-12-18 09:01:31 -0800 Comment on attachment 385942 Patch Clearing flags on attachment: 385942 Committed r253689: <https://trac.webkit.org/changeset/253689> 1599835 4 commit-queue 2019-12-18 09:01:32 -0800 All reviewed patches have been landed. Closing bug. 1599836 5 webkit-bug-importer 2019-12-18 09:02:22 -0800 <rdar://problem/58044593> 385940 2019-12-17 23:14:34 -0800 2019-12-17 23:32:54 -0800 Patch bug-205377-20191217231434.patch text/plain 15073 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNjcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjJkYTEwNjNkYzcyMTgz MGNiZDJlMTY5NzQyZDA5Y2E3OTM4OTRjYS4uNjAwNTNjYWI0MTZlZTg0N2ExZDRjMWM4NmJlMmEz NTM1MjllZDAxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTEyLTE3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgbV9leHBv c2VkQ29udGVudFJlY3QgaW50byB0aGUgRGVsZWdhdGVkU2Nyb2xsaW5nR2VvbWV0cnkgb3B0aW9u YWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTM3 NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNjcm9s bFZpZXcncyBtX2V4cG9zZWRDb250ZW50UmVjdCBpcyBvbmx5IHNldCBmb3IgZGVsZWdhdGVkIHNj cm9sbGluZywgc28gbW92ZSBpdCBpbnRvCisgICAgICAgIERlbGVnYXRlZFNjcm9sbGluZ0dlb21l dHJ5IGFuZCByZW1vdmUgdGhlIGlPUyAjaWZkZWZzIGFyb3VuZCBpdC4gTW92ZSB0aGUgV0FLL05T Vmlldy1yZWxhdGVkCisgICAgICAgIGNvZGUgaW50byBwbGF0Zm9ybUV4cG9zZWRDb250ZW50UmVj dCgpIGZvciBpT1MgV0sxLiBTdHViIG91dCBleHBvc2VkQ29udGVudFJlY3QoKSBmdW5jdGlvbnMK KyAgICAgICAgb24gVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuICAgICAgICAKKworICAg ICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs Vmlldzo6ZXhwb3NlZENvbnRlbnRSZWN0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9s bFZpZXc6OnNldEV4cG9zZWRDb250ZW50UmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxW aWV3OjpwbGF0Zm9ybUV4cG9zZWRDb250ZW50UmVjdCBjb25zdCk6CisgICAgICAgICogcGxhdGZv cm0vU2Nyb2xsVmlldy5oOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9TY3JvbGxWaWV3SU9TLm1t OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6cGxhdGZvcm1FeHBvc2VkQ29udGVudFJl Y3QgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6ZXhwb3NlZENvbnRlbnRS ZWN0IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OnNldEV4 cG9zZWRDb250ZW50UmVjdCk6IERlbGV0ZWQuCisKIDIwMTktMTItMTcgIFNpbW9uIEZyYXNlciAg PHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGlPUyAjaWZkZWZzIGFy b3VuZCB1bm9ic2N1cmVkQ29udGVudFNpemUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMzc4OWIyZTJkM2FmYmFkYWFm YWNlZGRjMjhjYTA1OGVlNDYxZWEwMS4uNTRiZTJjOGJkZjQ1NjA2ZjQwMzEwMWVjZjM0NTk4ODcy OWI1MTk2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxOS0xMi0xNyAgU2ltb24gRnJh c2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIG1fZXhwb3NlZENv bnRlbnRSZWN0IGludG8gdGhlIERlbGVnYXRlZFNjcm9sbGluZ0dlb21ldHJ5IG9wdGlvbmFsCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDUzNzcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFNj cm9sbFZpZXcncyBtX2V4cG9zZWRDb250ZW50UmVjdCBpcyBvbmx5IHNldCBmb3IgZGVsZWdhdGVk IHNjcm9sbGluZywgc28gbW92ZSBpdCBpbnRvCisgICAgICAgIERlbGVnYXRlZFNjcm9sbGluZ0dl b21ldHJ5IGFuZCByZW1vdmUgdGhlIGlPUyAjaWZkZWZzIGFyb3VuZCBpdC4gTW92ZSB0aGUgV0FL L05TVmlldy1yZWxhdGVkCisgICAgICAgIGNvZGUgaW50byBwbGF0Zm9ybUV4cG9zZWRDb250ZW50 UmVjdCgpIGZvciBpT1MgV0sxLiBTdHViIG91dCBleHBvc2VkQ29udGVudFJlY3QoKSBmdW5jdGlv bnMKKyAgICAgICAgb24gVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuICAgICAgICAKKwor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0Fy ZWEuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90 ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRy ZWVEcmF3aW5nQXJlYTo6c2V0RXhwb3NlZENvbnRlbnRSZWN0KToKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLmg6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5t bToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OlRpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhKToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5p bWF0aW9uRHJhd2luZ0FyZWE6OmFjdGl2aXR5U3RhdGVEaWRDaGFuZ2UpOgorICAgICAgICAoV2Vi S2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2V0Vmlld0V4cG9zZWRSZWN0KToK KyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OmV4cG9zZWRD b250ZW50UmVjdCBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhOjpzZXRFeHBvc2VkQ29udGVudFJlY3QpOgorICAgICAgICAoV2ViS2l0OjpUaWxl ZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6YWRqdXN0TGF5ZXJGbHVzaFRocm90dGxpbmcpOgor CiAyMDE5LTEyLTE3ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCBhZnRlciByMjUzNjYxLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxWaWV3LmNwcAppbmRleCAxNzg1MjNhZGZjMzZkMzU2NTgwNDhjMDhmODkzNjIy MjI3YTAzNjE1Li40ZjIxMzdkZGRhZGQxYTRkNzI3NzVkMDA0MGZlNzJhNzQxNGM2ZDQ2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcApAQCAtMjIwLDYgKzIyMCwzMyBAQCB2 b2lkIFNjcm9sbFZpZXc6OnNldENvbnRlbnRzU2Nyb2xsUG9zaXRpb24oY29uc3QgSW50UG9pbnQm IHBvc2l0aW9uKQogICAgIHNldFNjcm9sbFBvc2l0aW9uKHBvc2l0aW9uKTsKIH0KIAorRmxvYXRS ZWN0IFNjcm9sbFZpZXc6OmV4cG9zZWRDb250ZW50UmVjdCgpIGNvbnN0Cit7CisjaWYgUExBVEZP Uk0oSU9TX0ZBTUlMWSkKKyAgICBpZiAocGxhdGZvcm1XaWRnZXQoKSkKKyAgICAgICAgcmV0dXJu IHBsYXRmb3JtRXhwb3NlZENvbnRlbnRSZWN0KCk7CisjZW5kaWYKKyAgICAKKyAgICBjb25zdCBT Y3JvbGxWaWV3KiBwYXJlbnQgPSB0aGlzLT5wYXJlbnQoKTsKKyAgICBpZiAoIXBhcmVudCkKKyAg ICAgICAgcmV0dXJuIG1fZGVsZWdhdGVkU2Nyb2xsaW5nR2VvbWV0cnkgPyBtX2RlbGVnYXRlZFNj cm9sbGluZ0dlb21ldHJ5LT5leHBvc2VkQ29udGVudFJlY3QgOiBGbG9hdFJlY3QoKTsKKworICAg IEludFJlY3QgcGFyZW50Vmlld0V4dGVudENvbnRlbnRSZWN0ID0gZW5jbG9zaW5nSW50UmVjdChw YXJlbnQtPmV4cG9zZWRDb250ZW50UmVjdCgpKTsKKyAgICBJbnRSZWN0IHNlbGZFeHRlbnRDb250 ZW50UmVjdCA9IHJvb3RWaWV3VG9Db250ZW50cyhwYXJlbnRWaWV3RXh0ZW50Q29udGVudFJlY3Qp OworICAgIHNlbGZFeHRlbnRDb250ZW50UmVjdC5pbnRlcnNlY3QoYm91bmRzUmVjdCgpKTsKKyAg ICByZXR1cm4gc2VsZkV4dGVudENvbnRlbnRSZWN0OworfQorCit2b2lkIFNjcm9sbFZpZXc6OnNl dEV4cG9zZWRDb250ZW50UmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3QpCit7CisgICAgQVNTRVJU KCFwbGF0Zm9ybVdpZGdldCgpKTsKKworICAgIGlmICghbV9kZWxlZ2F0ZWRTY3JvbGxpbmdHZW9t ZXRyeSkKKyAgICAgICAgbV9kZWxlZ2F0ZWRTY3JvbGxpbmdHZW9tZXRyeSA9IERlbGVnYXRlZFNj cm9sbGluZ0dlb21ldHJ5KCk7CisKKyAgICBtX2RlbGVnYXRlZFNjcm9sbGluZ0dlb21ldHJ5LT5l eHBvc2VkQ29udGVudFJlY3QgPSByZWN0OworfQorCiBGbG9hdFNpemUgU2Nyb2xsVmlldzo6dW5v YnNjdXJlZENvbnRlbnRTaXplKCkgY29uc3QKIHsKICAgICBBU1NFUlQobV9kZWxlZ2F0ZWRTY3Jv bGxpbmdHZW9tZXRyeSk7CkBAIC0xNTkwLDYgKzE2MTcsMTEgQEAgSW50UmVjdCBTY3JvbGxWaWV3 OjpwbGF0Zm9ybVVub2JzY3VyZWRDb250ZW50UmVjdChWaXNpYmxlQ29udGVudFJlY3RJbmNsdWRl c1Njcm8KICAgICByZXR1cm4geyB9OwogfQogCitGbG9hdFJlY3QgU2Nyb2xsVmlldzo6cGxhdGZv cm1FeHBvc2VkQ29udGVudFJlY3QoKSBjb25zdAoreworICAgIHJldHVybiB7IH07Cit9CisKIHZv aWQgU2Nyb2xsVmlldzo6cGxhdGZvcm1TZXRDb250ZW50c1NpemUoKQogewogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsVmlldy5oCmluZGV4IDA4NDI4NTlmNzI4M2ZiMWE5MjUwNTFmZWUyMWJj ZTU2N2ZmYmVlOTIuLmU5M2IxMDQ3MWQ2MDJjYmI4Yjk0NWMxZjgyNGQ0OWQ4YTllYjIwMWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKQEAgLTQ3NSw2ICs0NzUsNyBAQCBwcml2 YXRlOgogICAgIEludFNpemUgcGxhdGZvcm1WaXNpYmxlQ29udGVudFNpemVJbmNsdWRpbmdPYnNj dXJlZEFyZWEoYm9vbCBpbmNsdWRlU2Nyb2xsYmFycykgY29uc3Q7CiAKICAgICBJbnRSZWN0IHBs YXRmb3JtVW5vYnNjdXJlZENvbnRlbnRSZWN0KFZpc2libGVDb250ZW50UmVjdEluY2x1ZGVzU2Ny b2xsYmFycykgY29uc3Q7CisgICAgRmxvYXRSZWN0IHBsYXRmb3JtRXhwb3NlZENvbnRlbnRSZWN0 KCkgY29uc3Q7CiAKICAgICB2b2lkIHBsYXRmb3JtU2V0Q29udGVudHNTaXplKCk7CiAKQEAgLTQ5 OSwxMSArNTAwLDExIEBAIHByaXZhdGU6CiAgICAgU2Nyb2xsYmFyTW9kZSBtX2hvcml6b250YWxT Y3JvbGxiYXJNb2RlIHsgU2Nyb2xsYmFyQXV0byB9OwogICAgIFNjcm9sbGJhck1vZGUgbV92ZXJ0 aWNhbFNjcm9sbGJhck1vZGUgeyBTY3JvbGxiYXJBdXRvIH07CiAKLSAgICBGbG9hdFJlY3QgbV9l eHBvc2VkQ29udGVudFJlY3Q7CiAKICAgICAvLyBGSVhNRTogTW9yZSB0aGluZ3Mgd2lsbCBtb3Zl IGludG8gaGVyZS4KICAgICBzdHJ1Y3QgRGVsZWdhdGVkU2Nyb2xsaW5nR2VvbWV0cnkgewogICAg ICAgICBGbG9hdFNpemUgdW5vYnNjdXJlZENvbnRlbnRTaXplOworICAgICAgICBGbG9hdFJlY3Qg ZXhwb3NlZENvbnRlbnRSZWN0OwogICAgIH07CiAgICAgT3B0aW9uYWw8RGVsZWdhdGVkU2Nyb2xs aW5nR2VvbWV0cnk+IG1fZGVsZWdhdGVkU2Nyb2xsaW5nR2VvbWV0cnk7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9TY3JvbGxWaWV3SU9TLm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL1Njcm9sbFZpZXdJT1MubW0KaW5kZXggYzgxZGE2NGUxN2IxODA1 ZDE5Y2ZiYWJlYTMwM2M1MTQ5YjJiNjdjMS4uMjY3Zjk3OGQyN2JhMzNhYTUwMjQyMTkyZGM1ZGNi NTA5ZGU2YzIzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Njcm9s bFZpZXdJT1MubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Njcm9sbFZpZXdJ T1MubW0KQEAgLTExMywzNiArMTEzLDIxIEBAIEludFJlY3QgU2Nyb2xsVmlldzo6cGxhdGZvcm1V bm9ic2N1cmVkQ29udGVudFJlY3QoVmlzaWJsZUNvbnRlbnRSZWN0SW5jbHVkZXNTY3JvCiAgICAg cmV0dXJuIGVuY2xvc2luZ0ludFJlY3Qocik7CiB9CiAKLUZsb2F0UmVjdCBTY3JvbGxWaWV3Ojpl eHBvc2VkQ29udGVudFJlY3QoKSBjb25zdAorRmxvYXRSZWN0IFNjcm9sbFZpZXc6OnBsYXRmb3Jt RXhwb3NlZENvbnRlbnRSZWN0KCkgY29uc3QKIHsKLSAgICBpZiAoTlNTY3JvbGxWaWV3ICp2aWV3 ID0gc3RhdGljX2Nhc3Q8TlNTY3JvbGxWaWV3ICo+KHBsYXRmb3JtV2lkZ2V0KCkpKSB7Ci0gICAg ICAgIENHUmVjdCByID0gQ0dSZWN0WmVybzsKLSAgICAgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENF UFRJT05TOwotICAgICAgICBpZiAoW3ZpZXcgaXNLaW5kT2ZDbGFzczpbTlNTY3JvbGxWaWV3IGNs YXNzXV0pCi0gICAgICAgICAgICByID0gW3ZpZXcgZXhwb3NlZENvbnRlbnRSZWN0XTsKLSAgICAg ICAgZWxzZSB7Ci0gICAgICAgICAgICByLm9yaWdpbiA9IFt2aWV3IHZpc2libGVSZWN0XS5vcmln aW47Ci0gICAgICAgICAgICByLnNpemUgPSBbdmlldyBib3VuZHNdLnNpemU7Ci0gICAgICAgIH0K LQotICAgICAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOwotICAgICAgICByZXR1cm4gcjsK KyAgICBBU1NFUlQocGxhdGZvcm1XaWRnZXQoKSk7CisgICAgTlNTY3JvbGxWaWV3ICp2aWV3ID0g c3RhdGljX2Nhc3Q8TlNTY3JvbGxWaWV3ICo+KHBsYXRmb3JtV2lkZ2V0KCkpOworICAgIENHUmVj dCByID0gQ0dSZWN0WmVybzsKKyAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CisgICAg aWYgKFt2aWV3IGlzS2luZE9mQ2xhc3M6W05TU2Nyb2xsVmlldyBjbGFzc11dKQorICAgICAgICBy ID0gW3ZpZXcgZXhwb3NlZENvbnRlbnRSZWN0XTsKKyAgICBlbHNlIHsKKyAgICAgICAgci5vcmln aW4gPSBbdmlldyB2aXNpYmxlUmVjdF0ub3JpZ2luOworICAgICAgICByLnNpemUgPSBbdmlldyBi b3VuZHNdLnNpemU7CiAgICAgfQogCi0gICAgY29uc3QgU2Nyb2xsVmlldyogcGFyZW50ID0gdGhp cy0+cGFyZW50KCk7Ci0gICAgaWYgKCFwYXJlbnQpCi0gICAgICAgIHJldHVybiBtX2V4cG9zZWRD b250ZW50UmVjdDsKLQotICAgIEludFJlY3QgcGFyZW50Vmlld0V4dGVudENvbnRlbnRSZWN0ID0g ZW5jbG9zaW5nSW50UmVjdChwYXJlbnQtPmV4cG9zZWRDb250ZW50UmVjdCgpKTsKLSAgICBJbnRS ZWN0IHNlbGZFeHRlbnRDb250ZW50UmVjdCA9IHJvb3RWaWV3VG9Db250ZW50cyhwYXJlbnRWaWV3 RXh0ZW50Q29udGVudFJlY3QpOwotICAgIHNlbGZFeHRlbnRDb250ZW50UmVjdC5pbnRlcnNlY3Qo Ym91bmRzUmVjdCgpKTsKLSAgICByZXR1cm4gc2VsZkV4dGVudENvbnRlbnRSZWN0OwotfQotCi12 b2lkIFNjcm9sbFZpZXc6OnNldEV4cG9zZWRDb250ZW50UmVjdChjb25zdCBGbG9hdFJlY3QmIHJl Y3QpCi17Ci0gICAgQVNTRVJUKCFwbGF0Zm9ybVdpZGdldCgpKTsKLSAgICBtX2V4cG9zZWRDb250 ZW50UmVjdCA9IHJlY3Q7CisgICAgRU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKKyAgICByZXR1 cm4gcjsKIH0KIAogdm9pZCBTY3JvbGxWaWV3OjpzZXRBY3R1YWxTY3JvbGxQb3NpdGlvbihjb25z dCBJbnRQb2ludCYgcG9zaXRpb24pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvRHJhd2luZ0FyZWEuaAppbmRleCAxNmQwOWJmZWYwZDQyN2NkZGIyMmQ1YmIwM2VlNmFjYTU1 NDNlNmQ3Li5iYWIxZDRiZmJlZTllNDUxNGYzZjdiYzRiY2E1YTU5NWU1OTg2ZjE1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmgKQEAgLTk4LDEx ICs5OCwxMSBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGFjY2VsZXJhdGVkQW5pbWF0aW9u RGlkU3RhcnQodWludDY0X3QgLypsYXllcklEKi8sIGNvbnN0IFN0cmluZyYgLyprZXkqLywgTW9u b3RvbmljVGltZSAvKnN0YXJ0VGltZSovKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgYWNjZWxlcmF0 ZWRBbmltYXRpb25EaWRFbmQodWludDY0X3QgLypsYXllcklEKi8sIGNvbnN0IFN0cmluZyYgLypr ZXkqLykgeyB9CiAgICAgdmlydHVhbCB2b2lkIGFkZEZlbmNlKGNvbnN0IFdURjo6TWFjaFNlbmRS aWdodCYpIHsgfQotI2VuZGlmCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKwogICAgIHZpcnR1 YWwgV2ViQ29yZTo6RmxvYXRSZWN0IGV4cG9zZWRDb250ZW50UmVjdCgpIGNvbnN0ID0gMDsKICAg ICB2aXJ0dWFsIHZvaWQgc2V0RXhwb3NlZENvbnRlbnRSZWN0KGNvbnN0IFdlYkNvcmU6OkZsb2F0 UmVjdCYpID0gMDsKICNlbmRpZgorCiAgICAgdmlydHVhbCB2b2lkIG1haW5GcmFtZVNjcm9sbGFi aWxpdHlDaGFuZ2VkKGJvb2wpIHsgfQogCiAgICAgdmlydHVhbCBib29sIHN1cHBvcnRzQXN5bmNT Y3JvbGxpbmcoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURy YXdpbmdBcmVhLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXll clRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEuaAppbmRleCBjY2Q5NjNmZWNjYjFkMGYw NjY4YTVhZDZiM2FmY2RhMDIwNmYxNjU3Li5mMTExNjgzZmJhNzI3OGY4NzI0YmFkZThlODI5ZTJl ZGZmYjY1ZGRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9S ZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVl RHJhd2luZ0FyZWEuaApAQCAtOTUsMTAgKzk1LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGFjY2Vs ZXJhdGVkQW5pbWF0aW9uRGlkU3RhcnQodWludDY0X3QgbGF5ZXJJRCwgY29uc3QgU3RyaW5nJiBr ZXksIE1vbm90b25pY1RpbWUgc3RhcnRUaW1lKSBvdmVycmlkZTsKICAgICB2b2lkIGFjY2VsZXJh dGVkQW5pbWF0aW9uRGlkRW5kKHVpbnQ2NF90IGxheWVySUQsIGNvbnN0IFN0cmluZyYga2V5KSBv dmVycmlkZTsKIAotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgV2ViQ29yZTo6RmxvYXRS ZWN0IGV4cG9zZWRDb250ZW50UmVjdCgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZvaWQgc2V0RXhw b3NlZENvbnRlbnRSZWN0KGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYpIG92ZXJyaWRlOwotI2Vu ZGlmCiAKICAgICB2b2lkIGRpZFVwZGF0ZSgpIG92ZXJyaWRlOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJU cmVlRHJhd2luZ0FyZWEubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1v dGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEubW0KaW5kZXggYzgwYWY1ZDU0 OWY1MjI2N2E2ZGZiNTQ5ZDFjOTUzMjM1NDAxNTEwNy4uMjZhMDMwM2Q1MjkwMDQ4NDEyZmM0OTRh MTQzNjk0OTVlZDJlM2I2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1tCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVM YXllclRyZWVEcmF3aW5nQXJlYS5tbQpAQCAtMjI4LDcgKzIyOCw2IEBAIHZvaWQgUmVtb3RlTGF5 ZXJUcmVlRHJhd2luZ0FyZWE6OnNldFZpZXdFeHBvc2VkUmVjdChPcHRpb25hbDxXZWJDb3JlOjpG bG9hdFJlY3Q+CiAgICAgdXBkYXRlU2Nyb2xsZWRFeHBvc2VkUmVjdCgpOwogfQogCi0jaWYgUExB VEZPUk0oSU9TX0ZBTUlMWSkKIFdlYkNvcmU6OkZsb2F0UmVjdCBSZW1vdGVMYXllclRyZWVEcmF3 aW5nQXJlYTo6ZXhwb3NlZENvbnRlbnRSZWN0KCkgY29uc3QKIHsKICAgICBGcmFtZVZpZXcqIGZy YW1lVmlldyA9IG1fd2ViUGFnZS5tYWluRnJhbWVWaWV3KCk7CkBAIC0yNDksNyArMjQ4LDYgQEAg dm9pZCBSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYTo6c2V0RXhwb3NlZENvbnRlbnRSZWN0KGNv bnN0IEZsb2F0UmVjdCYgZXhwb3NlZEMKICAgICBmcmFtZVZpZXctPnNldEV4cG9zZWRDb250ZW50 UmVjdChleHBvc2VkQ29udGVudFJlY3QpOwogICAgIHNjaGVkdWxlQ29tcG9zaXRpbmdMYXllckZs dXNoKCk7CiB9Ci0jZW5kaWYKIAogdm9pZCBSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYTo6dXBk YXRlU2Nyb2xsZWRFeHBvc2VkUmVjdCgpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaCBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYS5oCmluZGV4IGQ4NWRjNDE3MWNhNGFmNjIwMGFmMTFmZWYwY2UwNzRiZGZlZjU0MDgu Ljc0NmI3ZjhjNWQyY2IxYmIyZjU2MGM4ZTYzODI3NzA0ZDc2MTQxMDMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxl ZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oCkBAIC03NSw2ICs3NSw5IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBzZXRWaWV3RXhwb3NlZFJlY3QoT3B0aW9uYWw8V2ViQ29yZTo6RmxvYXRSZWN0Pikg b3ZlcnJpZGU7CiAgICAgT3B0aW9uYWw8V2ViQ29yZTo6RmxvYXRSZWN0PiB2aWV3RXhwb3NlZFJl Y3QoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBtX3Njcm9sbGVkVmlld0V4cG9zZWRSZWN0OyB9 CiAKKyAgICBXZWJDb3JlOjpGbG9hdFJlY3QgZXhwb3NlZENvbnRlbnRSZWN0KCkgY29uc3Q7Cisg ICAgdm9pZCBzZXRFeHBvc2VkQ29udGVudFJlY3QoY29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0Jik7 CisKICAgICBib29sIHN1cHBvcnRzQXN5bmNTY3JvbGxpbmcoKSBjb25zdCBvdmVycmlkZSB7IHJl dHVybiB0cnVlOyB9CiAKICAgICB2b2lkIGRpc3BhdGNoQWZ0ZXJFbnN1cmluZ1VwZGF0ZWRTY3Jv bGxQb3NpdGlvbihXVEY6OkZ1bmN0aW9uPHZvaWQgKCk+JiYpIG92ZXJyaWRlOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1Rp bGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCmluZGV4IDk5NzJmZTE1Yzc3MWM4NDU3OGU5 OGRjNGY5MmE5ZjM5ZmZmOGMxNGYuLjE0NjlhNGJjNTg0OGY4ZDY4ZDJiYzNmNGYyYjJlNGQwYWQw YThmNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9U aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEubW0KQEAgLTg3 LDcgKzg3LDcgQEAgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OlRpbGVkQ29yZUFuaW1h dGlvbkRyYXdpbmdBcmVhKFdlYlBhZ2UmIHdlYlBhZ2UsIGMKICAgICBbbV9ob3N0aW5nTGF5ZXIg c2V0T3BhcXVlOllFU107CiAgICAgW21faG9zdGluZ0xheWVyIHNldEdlb21ldHJ5RmxpcHBlZDpZ RVNdOwogCi0gICAgbV9sYXllckZsdXNoUnVuTG9vcE9ic2VydmVyID0gbWFrZVVuaXF1ZTxXZWJD b3JlOjpSdW5Mb29wT2JzZXJ2ZXI+KHN0YXRpY19jYXN0PENGSW5kZXg+KFJ1bkxvb3BPYnNlcnZl cjo6V2VsbEtub3duUnVuTG9vcE9yZGVyczo6TGF5ZXJGbHVzaCksIFt0aGlzXSgpIHsKKyAgICBt X2xheWVyRmx1c2hSdW5Mb29wT2JzZXJ2ZXIgPSBtYWtlVW5pcXVlPFJ1bkxvb3BPYnNlcnZlcj4o c3RhdGljX2Nhc3Q8Q0ZJbmRleD4oUnVuTG9vcE9ic2VydmVyOjpXZWxsS25vd25SdW5Mb29wT3Jk ZXJzOjpMYXllckZsdXNoKSwgW3RoaXNdKCkgewogICAgICAgICB0aGlzLT5sYXllckZsdXNoUnVu TG9vcENhbGxiYWNrKCk7CiAgICAgfSk7CiAKQEAgLTUxNCw3ICs1MTQsNyBAQCB2b2lkIFRpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpmbHVzaExheWVycyhGbHVzaFR5cGUgZmx1c2hUeXBl KQogICAgIH0KIH0KIAotdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6YWN0aXZp dHlTdGF0ZURpZENoYW5nZShPcHRpb25TZXQ8V2ViQ29yZTo6QWN0aXZpdHlTdGF0ZTo6RmxhZz4g Y2hhbmdlZCwgQWN0aXZpdHlTdGF0ZUNoYW5nZUlEIGFjdGl2aXR5U3RhdGVDaGFuZ2VJRCwgY29u c3QgVmVjdG9yPENhbGxiYWNrSUQ+JiBuZXh0QWN0aXZpdHlTdGF0ZUNoYW5nZUNhbGxiYWNrSURz KQordm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6YWN0aXZpdHlTdGF0ZURpZENo YW5nZShPcHRpb25TZXQ8QWN0aXZpdHlTdGF0ZTo6RmxhZz4gY2hhbmdlZCwgQWN0aXZpdHlTdGF0 ZUNoYW5nZUlEIGFjdGl2aXR5U3RhdGVDaGFuZ2VJRCwgY29uc3QgVmVjdG9yPENhbGxiYWNrSUQ+ JiBuZXh0QWN0aXZpdHlTdGF0ZUNoYW5nZUNhbGxiYWNrSURzKQogewogICAgIG1fbmV4dEFjdGl2 aXR5U3RhdGVDaGFuZ2VDYWxsYmFja0lEcy5hcHBlbmRWZWN0b3IobmV4dEFjdGl2aXR5U3RhdGVD aGFuZ2VDYWxsYmFja0lEcyk7CiAgICAgbV9hY3Rpdml0eVN0YXRlQ2hhbmdlSUQgPSBzdGQ6Om1h eChtX2FjdGl2aXR5U3RhdGVDaGFuZ2VJRCwgYWN0aXZpdHlTdGF0ZUNoYW5nZUlEKTsKQEAgLTU2 NiwxMiArNTY2LDIzIEBAIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnJlc3Vt ZVBhaW50aW5nKCkKICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIHBv c3ROb3RpZmljYXRpb25OYW1lOkAiTlNDQVZpZXdSZW5kZXJEaWRSZXN1bWVOb3RpZmljYXRpb24i IG9iamVjdDpuaWwgdXNlckluZm86W05TRGljdGlvbmFyeSBkaWN0aW9uYXJ5V2l0aE9iamVjdDpt X2hvc3RpbmdMYXllci5nZXQoKSBmb3JLZXk6QCJsYXllciJdXTsKIH0KIAotdm9pZCBUaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2V0Vmlld0V4cG9zZWRSZWN0KE9wdGlvbmFsPFdlYkNv cmU6OkZsb2F0UmVjdD4gdmlld0V4cG9zZWRSZWN0KQordm9pZCBUaWxlZENvcmVBbmltYXRpb25E cmF3aW5nQXJlYTo6c2V0Vmlld0V4cG9zZWRSZWN0KE9wdGlvbmFsPEZsb2F0UmVjdD4gdmlld0V4 cG9zZWRSZWN0KQogewogICAgIG1fdmlld0V4cG9zZWRSZWN0ID0gdmlld0V4cG9zZWRSZWN0Owog ICAgIHVwZGF0ZVNjcm9sbGVkRXhwb3NlZFJlY3QoKTsKIH0KIAorRmxvYXRSZWN0IFRpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpleHBvc2VkQ29udGVudFJlY3QoKSBjb25zdAoreworICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiB7IH07Cit9CisKK3ZvaWQgVGlsZWRD b3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnNldEV4cG9zZWRDb250ZW50UmVjdChjb25zdCBGbG9h dFJlY3QmKQoreworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworfQorCiB2b2lkIFRpbGVkQ29y ZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjp1cGRhdGVTY3JvbGxlZEV4cG9zZWRSZWN0KCkKIHsKICAg ICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IG1fd2ViUGFnZS5tYWluRnJhbWVWaWV3KCk7CkBAIC05 NDEsMTEgKzk1MiwxMSBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpzY2hl ZHVsZUxheWVyRmx1c2hSdW5Mb29wT2JzZXJ2ZXIoKQogICAgIG1fbGF5ZXJGbHVzaFJ1bkxvb3BP YnNlcnZlci0+c2NoZWR1bGUoQ0ZSdW5Mb29wR2V0Q3VycmVudCgpKTsKIH0KIAotYm9vbCBUaWxl ZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6YWRqdXN0TGF5ZXJGbHVzaFRocm90dGxpbmcoV2Vi Q29yZTo6TGF5ZXJGbHVzaFRocm90dGxlU3RhdGU6OkZsYWdzIGZsYWdzKQorYm9vbCBUaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYTo6YWRqdXN0TGF5ZXJGbHVzaFRocm90dGxpbmcoTGF5ZXJG bHVzaFRocm90dGxlU3RhdGU6OkZsYWdzIGZsYWdzKQogewogICAgIGJvb2wgd2FzVGhyb3R0bGlu Z0xheWVyRmx1c2hlcyA9IG1faXNUaHJvdHRsaW5nTGF5ZXJGbHVzaGVzOwotICAgIG1faXNUaHJv dHRsaW5nTGF5ZXJGbHVzaGVzID0gZmxhZ3MgJiBXZWJDb3JlOjpMYXllckZsdXNoVGhyb3R0bGVT dGF0ZTo6RW5hYmxlZDsKLSAgICBtX2lzTGF5ZXJGbHVzaFRocm90dGxpbmdUZW1wb3JhcmlseURp c2FibGVkRm9ySW50ZXJhY3Rpb24gPSBmbGFncyAmIFdlYkNvcmU6OkxheWVyRmx1c2hUaHJvdHRs ZVN0YXRlOjpVc2VySXNJbnRlcmFjdGluZzsKKyAgICBtX2lzVGhyb3R0bGluZ0xheWVyRmx1c2hl cyA9IGZsYWdzICYgTGF5ZXJGbHVzaFRocm90dGxlU3RhdGU6OkVuYWJsZWQ7CisgICAgbV9pc0xh eWVyRmx1c2hUaHJvdHRsaW5nVGVtcG9yYXJpbHlEaXNhYmxlZEZvckludGVyYWN0aW9uID0gZmxh Z3MgJiBMYXllckZsdXNoVGhyb3R0bGVTdGF0ZTo6VXNlcklzSW50ZXJhY3Rpbmc7CiAKICAgICBp ZiAod2FzVGhyb3R0bGluZ0xheWVyRmx1c2hlcyA9PSBtX2lzVGhyb3R0bGluZ0xheWVyRmx1c2hl cykKICAgICAgICAgcmV0dXJuIHRydWU7Cg== 385942 2019-12-17 23:32:56 -0800 2019-12-18 09:01:31 -0800 Patch bug-205377-20191217233255.patch text/plain 15091 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNjcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjJkYTEwNjNkYzcyMTgz MGNiZDJlMTY5NzQyZDA5Y2E3OTM4OTRjYS4uNjAwNTNjYWI0MTZlZTg0N2ExZDRjMWM4NmJlMmEz NTM1MjllZDAxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTEyLTE3ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgbV9leHBv c2VkQ29udGVudFJlY3QgaW50byB0aGUgRGVsZWdhdGVkU2Nyb2xsaW5nR2VvbWV0cnkgb3B0aW9u YWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTM3 NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNjcm9s bFZpZXcncyBtX2V4cG9zZWRDb250ZW50UmVjdCBpcyBvbmx5IHNldCBmb3IgZGVsZWdhdGVkIHNj cm9sbGluZywgc28gbW92ZSBpdCBpbnRvCisgICAgICAgIERlbGVnYXRlZFNjcm9sbGluZ0dlb21l dHJ5IGFuZCByZW1vdmUgdGhlIGlPUyAjaWZkZWZzIGFyb3VuZCBpdC4gTW92ZSB0aGUgV0FLL05T Vmlldy1yZWxhdGVkCisgICAgICAgIGNvZGUgaW50byBwbGF0Zm9ybUV4cG9zZWRDb250ZW50UmVj dCgpIGZvciBpT1MgV0sxLiBTdHViIG91dCBleHBvc2VkQ29udGVudFJlY3QoKSBmdW5jdGlvbnMK KyAgICAgICAgb24gVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuICAgICAgICAKKworICAg ICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs Vmlldzo6ZXhwb3NlZENvbnRlbnRSZWN0IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9s bFZpZXc6OnNldEV4cG9zZWRDb250ZW50UmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxW aWV3OjpwbGF0Zm9ybUV4cG9zZWRDb250ZW50UmVjdCBjb25zdCk6CisgICAgICAgICogcGxhdGZv cm0vU2Nyb2xsVmlldy5oOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9TY3JvbGxWaWV3SU9TLm1t OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6cGxhdGZvcm1FeHBvc2VkQ29udGVudFJl Y3QgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6ZXhwb3NlZENvbnRlbnRS ZWN0IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OnNldEV4 cG9zZWRDb250ZW50UmVjdCk6IERlbGV0ZWQuCisKIDIwMTktMTItMTcgIFNpbW9uIEZyYXNlciAg PHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGlPUyAjaWZkZWZzIGFy b3VuZCB1bm9ic2N1cmVkQ29udGVudFNpemUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMzc4OWIyZTJkM2FmYmFkYWFm YWNlZGRjMjhjYTA1OGVlNDYxZWEwMS4uNTRiZTJjOGJkZjQ1NjA2ZjQwMzEwMWVjZjM0NTk4ODcy OWI1MTk2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxOS0xMi0xNyAgU2ltb24gRnJh c2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIG1fZXhwb3NlZENv bnRlbnRSZWN0IGludG8gdGhlIERlbGVnYXRlZFNjcm9sbGluZ0dlb21ldHJ5IG9wdGlvbmFsCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDUzNzcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFNj cm9sbFZpZXcncyBtX2V4cG9zZWRDb250ZW50UmVjdCBpcyBvbmx5IHNldCBmb3IgZGVsZWdhdGVk IHNjcm9sbGluZywgc28gbW92ZSBpdCBpbnRvCisgICAgICAgIERlbGVnYXRlZFNjcm9sbGluZ0dl b21ldHJ5IGFuZCByZW1vdmUgdGhlIGlPUyAjaWZkZWZzIGFyb3VuZCBpdC4gTW92ZSB0aGUgV0FL L05TVmlldy1yZWxhdGVkCisgICAgICAgIGNvZGUgaW50byBwbGF0Zm9ybUV4cG9zZWRDb250ZW50 UmVjdCgpIGZvciBpT1MgV0sxLiBTdHViIG91dCBleHBvc2VkQ29udGVudFJlY3QoKSBmdW5jdGlv bnMKKyAgICAgICAgb24gVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuICAgICAgICAKKwor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0Fy ZWEuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90 ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRy ZWVEcmF3aW5nQXJlYTo6c2V0RXhwb3NlZENvbnRlbnRSZWN0KToKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLmg6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5t bToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OlRpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhKToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5p bWF0aW9uRHJhd2luZ0FyZWE6OmFjdGl2aXR5U3RhdGVEaWRDaGFuZ2UpOgorICAgICAgICAoV2Vi S2l0OjpUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2V0Vmlld0V4cG9zZWRSZWN0KToK KyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OmV4cG9zZWRD b250ZW50UmVjdCBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRy YXdpbmdBcmVhOjpzZXRFeHBvc2VkQ29udGVudFJlY3QpOgorICAgICAgICAoV2ViS2l0OjpUaWxl ZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6YWRqdXN0TGF5ZXJGbHVzaFRocm90dGxpbmcpOgor CiAyMDE5LTEyLTE3ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAg ICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeCBhZnRlciByMjUzNjYxLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxWaWV3LmNwcAppbmRleCAxNzg1MjNhZGZjMzZkMzU2NTgwNDhjMDhmODkzNjIy MjI3YTAzNjE1Li40ZjIxMzdkZGRhZGQxYTRkNzI3NzVkMDA0MGZlNzJhNzQxNGM2ZDQ2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcApAQCAtMjIwLDYgKzIyMCwzMyBAQCB2 b2lkIFNjcm9sbFZpZXc6OnNldENvbnRlbnRzU2Nyb2xsUG9zaXRpb24oY29uc3QgSW50UG9pbnQm IHBvc2l0aW9uKQogICAgIHNldFNjcm9sbFBvc2l0aW9uKHBvc2l0aW9uKTsKIH0KIAorRmxvYXRS ZWN0IFNjcm9sbFZpZXc6OmV4cG9zZWRDb250ZW50UmVjdCgpIGNvbnN0Cit7CisjaWYgUExBVEZP Uk0oSU9TX0ZBTUlMWSkKKyAgICBpZiAocGxhdGZvcm1XaWRnZXQoKSkKKyAgICAgICAgcmV0dXJu IHBsYXRmb3JtRXhwb3NlZENvbnRlbnRSZWN0KCk7CisjZW5kaWYKKyAgICAKKyAgICBjb25zdCBT Y3JvbGxWaWV3KiBwYXJlbnQgPSB0aGlzLT5wYXJlbnQoKTsKKyAgICBpZiAoIXBhcmVudCkKKyAg ICAgICAgcmV0dXJuIG1fZGVsZWdhdGVkU2Nyb2xsaW5nR2VvbWV0cnkgPyBtX2RlbGVnYXRlZFNj cm9sbGluZ0dlb21ldHJ5LT5leHBvc2VkQ29udGVudFJlY3QgOiBGbG9hdFJlY3QoKTsKKworICAg IEludFJlY3QgcGFyZW50Vmlld0V4dGVudENvbnRlbnRSZWN0ID0gZW5jbG9zaW5nSW50UmVjdChw YXJlbnQtPmV4cG9zZWRDb250ZW50UmVjdCgpKTsKKyAgICBJbnRSZWN0IHNlbGZFeHRlbnRDb250 ZW50UmVjdCA9IHJvb3RWaWV3VG9Db250ZW50cyhwYXJlbnRWaWV3RXh0ZW50Q29udGVudFJlY3Qp OworICAgIHNlbGZFeHRlbnRDb250ZW50UmVjdC5pbnRlcnNlY3QoYm91bmRzUmVjdCgpKTsKKyAg ICByZXR1cm4gc2VsZkV4dGVudENvbnRlbnRSZWN0OworfQorCit2b2lkIFNjcm9sbFZpZXc6OnNl dEV4cG9zZWRDb250ZW50UmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3QpCit7CisgICAgQVNTRVJU KCFwbGF0Zm9ybVdpZGdldCgpKTsKKworICAgIGlmICghbV9kZWxlZ2F0ZWRTY3JvbGxpbmdHZW9t ZXRyeSkKKyAgICAgICAgbV9kZWxlZ2F0ZWRTY3JvbGxpbmdHZW9tZXRyeSA9IERlbGVnYXRlZFNj cm9sbGluZ0dlb21ldHJ5KCk7CisKKyAgICBtX2RlbGVnYXRlZFNjcm9sbGluZ0dlb21ldHJ5LT5l eHBvc2VkQ29udGVudFJlY3QgPSByZWN0OworfQorCiBGbG9hdFNpemUgU2Nyb2xsVmlldzo6dW5v YnNjdXJlZENvbnRlbnRTaXplKCkgY29uc3QKIHsKICAgICBBU1NFUlQobV9kZWxlZ2F0ZWRTY3Jv bGxpbmdHZW9tZXRyeSk7CkBAIC0xNTkwLDYgKzE2MTcsMTEgQEAgSW50UmVjdCBTY3JvbGxWaWV3 OjpwbGF0Zm9ybVVub2JzY3VyZWRDb250ZW50UmVjdChWaXNpYmxlQ29udGVudFJlY3RJbmNsdWRl c1Njcm8KICAgICByZXR1cm4geyB9OwogfQogCitGbG9hdFJlY3QgU2Nyb2xsVmlldzo6cGxhdGZv cm1FeHBvc2VkQ29udGVudFJlY3QoKSBjb25zdAoreworICAgIHJldHVybiB7IH07Cit9CisKIHZv aWQgU2Nyb2xsVmlldzo6cGxhdGZvcm1TZXRDb250ZW50c1NpemUoKQogewogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vU2Nyb2xsVmlldy5oCmluZGV4IDA4NDI4NTlmNzI4M2ZiMWE5MjUwNTFmZWUyMWJj ZTU2N2ZmYmVlOTIuLmU5M2IxMDQ3MWQ2MDJjYmI4Yjk0NWMxZjgyNGQ0OWQ4YTllYjIwMWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKQEAgLTQ3NSw2ICs0NzUsNyBAQCBwcml2 YXRlOgogICAgIEludFNpemUgcGxhdGZvcm1WaXNpYmxlQ29udGVudFNpemVJbmNsdWRpbmdPYnNj dXJlZEFyZWEoYm9vbCBpbmNsdWRlU2Nyb2xsYmFycykgY29uc3Q7CiAKICAgICBJbnRSZWN0IHBs YXRmb3JtVW5vYnNjdXJlZENvbnRlbnRSZWN0KFZpc2libGVDb250ZW50UmVjdEluY2x1ZGVzU2Ny b2xsYmFycykgY29uc3Q7CisgICAgRmxvYXRSZWN0IHBsYXRmb3JtRXhwb3NlZENvbnRlbnRSZWN0 KCkgY29uc3Q7CiAKICAgICB2b2lkIHBsYXRmb3JtU2V0Q29udGVudHNTaXplKCk7CiAKQEAgLTQ5 OSwxMSArNTAwLDExIEBAIHByaXZhdGU6CiAgICAgU2Nyb2xsYmFyTW9kZSBtX2hvcml6b250YWxT Y3JvbGxiYXJNb2RlIHsgU2Nyb2xsYmFyQXV0byB9OwogICAgIFNjcm9sbGJhck1vZGUgbV92ZXJ0 aWNhbFNjcm9sbGJhck1vZGUgeyBTY3JvbGxiYXJBdXRvIH07CiAKLSAgICBGbG9hdFJlY3QgbV9l eHBvc2VkQ29udGVudFJlY3Q7CiAKICAgICAvLyBGSVhNRTogTW9yZSB0aGluZ3Mgd2lsbCBtb3Zl IGludG8gaGVyZS4KICAgICBzdHJ1Y3QgRGVsZWdhdGVkU2Nyb2xsaW5nR2VvbWV0cnkgewogICAg ICAgICBGbG9hdFNpemUgdW5vYnNjdXJlZENvbnRlbnRTaXplOworICAgICAgICBGbG9hdFJlY3Qg ZXhwb3NlZENvbnRlbnRSZWN0OwogICAgIH07CiAgICAgT3B0aW9uYWw8RGVsZWdhdGVkU2Nyb2xs aW5nR2VvbWV0cnk+IG1fZGVsZWdhdGVkU2Nyb2xsaW5nR2VvbWV0cnk7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9TY3JvbGxWaWV3SU9TLm1tIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vaW9zL1Njcm9sbFZpZXdJT1MubW0KaW5kZXggYzgxZGE2NGUxN2IxODA1 ZDE5Y2ZiYWJlYTMwM2M1MTQ5YjJiNjdjMS4uMjY3Zjk3OGQyN2JhMzNhYTUwMjQyMTkyZGM1ZGNi NTA5ZGU2YzIzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Njcm9s bFZpZXdJT1MubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Njcm9sbFZpZXdJ T1MubW0KQEAgLTExMywzNiArMTEzLDIxIEBAIEludFJlY3QgU2Nyb2xsVmlldzo6cGxhdGZvcm1V bm9ic2N1cmVkQ29udGVudFJlY3QoVmlzaWJsZUNvbnRlbnRSZWN0SW5jbHVkZXNTY3JvCiAgICAg cmV0dXJuIGVuY2xvc2luZ0ludFJlY3Qocik7CiB9CiAKLUZsb2F0UmVjdCBTY3JvbGxWaWV3Ojpl eHBvc2VkQ29udGVudFJlY3QoKSBjb25zdAorRmxvYXRSZWN0IFNjcm9sbFZpZXc6OnBsYXRmb3Jt RXhwb3NlZENvbnRlbnRSZWN0KCkgY29uc3QKIHsKLSAgICBpZiAoTlNTY3JvbGxWaWV3ICp2aWV3 ID0gc3RhdGljX2Nhc3Q8TlNTY3JvbGxWaWV3ICo+KHBsYXRmb3JtV2lkZ2V0KCkpKSB7Ci0gICAg ICAgIENHUmVjdCByID0gQ0dSZWN0WmVybzsKLSAgICAgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENF UFRJT05TOwotICAgICAgICBpZiAoW3ZpZXcgaXNLaW5kT2ZDbGFzczpbTlNTY3JvbGxWaWV3IGNs YXNzXV0pCi0gICAgICAgICAgICByID0gW3ZpZXcgZXhwb3NlZENvbnRlbnRSZWN0XTsKLSAgICAg ICAgZWxzZSB7Ci0gICAgICAgICAgICByLm9yaWdpbiA9IFt2aWV3IHZpc2libGVSZWN0XS5vcmln aW47Ci0gICAgICAgICAgICByLnNpemUgPSBbdmlldyBib3VuZHNdLnNpemU7Ci0gICAgICAgIH0K LQotICAgICAgICBFTkRfQkxPQ0tfT0JKQ19FWENFUFRJT05TOwotICAgICAgICByZXR1cm4gcjsK KyAgICBBU1NFUlQocGxhdGZvcm1XaWRnZXQoKSk7CisgICAgTlNTY3JvbGxWaWV3ICp2aWV3ID0g c3RhdGljX2Nhc3Q8TlNTY3JvbGxWaWV3ICo+KHBsYXRmb3JtV2lkZ2V0KCkpOworICAgIENHUmVj dCByID0gQ0dSZWN0WmVybzsKKyAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CisgICAg aWYgKFt2aWV3IGlzS2luZE9mQ2xhc3M6W05TU2Nyb2xsVmlldyBjbGFzc11dKQorICAgICAgICBy ID0gW3ZpZXcgZXhwb3NlZENvbnRlbnRSZWN0XTsKKyAgICBlbHNlIHsKKyAgICAgICAgci5vcmln aW4gPSBbdmlldyB2aXNpYmxlUmVjdF0ub3JpZ2luOworICAgICAgICByLnNpemUgPSBbdmlldyBi b3VuZHNdLnNpemU7CiAgICAgfQogCi0gICAgY29uc3QgU2Nyb2xsVmlldyogcGFyZW50ID0gdGhp cy0+cGFyZW50KCk7Ci0gICAgaWYgKCFwYXJlbnQpCi0gICAgICAgIHJldHVybiBtX2V4cG9zZWRD b250ZW50UmVjdDsKLQotICAgIEludFJlY3QgcGFyZW50Vmlld0V4dGVudENvbnRlbnRSZWN0ID0g ZW5jbG9zaW5nSW50UmVjdChwYXJlbnQtPmV4cG9zZWRDb250ZW50UmVjdCgpKTsKLSAgICBJbnRS ZWN0IHNlbGZFeHRlbnRDb250ZW50UmVjdCA9IHJvb3RWaWV3VG9Db250ZW50cyhwYXJlbnRWaWV3 RXh0ZW50Q29udGVudFJlY3QpOwotICAgIHNlbGZFeHRlbnRDb250ZW50UmVjdC5pbnRlcnNlY3Qo Ym91bmRzUmVjdCgpKTsKLSAgICByZXR1cm4gc2VsZkV4dGVudENvbnRlbnRSZWN0OwotfQotCi12 b2lkIFNjcm9sbFZpZXc6OnNldEV4cG9zZWRDb250ZW50UmVjdChjb25zdCBGbG9hdFJlY3QmIHJl Y3QpCi17Ci0gICAgQVNTRVJUKCFwbGF0Zm9ybVdpZGdldCgpKTsKLSAgICBtX2V4cG9zZWRDb250 ZW50UmVjdCA9IHJlY3Q7CisgICAgRU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKKyAgICByZXR1 cm4gcjsKIH0KIAogdm9pZCBTY3JvbGxWaWV3OjpzZXRBY3R1YWxTY3JvbGxQb3NpdGlvbihjb25z dCBJbnRQb2ludCYgcG9zaXRpb24pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvRHJhd2luZ0FyZWEuaAppbmRleCAxNmQwOWJmZWYwZDQyN2NkZGIyMmQ1YmIwM2VlNmFjYTU1 NDNlNmQ3Li5iYWIxZDRiZmJlZTllNDUxNGYzZjdiYzRiY2E1YTU5NWU1OTg2ZjE1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYS5oCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0RyYXdpbmdBcmVhLmgKQEAgLTk4LDEx ICs5OCwxMSBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGFjY2VsZXJhdGVkQW5pbWF0aW9u RGlkU3RhcnQodWludDY0X3QgLypsYXllcklEKi8sIGNvbnN0IFN0cmluZyYgLyprZXkqLywgTW9u b3RvbmljVGltZSAvKnN0YXJ0VGltZSovKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgYWNjZWxlcmF0 ZWRBbmltYXRpb25EaWRFbmQodWludDY0X3QgLypsYXllcklEKi8sIGNvbnN0IFN0cmluZyYgLypr ZXkqLykgeyB9CiAgICAgdmlydHVhbCB2b2lkIGFkZEZlbmNlKGNvbnN0IFdURjo6TWFjaFNlbmRS aWdodCYpIHsgfQotI2VuZGlmCi0jaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKKwogICAgIHZpcnR1 YWwgV2ViQ29yZTo6RmxvYXRSZWN0IGV4cG9zZWRDb250ZW50UmVjdCgpIGNvbnN0ID0gMDsKICAg ICB2aXJ0dWFsIHZvaWQgc2V0RXhwb3NlZENvbnRlbnRSZWN0KGNvbnN0IFdlYkNvcmU6OkZsb2F0 UmVjdCYpID0gMDsKICNlbmRpZgorCiAgICAgdmlydHVhbCB2b2lkIG1haW5GcmFtZVNjcm9sbGFi aWxpdHlDaGFuZ2VkKGJvb2wpIHsgfQogCiAgICAgdmlydHVhbCBib29sIHN1cHBvcnRzQXN5bmNT Y3JvbGxpbmcoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURy YXdpbmdBcmVhLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXll clRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEuaAppbmRleCBjY2Q5NjNmZWNjYjFkMGYw NjY4YTVhZDZiM2FmY2RhMDIwNmYxNjU3Li5mMTExNjgzZmJhNzI3OGY4NzI0YmFkZThlODI5ZTJl ZGZmYjY1ZGRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9S ZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEuaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVl RHJhd2luZ0FyZWEuaApAQCAtOTUsMTAgKzk1LDggQEAgcHJpdmF0ZToKICAgICB2b2lkIGFjY2Vs ZXJhdGVkQW5pbWF0aW9uRGlkU3RhcnQodWludDY0X3QgbGF5ZXJJRCwgY29uc3QgU3RyaW5nJiBr ZXksIE1vbm90b25pY1RpbWUgc3RhcnRUaW1lKSBvdmVycmlkZTsKICAgICB2b2lkIGFjY2VsZXJh dGVkQW5pbWF0aW9uRGlkRW5kKHVpbnQ2NF90IGxheWVySUQsIGNvbnN0IFN0cmluZyYga2V5KSBv dmVycmlkZTsKIAotI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgV2ViQ29yZTo6RmxvYXRS ZWN0IGV4cG9zZWRDb250ZW50UmVjdCgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZvaWQgc2V0RXhw b3NlZENvbnRlbnRSZWN0KGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYpIG92ZXJyaWRlOwotI2Vu ZGlmCiAKICAgICB2b2lkIGRpZFVwZGF0ZSgpIG92ZXJyaWRlOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJU cmVlRHJhd2luZ0FyZWEubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1v dGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlRHJhd2luZ0FyZWEubW0KaW5kZXggYzgwYWY1ZDU0 OWY1MjI2N2E2ZGZiNTQ5ZDFjOTUzMjM1NDAxNTEwNy4uMjZhMDMwM2Q1MjkwMDQ4NDEyZmM0OTRh MTQzNjk0OTVlZDJlM2I2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZURyYXdpbmdBcmVhLm1tCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVM YXllclRyZWVEcmF3aW5nQXJlYS5tbQpAQCAtMjI4LDcgKzIyOCw2IEBAIHZvaWQgUmVtb3RlTGF5 ZXJUcmVlRHJhd2luZ0FyZWE6OnNldFZpZXdFeHBvc2VkUmVjdChPcHRpb25hbDxXZWJDb3JlOjpG bG9hdFJlY3Q+CiAgICAgdXBkYXRlU2Nyb2xsZWRFeHBvc2VkUmVjdCgpOwogfQogCi0jaWYgUExB VEZPUk0oSU9TX0ZBTUlMWSkKIFdlYkNvcmU6OkZsb2F0UmVjdCBSZW1vdGVMYXllclRyZWVEcmF3 aW5nQXJlYTo6ZXhwb3NlZENvbnRlbnRSZWN0KCkgY29uc3QKIHsKICAgICBGcmFtZVZpZXcqIGZy YW1lVmlldyA9IG1fd2ViUGFnZS5tYWluRnJhbWVWaWV3KCk7CkBAIC0yNDksNyArMjQ4LDYgQEAg dm9pZCBSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYTo6c2V0RXhwb3NlZENvbnRlbnRSZWN0KGNv bnN0IEZsb2F0UmVjdCYgZXhwb3NlZEMKICAgICBmcmFtZVZpZXctPnNldEV4cG9zZWRDb250ZW50 UmVjdChleHBvc2VkQ29udGVudFJlY3QpOwogICAgIHNjaGVkdWxlQ29tcG9zaXRpbmdMYXllckZs dXNoKCk7CiB9Ci0jZW5kaWYKIAogdm9pZCBSZW1vdGVMYXllclRyZWVEcmF3aW5nQXJlYTo6dXBk YXRlU2Nyb2xsZWRFeHBvc2VkUmVjdCgpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEuaCBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYS5oCmluZGV4IGQ4NWRjNDE3MWNhNGFmNjIwMGFmMTFmZWYwY2UwNzRiZGZlZjU0MDgu LmE3NmYxZWJjMWM4ZjA0YWI5NjNlYTNmMGQ2MTI4ODFiNjg3ZTQ1MGIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3 aW5nQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9UaWxl ZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5oCkBAIC03NSw2ICs3NSw5IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBzZXRWaWV3RXhwb3NlZFJlY3QoT3B0aW9uYWw8V2ViQ29yZTo6RmxvYXRSZWN0Pikg b3ZlcnJpZGU7CiAgICAgT3B0aW9uYWw8V2ViQ29yZTo6RmxvYXRSZWN0PiB2aWV3RXhwb3NlZFJl Y3QoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBtX3Njcm9sbGVkVmlld0V4cG9zZWRSZWN0OyB9 CiAKKyAgICBXZWJDb3JlOjpGbG9hdFJlY3QgZXhwb3NlZENvbnRlbnRSZWN0KCkgY29uc3Qgb3Zl cnJpZGU7CisgICAgdm9pZCBzZXRFeHBvc2VkQ29udGVudFJlY3QoY29uc3QgV2ViQ29yZTo6Rmxv YXRSZWN0Jikgb3ZlcnJpZGU7CisKICAgICBib29sIHN1cHBvcnRzQXN5bmNTY3JvbGxpbmcoKSBj b25zdCBvdmVycmlkZSB7IHJldHVybiB0cnVlOyB9CiAKICAgICB2b2lkIGRpc3BhdGNoQWZ0ZXJF bnN1cmluZ1VwZGF0ZWRTY3JvbGxQb3NpdGlvbihXVEY6OkZ1bmN0aW9uPHZvaWQgKCk+JiYpIG92 ZXJyaWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFj L1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhLm1tCmluZGV4IDk5 NzJmZTE1Yzc3MWM4NDU3OGU5OGRjNGY5MmE5ZjM5ZmZmOGMxNGYuLjE0NjlhNGJjNTg0OGY4ZDY4 ZDJiYzNmNGYyYjJlNGQwYWQwYThmNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJh d2luZ0FyZWEubW0KQEAgLTg3LDcgKzg3LDcgQEAgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0Fy ZWE6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhKFdlYlBhZ2UmIHdlYlBhZ2UsIGMKICAg ICBbbV9ob3N0aW5nTGF5ZXIgc2V0T3BhcXVlOllFU107CiAgICAgW21faG9zdGluZ0xheWVyIHNl dEdlb21ldHJ5RmxpcHBlZDpZRVNdOwogCi0gICAgbV9sYXllckZsdXNoUnVuTG9vcE9ic2VydmVy ID0gbWFrZVVuaXF1ZTxXZWJDb3JlOjpSdW5Mb29wT2JzZXJ2ZXI+KHN0YXRpY19jYXN0PENGSW5k ZXg+KFJ1bkxvb3BPYnNlcnZlcjo6V2VsbEtub3duUnVuTG9vcE9yZGVyczo6TGF5ZXJGbHVzaCks IFt0aGlzXSgpIHsKKyAgICBtX2xheWVyRmx1c2hSdW5Mb29wT2JzZXJ2ZXIgPSBtYWtlVW5pcXVl PFJ1bkxvb3BPYnNlcnZlcj4oc3RhdGljX2Nhc3Q8Q0ZJbmRleD4oUnVuTG9vcE9ic2VydmVyOjpX ZWxsS25vd25SdW5Mb29wT3JkZXJzOjpMYXllckZsdXNoKSwgW3RoaXNdKCkgewogICAgICAgICB0 aGlzLT5sYXllckZsdXNoUnVuTG9vcENhbGxiYWNrKCk7CiAgICAgfSk7CiAKQEAgLTUxNCw3ICs1 MTQsNyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpmbHVzaExheWVycyhG bHVzaFR5cGUgZmx1c2hUeXBlKQogICAgIH0KIH0KIAotdm9pZCBUaWxlZENvcmVBbmltYXRpb25E cmF3aW5nQXJlYTo6YWN0aXZpdHlTdGF0ZURpZENoYW5nZShPcHRpb25TZXQ8V2ViQ29yZTo6QWN0 aXZpdHlTdGF0ZTo6RmxhZz4gY2hhbmdlZCwgQWN0aXZpdHlTdGF0ZUNoYW5nZUlEIGFjdGl2aXR5 U3RhdGVDaGFuZ2VJRCwgY29uc3QgVmVjdG9yPENhbGxiYWNrSUQ+JiBuZXh0QWN0aXZpdHlTdGF0 ZUNoYW5nZUNhbGxiYWNrSURzKQordm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6 YWN0aXZpdHlTdGF0ZURpZENoYW5nZShPcHRpb25TZXQ8QWN0aXZpdHlTdGF0ZTo6RmxhZz4gY2hh bmdlZCwgQWN0aXZpdHlTdGF0ZUNoYW5nZUlEIGFjdGl2aXR5U3RhdGVDaGFuZ2VJRCwgY29uc3Qg VmVjdG9yPENhbGxiYWNrSUQ+JiBuZXh0QWN0aXZpdHlTdGF0ZUNoYW5nZUNhbGxiYWNrSURzKQog ewogICAgIG1fbmV4dEFjdGl2aXR5U3RhdGVDaGFuZ2VDYWxsYmFja0lEcy5hcHBlbmRWZWN0b3Io bmV4dEFjdGl2aXR5U3RhdGVDaGFuZ2VDYWxsYmFja0lEcyk7CiAgICAgbV9hY3Rpdml0eVN0YXRl Q2hhbmdlSUQgPSBzdGQ6Om1heChtX2FjdGl2aXR5U3RhdGVDaGFuZ2VJRCwgYWN0aXZpdHlTdGF0 ZUNoYW5nZUlEKTsKQEAgLTU2NiwxMiArNTY2LDIzIEBAIHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9u RHJhd2luZ0FyZWE6OnJlc3VtZVBhaW50aW5nKCkKICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVy IGRlZmF1bHRDZW50ZXJdIHBvc3ROb3RpZmljYXRpb25OYW1lOkAiTlNDQVZpZXdSZW5kZXJEaWRS ZXN1bWVOb3RpZmljYXRpb24iIG9iamVjdDpuaWwgdXNlckluZm86W05TRGljdGlvbmFyeSBkaWN0 aW9uYXJ5V2l0aE9iamVjdDptX2hvc3RpbmdMYXllci5nZXQoKSBmb3JLZXk6QCJsYXllciJdXTsK IH0KIAotdm9pZCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2V0Vmlld0V4cG9zZWRS ZWN0KE9wdGlvbmFsPFdlYkNvcmU6OkZsb2F0UmVjdD4gdmlld0V4cG9zZWRSZWN0KQordm9pZCBU aWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6c2V0Vmlld0V4cG9zZWRSZWN0KE9wdGlvbmFs PEZsb2F0UmVjdD4gdmlld0V4cG9zZWRSZWN0KQogewogICAgIG1fdmlld0V4cG9zZWRSZWN0ID0g dmlld0V4cG9zZWRSZWN0OwogICAgIHVwZGF0ZVNjcm9sbGVkRXhwb3NlZFJlY3QoKTsKIH0KIAor RmxvYXRSZWN0IFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjpleHBvc2VkQ29udGVudFJl Y3QoKSBjb25zdAoreworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiB7IH07 Cit9CisKK3ZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnNldEV4cG9zZWRDb250 ZW50UmVjdChjb25zdCBGbG9hdFJlY3QmKQoreworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwor fQorCiB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhOjp1cGRhdGVTY3JvbGxlZEV4 cG9zZWRSZWN0KCkKIHsKICAgICBGcmFtZVZpZXcqIGZyYW1lVmlldyA9IG1fd2ViUGFnZS5tYWlu RnJhbWVWaWV3KCk7CkBAIC05NDEsMTEgKzk1MiwxMSBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhOjpzY2hlZHVsZUxheWVyRmx1c2hSdW5Mb29wT2JzZXJ2ZXIoKQogICAgIG1f bGF5ZXJGbHVzaFJ1bkxvb3BPYnNlcnZlci0+c2NoZWR1bGUoQ0ZSdW5Mb29wR2V0Q3VycmVudCgp KTsKIH0KIAotYm9vbCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6YWRqdXN0TGF5ZXJG bHVzaFRocm90dGxpbmcoV2ViQ29yZTo6TGF5ZXJGbHVzaFRocm90dGxlU3RhdGU6OkZsYWdzIGZs YWdzKQorYm9vbCBUaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYTo6YWRqdXN0TGF5ZXJGbHVz aFRocm90dGxpbmcoTGF5ZXJGbHVzaFRocm90dGxlU3RhdGU6OkZsYWdzIGZsYWdzKQogewogICAg IGJvb2wgd2FzVGhyb3R0bGluZ0xheWVyRmx1c2hlcyA9IG1faXNUaHJvdHRsaW5nTGF5ZXJGbHVz aGVzOwotICAgIG1faXNUaHJvdHRsaW5nTGF5ZXJGbHVzaGVzID0gZmxhZ3MgJiBXZWJDb3JlOjpM YXllckZsdXNoVGhyb3R0bGVTdGF0ZTo6RW5hYmxlZDsKLSAgICBtX2lzTGF5ZXJGbHVzaFRocm90 dGxpbmdUZW1wb3JhcmlseURpc2FibGVkRm9ySW50ZXJhY3Rpb24gPSBmbGFncyAmIFdlYkNvcmU6 OkxheWVyRmx1c2hUaHJvdHRsZVN0YXRlOjpVc2VySXNJbnRlcmFjdGluZzsKKyAgICBtX2lzVGhy b3R0bGluZ0xheWVyRmx1c2hlcyA9IGZsYWdzICYgTGF5ZXJGbHVzaFRocm90dGxlU3RhdGU6OkVu YWJsZWQ7CisgICAgbV9pc0xheWVyRmx1c2hUaHJvdHRsaW5nVGVtcG9yYXJpbHlEaXNhYmxlZEZv ckludGVyYWN0aW9uID0gZmxhZ3MgJiBMYXllckZsdXNoVGhyb3R0bGVTdGF0ZTo6VXNlcklzSW50 ZXJhY3Rpbmc7CiAKICAgICBpZiAod2FzVGhyb3R0bGluZ0xheWVyRmx1c2hlcyA9PSBtX2lzVGhy b3R0bGluZ0xheWVyRmx1c2hlcykKICAgICAgICAgcmV0dXJuIHRydWU7Cg==