226338 2021-05-27 09:44:19 -0700 Prevent resetting scroll position in unnecessary cases during page load 2021-05-28 13:18:10 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 matthew_gilligan webkit-unassigned matthew_gilligan simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1764362 0 matthew_gilligan 2021-05-27 09:44:19 -0700 Prevent resetting scroll position in unnecessary cases during page load 1764364 1 matthew_gilligan 2021-05-27 09:45:52 -0700 <rdar://75334651> 1764391 2 429896 matthew_gilligan 2021-05-27 10:24:50 -0700 Created attachment 429896 Patch 1764795 3 429896 wenson_hsieh 2021-05-28 09:33:22 -0700 Comment on attachment 429896 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=429896&action=review > Tools/TestWebKitAPI/Tests/ios/ScrollViewInsetTests.mm:265 > + [webView scrollView].refreshControl = [[UIRefreshControl alloc] init]; Nit - might be good to fix this leak, either by autoreleasing, or with adoptNS([[UIRefreshControl alloc] init]).get() 1764819 4 430026 matthew_gilligan 2021-05-28 10:23:15 -0700 Created attachment 430026 Patch 1764882 5 430041 matthew_gilligan 2021-05-28 12:30:50 -0700 Created attachment 430041 Patch 1764904 6 ews-feeder 2021-05-28 13:18:08 -0700 Committed r278225 (238263@main): <https://commits.webkit.org/238263@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430041. 429896 2021-05-27 10:24:50 -0700 2021-05-28 10:23:13 -0700 Patch bug-226338-20210527102449.patch text/plain 8242 matthew_gilligan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3OTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDcwMzhhYTk1ZTU3NDUxNWMz NDA0MmY2NDE5ODMyNTA1YzZjMjI2NmUuLmE3ZDIzMWU4OTVlZjQwMjZmNTRhNmEzMDE1NWY0MjQy NDQzZjdiM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMjEtMDUtMjcgIE1hdHQgR2ls bGlnYW4gIDxtYXR0aGV3X2dpbGxpZ2FuQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IHJl c2V0dGluZyBzY3JvbGwgcG9zaXRpb24gaW4gdW5uZWNlc3NhcnkgY2FzZXMgZHVyaW5nIHBhZ2Ug bG9hZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2 MzM4CisgICAgICAgIHJkYXI6Ly83NTMzNDY1MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gV0tXZWJWaWV3J3Mgc2Nyb2xsIHZpZXcgaGFzIGEg cmVmcmVzaCBjb250cm9sIGFuZCBpcyBydWJiZXIgYmFuZGluZyBhbG9uZyB0aGUgdG9wCisgICAg ICAgIGVkZ2UsIGRvbid0IGNhbmNlbCBzY3JvbGxpbmcgYW5pbWF0aW9ucyBvciByZXNldCBjb250 ZW50T2Zmc2V0IHdpdGhpbiB2YWxpZCByYW5nZSBkdWUgdG8KKyAgICAgICAgdGhlIHBhZ2UgbG9h ZC4gVGhpcyBjYW4gY2F1c2UgZmxpY2tlcmluZyBkdXJpbmcgZHJhZ2dpbmcgYW5kIGNhbiBwcmV2 ZW50IHRoZSBib3VuY2UKKyAgICAgICAgYW5pbWF0aW9uIGZyb20gZmluaXNoaW5nLgorCisgICAg ICAgIFRlc3Q6IFNjcm9sbFZpZXdJbnNldFRlc3RzLlByZXNlcnZlQ29udGVudE9mZnNldEZvclJl ZnJlc2hDb250cm9sCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1Mu bW06CisgICAgICAgICgtW1dLV2ViVmlldyBfZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZV0pOgor ICAgICAgICBBdm9pZCBjYWxsaW5nIC1fc3RvcFNjcm9sbGluZ0FuZFpvb21pbmdBbmltYXRpb25z IHdoZW4gcnViYmVyIGJhbmRpbmcgZm9yIGEgcmVmcmVzaCBjb250cm9sCisgICAgICAgIHRvIHBy ZXZlbnQgY2FuY2VsbGluZyBhIGJvdW5jZSBhbmltYXRpb24uCisKKyAgICAgICAgKC1bV0tXZWJW aWV3IF9yZXN0b3JlU2Nyb2xsQW5kWm9vbVN0YXRlRm9yVHJhbnNhY3Rpb246XSk6CisgICAgICAg ICgtW1dLV2ViVmlldyBfZGlkQ29tbWl0TGF5ZXJUcmVlOl0pOgorICAgICAgICBEb24ndCBhZGp1 c3QgY29udGVudCBvZmZzZXQgdG8gYmUgd2l0aGluIHZhbGlkIHJhbmdlIHdoZW4gcnViYmVyIGJh bmRpbmcgZm9yIGEgcmVmcmVzaAorICAgICAgICBjb250cm9sLCBvciB0aGUgc2Nyb2xsIHBvc2l0 aW9uIHdpbGwgYmUgcmVzZXQgd2hpbGUgZHJhZ2dpbmcgb3IgYm91bmNpbmcuCisKKyAgICAgICAg KC1bV0tXZWJWaWV3IF9zY3JvbGxWaWV3SXNSdWJiZXJCYW5kaW5nRm9yUmVmcmVzaENvbnRyb2xd KToKKyAgICAgICAgUmV0dXJuIHdoZXRoZXIgX3Njcm9sbFZpZXcgaGFzIGEgcmVmcmVzaCBjb250 cm9sIGFuZCBpcyBydWJiZXIgYmFuZGluZyBhbG9uZyB0aGUgdG9wIGVkZ2UuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvaW9zL1dLU2Nyb2xsVmlldy5tbToKKyAgICAgICAgKC1bV0tTY3JvbGxWaWV3 IF9zZXRDb250ZW50U2l6ZVByZXNlcnZpbmdDb250ZW50T2Zmc2V0RHVyaW5nUnViYmVyYmFuZDpd KToKKyAgICAgICAgV2hlbiB0aGUgcmVmcmVzaCBjb250cm9sIGlzIGRpc21pc3NpbmcsIHRoZSBz Y3JvbGwgdmlldyB3aWxsIGJlIHJ1YmJlciBiYW5kaW5nIGJ1dCBub3QKKyAgICAgICAgZHJhZ2dp bmcgb3IgYm91bmNpbmcuIFRyZWF0IGEgbm9uLW5pbCByZWZyZXNoQ29udHJvbCBhcyBhIGhpbnQg dGhhdCB0aGUgc2Nyb2xsIHZpZXcgbWlnaHQKKyAgICAgICAgYmUgcnViYmVyIGJhbmRpbmcuCisK IDIwMjEtMDUtMjMgIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgIENv bnZlcnQgRGVzdGluYXRpb25Db2xvclNwYWNlIGZyb20gYW4gZW51bSB0byBjbGFzcyB3cmFwcGlu ZyBhIHBsYXRmb3JtIGNvbG9yIHNwYWNlIChDR0NvbG9yU3BhY2VSZWYgZm9yIENHIHBvcnRzLCBl dGMuKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZp ZXdJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5t bQppbmRleCA4Y2MzMzk3NmMzMzQ2NTMzN2Q1NjAwMDIwNWMzZjUzZTE2Mjg2MTQ5Li44MGM1YTFk YjgwOThkMjhkZDNjZWJhMjgzMzAzMTI4YzBhZWRjNjAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQpAQCAtNzE4LDcgKzcxOCw4IEBAIHN0 YXRpYyBXZWJDb3JlOjpDb2xvciBzY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yKFdLV2ViVmlldyAq d2ViVmlldykKICAgICBfaGFzQ29tbWl0dGVkTG9hZEZvck1haW5GcmFtZSA9IFlFUzsKICAgICBf bmVlZHNSZXNldFZpZXdTdGF0ZUFmdGVyQ29tbWl0TG9hZEZvck1haW5GcmFtZSA9IFlFUzsKIAot ICAgIFtfc2Nyb2xsVmlldyBfc3RvcFNjcm9sbGluZ0FuZFpvb21pbmdBbmltYXRpb25zXTsKKyAg ICBpZiAoIVtzZWxmIF9zY3JvbGxWaWV3SXNSdWJiZXJCYW5kaW5nRm9yUmVmcmVzaENvbnRyb2xd KQorICAgICAgICBbX3Njcm9sbFZpZXcgX3N0b3BTY3JvbGxpbmdBbmRab29taW5nQW5pbWF0aW9u c107CiB9CiAKIHN0YXRpYyBDR1BvaW50IGNvbnRlbnRPZmZzZXRCb3VuZGVkSW5WYWxpZFJhbmdl KFVJU2Nyb2xsVmlldyAqc2Nyb2xsVmlldywgQ0dQb2ludCBjb250ZW50T2Zmc2V0KQpAQCAtODM1 LDcgKzgzNiw3IEBAIHN0YXRpYyB2b2lkIGNoYW5nZUNvbnRlbnRPZmZzZXRCb3VuZGVkSW5WYWxp ZFJhbmdlKFVJU2Nyb2xsVmlldyAqc2Nyb2xsVmlldywgV2ViCiAKICAgICBCT09MIG5lZWRVcGRh dGVWaXNpYmxlQ29udGVudFJlY3RzID0gTk87CiAKLSAgICBpZiAoX3Njcm9sbE9mZnNldFRvUmVz dG9yZSkgeworICAgIGlmIChfc2Nyb2xsT2Zmc2V0VG9SZXN0b3JlICYmICFbc2VsZiBfc2Nyb2xs Vmlld0lzUnViYmVyQmFuZGluZ0ZvclJlZnJlc2hDb250cm9sXSkgewogICAgICAgICBXZWJDb3Jl OjpGbG9hdFBvaW50IHNjYWxlZFNjcm9sbE9mZnNldCA9IF9zY3JvbGxPZmZzZXRUb1Jlc3RvcmUu dmFsdWUoKTsKICAgICAgICAgX3Njcm9sbE9mZnNldFRvUmVzdG9yZSA9IFdURjo6bnVsbG9wdDsK IApAQCAtODUwLDcgKzg1MSw3IEBAIHN0YXRpYyB2b2lkIGNoYW5nZUNvbnRlbnRPZmZzZXRCb3Vu ZGVkSW5WYWxpZFJhbmdlKFVJU2Nyb2xsVmlldyAqc2Nyb2xsVmlldywgV2ViCiAgICAgICAgIG5l ZWRVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzID0gWUVTOwogICAgIH0KIAotICAgIGlmIChfdW5v YnNjdXJlZENlbnRlclRvUmVzdG9yZSkgeworICAgIGlmIChfdW5vYnNjdXJlZENlbnRlclRvUmVz dG9yZSAmJiAhW3NlbGYgX3Njcm9sbFZpZXdJc1J1YmJlckJhbmRpbmdGb3JSZWZyZXNoQ29udHJv bF0pIHsKICAgICAgICAgV2ViQ29yZTo6RmxvYXRQb2ludCB1bm9ic2N1cmVkQ2VudGVyVG9SZXN0 b3JlID0gX3Vub2JzY3VyZWRDZW50ZXJUb1Jlc3RvcmUudmFsdWUoKTsKICAgICAgICAgX3Vub2Jz Y3VyZWRDZW50ZXJUb1Jlc3RvcmUgPSBXVEY6Om51bGxvcHQ7CiAKQEAgLTkyMSw3ICs5MjIsOSBA QCBzdGF0aWMgdm9pZCBjaGFuZ2VDb250ZW50T2Zmc2V0Qm91bmRlZEluVmFsaWRSYW5nZShVSVNj cm9sbFZpZXcgKnNjcm9sbFZpZXcsIFdlYgogCiAgICAgaWYgKF9uZWVkc1Jlc2V0Vmlld1N0YXRl QWZ0ZXJDb21taXRMb2FkRm9yTWFpbkZyYW1lICYmIGxheWVyVHJlZVRyYW5zYWN0aW9uLnRyYW5z YWN0aW9uSUQoKSA+PSBfZmlyc3RQYWludEFmdGVyQ29tbWl0TG9hZFRyYW5zYWN0aW9uSUQpIHsK ICAgICAgICAgX25lZWRzUmVzZXRWaWV3U3RhdGVBZnRlckNvbW1pdExvYWRGb3JNYWluRnJhbWUg PSBOTzsKLSAgICAgICAgW19zY3JvbGxWaWV3IHNldENvbnRlbnRPZmZzZXQ6W3NlbGYgX2luaXRp YWxDb250ZW50T2Zmc2V0Rm9yU2Nyb2xsVmlld11dOworICAgICAgICBpZiAoIVtzZWxmIF9zY3Jv bGxWaWV3SXNSdWJiZXJCYW5kaW5nRm9yUmVmcmVzaENvbnRyb2xdKQorICAgICAgICAgICAgW19z Y3JvbGxWaWV3IHNldENvbnRlbnRPZmZzZXQ6W3NlbGYgX2luaXRpYWxDb250ZW50T2Zmc2V0Rm9y U2Nyb2xsVmlld11dOworCiAgICAgICAgIGlmIChfb2JzZXJ2ZWRSZW5kZXJpbmdQcm9ncmVzc0V2 ZW50cyAmIF9XS1JlbmRlcmluZ1Byb2dyZXNzRXZlbnRGaXJzdFBhaW50KQogICAgICAgICAgICAg X25hdmlnYXRpb25TdGF0ZS0+ZGlkRmlyc3RQYWludCgpOwogCkBAIC0xODk2LDYgKzE4OTksMTYg QEAgc3RhdGljIFdlYkNvcmU6OkZsb2F0UG9pbnQgY29uc3RyYWluQ29udGVudE9mZnNldChXZWJD b3JlOjpGbG9hdFBvaW50IGNvbnRlbnRPZmYKICAgICByZXR1cm4gIXBvaW50c0VxdWFsSW5EZXZp Y2VQaXhlbHMoY29udGVudE9mZnNldCwgYm91bmRlZE9mZnNldCwgZGV2aWNlU2NhbGVGYWN0b3Ip OwogfQogCistIChCT09MKV9zY3JvbGxWaWV3SXNSdWJiZXJCYW5kaW5nRm9yUmVmcmVzaENvbnRy b2wKK3sKKyAgICBpZiAoIVtfc2Nyb2xsVmlldyByZWZyZXNoQ29udHJvbF0pCisgICAgICAgIHJl dHVybiBOTzsKKworICAgIENHUG9pbnQgY29udGVudE9mZnNldCA9IFtfc2Nyb2xsVmlldyBjb250 ZW50T2Zmc2V0XTsKKyAgICBVSUVkZ2VJbnNldHMgY29udGVudEluc2V0cyA9IFtfc2Nyb2xsVmll dyBhZGp1c3RlZENvbnRlbnRJbnNldF07CisgICAgcmV0dXJuIGNvbnRlbnRPZmZzZXQueSA8IC1j b250ZW50SW5zZXRzLnRvcCAmJiBbc2VsZiBfc2Nyb2xsVmlld0lzUnViYmVyQmFuZGluZzpfc2Ny b2xsVmlldy5nZXQoKV07Cit9CisKIC8vIEZJWE1FOiBMaWtlbHkgd2UgY2FuIHJlbW92ZSB0aGlz IHNwZWNpYWwgY2FzZSBmb3Igd2F0Y2hPUyBhbmQgdHZPUy4KICNpZiAhUExBVEZPUk0oV0FUQ0hP UykgJiYgIVBMQVRGT1JNKEFQUExFVFYpCiAtICh2b2lkKXNhZmVBcmVhSW5zZXRzRGlkQ2hhbmdl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tTY3JvbGxWaWV3Lm1t IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLU2Nyb2xsVmlldy5tbQppbmRleCA3MzY4 YmY2NDE4NTcxN2ZhMWQ3OGFiYjFhZWNjZmYxYzZlMjBkNzY0Li4wMzFlZmY3MDdmYTI3N2YwNDE4 NmQ2YzUxYmY1YzNiYjExNWZkY2IxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tTY3JvbGxWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S1Njcm9sbFZpZXcubW0KQEAgLTMzNiw3ICszMzYsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgdmFs dWVzQXJlV2l0aGluT25lUGl4ZWwoQ0dGbG9hdCBhLCBDR0Zsb2F0IGIpCiB7CiAgICAgQ0dTaXpl IGN1cnJlbnRDb250ZW50U2l6ZSA9IFtzZWxmIGNvbnRlbnRTaXplXTsKIAotICAgIEJPT0wgbWln aHRCZVJ1YmJlcmJhbmRpbmcgPSBzZWxmLmlzRHJhZ2dpbmcgfHwgc2VsZi5pc1ZlcnRpY2FsQm91 bmNpbmcgfHwgc2VsZi5pc0hvcml6b250YWxCb3VuY2luZzsKKyAgICBCT09MIG1pZ2h0QmVSdWJi ZXJiYW5kaW5nID0gc2VsZi5pc0RyYWdnaW5nIHx8IHNlbGYuaXNWZXJ0aWNhbEJvdW5jaW5nIHx8 IHNlbGYuaXNIb3Jpem9udGFsQm91bmNpbmcgfHwgc2VsZi5yZWZyZXNoQ29udHJvbDsKICAgICBp ZiAoIW1pZ2h0QmVSdWJiZXJiYW5kaW5nIHx8IENHU2l6ZUVxdWFsVG9TaXplKGN1cnJlbnRDb250 ZW50U2l6ZSwgQ0dTaXplWmVybykgfHwgQ0dTaXplRXF1YWxUb1NpemUoY3VycmVudENvbnRlbnRT aXplLCBjb250ZW50U2l6ZSkgfHwgc2VsZi56b29tU2NhbGUgPCBzZWxmLm1pbmltdW1ab29tU2Nh bGUpIHsKICAgICAgICAgLy8gRklYTUU6IHJkYXI6Ly9wcm9ibGVtLzY1Mjc3NzU5IEZpbmQgb3V0 IHdoeSBpT1MgTWFpbCBuZWVkcyB0aGlzIGNhbGwgZXZlbiB3aGVuIHRoZSBjb250ZW50U2l6ZSBo YXMgbm90IGNoYW5nZWQuCiAgICAgICAgIFtzZWxmIHNldENvbnRlbnRTaXplOmNvbnRlbnRTaXpl XTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAx YWUyNzY2NDFlNjc5N2FjMzE5NDI5ZjIyMzc0NWU5ZjBiZDVkYzJiLi43NmYxMzFkNGU1ODVlYzg2 NjQ3ZDVhMWE4ZGFjOThmOTFmODU1M2UxIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysr IGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDUtMjcgIE1hdHQgR2ls bGlnYW4gIDxtYXR0aGV3X2dpbGxpZ2FuQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IHJl c2V0dGluZyBzY3JvbGwgcG9zaXRpb24gaW4gdW5uZWNlc3NhcnkgY2FzZXMgZHVyaW5nIHBhZ2Ug bG9hZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2 MzM4CisgICAgICAgIHJkYXI6Ly83NTMzNDY1MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvU2Nyb2xsVmll d0luc2V0VGVzdHMubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAyMS0w NS0yMyAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQ29udmVydCBE ZXN0aW5hdGlvbkNvbG9yU3BhY2UgZnJvbSBhbiBlbnVtIHRvIGNsYXNzIHdyYXBwaW5nIGEgcGxh dGZvcm0gY29sb3Igc3BhY2UgKENHQ29sb3JTcGFjZVJlZiBmb3IgQ0cgcG9ydHMsIGV0Yy4pCmRp ZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9TY3JvbGxWaWV3SW5zZXRU ZXN0cy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL1Njcm9sbFZpZXdJbnNldFRl c3RzLm1tCmluZGV4IDdiYmRlNWZlM2U3OWJiZTdlNjUzYzNjNzY2Zjg2OWU1NmIzYWUzZmQuLjA3 ZWM4NDQ5ZTgyNmNlZWVjNGVjZWNkMjE0NzM2MWY1OTM2ZmZkZWMgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL1Njcm9sbFZpZXdJbnNldFRlc3RzLm1tCisrKyBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL1Njcm9sbFZpZXdJbnNldFRlc3RzLm1tCkBAIC0y NTksNiArMjU5LDIyIEBAIFRFU1QoU2Nyb2xsVmlld0luc2V0VGVzdHMsIENoYW5nZUluc2V0V2l0 aG91dEF1dG9tYXRpY0FkanVzdG1lbnRXaGlsZVdlYlByb2Nlc3NJCiAgICAgRVhQRUNUX0VRKDAs IFtbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQuc2Nyb2xs aW5nRWxlbWVudC5zY3JvbGxUb3AiXSBpbnRWYWx1ZV0pOwogfQogCitURVNUKFNjcm9sbFZpZXdJ bnNldFRlc3RzLCBQcmVzZXJ2ZUNvbnRlbnRPZmZzZXRGb3JSZWZyZXNoQ29udHJvbCkKK3sKKyAg ICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhG cmFtZTpDR1JlY3RNYWtlKDAsIDAsIDMyMCwgdmlld0hlaWdodCldKTsKKyAgICBbd2ViVmlldyBz Y3JvbGxWaWV3XS5yZWZyZXNoQ29udHJvbCA9IFtbVUlSZWZyZXNoQ29udHJvbCBhbGxvY10gaW5p dF07CisgICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxvYWRIVE1MU3RyaW5nOkAiIl07CisKKyAg ICBbd2ViVmlldyBzY3JvbGxWaWV3XS5jb250ZW50T2Zmc2V0ID0gQ0dQb2ludE1ha2UoMCwgLTEw MCk7CisKKyAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZEhUTUxTdHJpbmc6QCI8Ym9keSBi Z2NvbG9yPSdyZWQnPiJdOworICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0UHJlc2VudGF0aW9uVXBk YXRlXTsKKworICAgIENHUG9pbnQgY29udGVudE9mZnNldEFmdGVyTmF2aWdhdGlvbiA9IFt3ZWJW aWV3IHNjcm9sbFZpZXddLmNvbnRlbnRPZmZzZXQ7CisgICAgRVhQRUNUX0VRKDAsIGNvbnRlbnRP ZmZzZXRBZnRlck5hdmlnYXRpb24ueCk7CisgICAgRVhQRUNUX0VRKC0xMDAsIGNvbnRlbnRPZmZz ZXRBZnRlck5hdmlnYXRpb24ueSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkK IAogI2VuZGlmIC8vIFBMQVRGT1JNKElPU19GQU1JTFkpCg== 430026 2021-05-28 10:23:15 -0700 2021-05-28 12:30:48 -0700 Patch bug-226338-20210528102314.patch text/plain 8257 matthew_gilligan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3OTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDcwMzhhYTk1ZTU3NDUxNWMz NDA0MmY2NDE5ODMyNTA1YzZjMjI2NmUuLmE3ZDIzMWU4OTVlZjQwMjZmNTRhNmEzMDE1NWY0MjQy NDQzZjdiM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMjEtMDUtMjcgIE1hdHQgR2ls bGlnYW4gIDxtYXR0aGV3X2dpbGxpZ2FuQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IHJl c2V0dGluZyBzY3JvbGwgcG9zaXRpb24gaW4gdW5uZWNlc3NhcnkgY2FzZXMgZHVyaW5nIHBhZ2Ug bG9hZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2 MzM4CisgICAgICAgIHJkYXI6Ly83NTMzNDY1MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gV0tXZWJWaWV3J3Mgc2Nyb2xsIHZpZXcgaGFzIGEg cmVmcmVzaCBjb250cm9sIGFuZCBpcyBydWJiZXIgYmFuZGluZyBhbG9uZyB0aGUgdG9wCisgICAg ICAgIGVkZ2UsIGRvbid0IGNhbmNlbCBzY3JvbGxpbmcgYW5pbWF0aW9ucyBvciByZXNldCBjb250 ZW50T2Zmc2V0IHdpdGhpbiB2YWxpZCByYW5nZSBkdWUgdG8KKyAgICAgICAgdGhlIHBhZ2UgbG9h ZC4gVGhpcyBjYW4gY2F1c2UgZmxpY2tlcmluZyBkdXJpbmcgZHJhZ2dpbmcgYW5kIGNhbiBwcmV2 ZW50IHRoZSBib3VuY2UKKyAgICAgICAgYW5pbWF0aW9uIGZyb20gZmluaXNoaW5nLgorCisgICAg ICAgIFRlc3Q6IFNjcm9sbFZpZXdJbnNldFRlc3RzLlByZXNlcnZlQ29udGVudE9mZnNldEZvclJl ZnJlc2hDb250cm9sCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1Mu bW06CisgICAgICAgICgtW1dLV2ViVmlldyBfZGlkQ29tbWl0TG9hZEZvck1haW5GcmFtZV0pOgor ICAgICAgICBBdm9pZCBjYWxsaW5nIC1fc3RvcFNjcm9sbGluZ0FuZFpvb21pbmdBbmltYXRpb25z IHdoZW4gcnViYmVyIGJhbmRpbmcgZm9yIGEgcmVmcmVzaCBjb250cm9sCisgICAgICAgIHRvIHBy ZXZlbnQgY2FuY2VsbGluZyBhIGJvdW5jZSBhbmltYXRpb24uCisKKyAgICAgICAgKC1bV0tXZWJW aWV3IF9yZXN0b3JlU2Nyb2xsQW5kWm9vbVN0YXRlRm9yVHJhbnNhY3Rpb246XSk6CisgICAgICAg ICgtW1dLV2ViVmlldyBfZGlkQ29tbWl0TGF5ZXJUcmVlOl0pOgorICAgICAgICBEb24ndCBhZGp1 c3QgY29udGVudCBvZmZzZXQgdG8gYmUgd2l0aGluIHZhbGlkIHJhbmdlIHdoZW4gcnViYmVyIGJh bmRpbmcgZm9yIGEgcmVmcmVzaAorICAgICAgICBjb250cm9sLCBvciB0aGUgc2Nyb2xsIHBvc2l0 aW9uIHdpbGwgYmUgcmVzZXQgd2hpbGUgZHJhZ2dpbmcgb3IgYm91bmNpbmcuCisKKyAgICAgICAg KC1bV0tXZWJWaWV3IF9zY3JvbGxWaWV3SXNSdWJiZXJCYW5kaW5nRm9yUmVmcmVzaENvbnRyb2xd KToKKyAgICAgICAgUmV0dXJuIHdoZXRoZXIgX3Njcm9sbFZpZXcgaGFzIGEgcmVmcmVzaCBjb250 cm9sIGFuZCBpcyBydWJiZXIgYmFuZGluZyBhbG9uZyB0aGUgdG9wIGVkZ2UuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvaW9zL1dLU2Nyb2xsVmlldy5tbToKKyAgICAgICAgKC1bV0tTY3JvbGxWaWV3 IF9zZXRDb250ZW50U2l6ZVByZXNlcnZpbmdDb250ZW50T2Zmc2V0RHVyaW5nUnViYmVyYmFuZDpd KToKKyAgICAgICAgV2hlbiB0aGUgcmVmcmVzaCBjb250cm9sIGlzIGRpc21pc3NpbmcsIHRoZSBz Y3JvbGwgdmlldyB3aWxsIGJlIHJ1YmJlciBiYW5kaW5nIGJ1dCBub3QKKyAgICAgICAgZHJhZ2dp bmcgb3IgYm91bmNpbmcuIFRyZWF0IGEgbm9uLW5pbCByZWZyZXNoQ29udHJvbCBhcyBhIGhpbnQg dGhhdCB0aGUgc2Nyb2xsIHZpZXcgbWlnaHQKKyAgICAgICAgYmUgcnViYmVyIGJhbmRpbmcuCisK IDIwMjEtMDUtMjMgIFNhbSBXZWluaWcgIDx3ZWluaWdAYXBwbGUuY29tPgogCiAgICAgICAgIENv bnZlcnQgRGVzdGluYXRpb25Db2xvclNwYWNlIGZyb20gYW4gZW51bSB0byBjbGFzcyB3cmFwcGlu ZyBhIHBsYXRmb3JtIGNvbG9yIHNwYWNlIChDR0NvbG9yU3BhY2VSZWYgZm9yIENHIHBvcnRzLCBl dGMuKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZp ZXdJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5t bQppbmRleCA4Y2MzMzk3NmMzMzQ2NTMzN2Q1NjAwMDIwNWMzZjUzZTE2Mjg2MTQ5Li44MGM1YTFk YjgwOThkMjhkZDNjZWJhMjgzMzAzMTI4YzBhZWRjNjAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvaW9zL1dLV2ViVmlld0lPUy5tbQpAQCAtNzE4LDcgKzcxOCw4IEBAIHN0 YXRpYyBXZWJDb3JlOjpDb2xvciBzY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yKFdLV2ViVmlldyAq d2ViVmlldykKICAgICBfaGFzQ29tbWl0dGVkTG9hZEZvck1haW5GcmFtZSA9IFlFUzsKICAgICBf bmVlZHNSZXNldFZpZXdTdGF0ZUFmdGVyQ29tbWl0TG9hZEZvck1haW5GcmFtZSA9IFlFUzsKIAot ICAgIFtfc2Nyb2xsVmlldyBfc3RvcFNjcm9sbGluZ0FuZFpvb21pbmdBbmltYXRpb25zXTsKKyAg ICBpZiAoIVtzZWxmIF9zY3JvbGxWaWV3SXNSdWJiZXJCYW5kaW5nRm9yUmVmcmVzaENvbnRyb2xd KQorICAgICAgICBbX3Njcm9sbFZpZXcgX3N0b3BTY3JvbGxpbmdBbmRab29taW5nQW5pbWF0aW9u c107CiB9CiAKIHN0YXRpYyBDR1BvaW50IGNvbnRlbnRPZmZzZXRCb3VuZGVkSW5WYWxpZFJhbmdl KFVJU2Nyb2xsVmlldyAqc2Nyb2xsVmlldywgQ0dQb2ludCBjb250ZW50T2Zmc2V0KQpAQCAtODM1 LDcgKzgzNiw3IEBAIHN0YXRpYyB2b2lkIGNoYW5nZUNvbnRlbnRPZmZzZXRCb3VuZGVkSW5WYWxp ZFJhbmdlKFVJU2Nyb2xsVmlldyAqc2Nyb2xsVmlldywgV2ViCiAKICAgICBCT09MIG5lZWRVcGRh dGVWaXNpYmxlQ29udGVudFJlY3RzID0gTk87CiAKLSAgICBpZiAoX3Njcm9sbE9mZnNldFRvUmVz dG9yZSkgeworICAgIGlmIChfc2Nyb2xsT2Zmc2V0VG9SZXN0b3JlICYmICFbc2VsZiBfc2Nyb2xs Vmlld0lzUnViYmVyQmFuZGluZ0ZvclJlZnJlc2hDb250cm9sXSkgewogICAgICAgICBXZWJDb3Jl OjpGbG9hdFBvaW50IHNjYWxlZFNjcm9sbE9mZnNldCA9IF9zY3JvbGxPZmZzZXRUb1Jlc3RvcmUu dmFsdWUoKTsKICAgICAgICAgX3Njcm9sbE9mZnNldFRvUmVzdG9yZSA9IFdURjo6bnVsbG9wdDsK IApAQCAtODUwLDcgKzg1MSw3IEBAIHN0YXRpYyB2b2lkIGNoYW5nZUNvbnRlbnRPZmZzZXRCb3Vu ZGVkSW5WYWxpZFJhbmdlKFVJU2Nyb2xsVmlldyAqc2Nyb2xsVmlldywgV2ViCiAgICAgICAgIG5l ZWRVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzID0gWUVTOwogICAgIH0KIAotICAgIGlmIChfdW5v YnNjdXJlZENlbnRlclRvUmVzdG9yZSkgeworICAgIGlmIChfdW5vYnNjdXJlZENlbnRlclRvUmVz dG9yZSAmJiAhW3NlbGYgX3Njcm9sbFZpZXdJc1J1YmJlckJhbmRpbmdGb3JSZWZyZXNoQ29udHJv bF0pIHsKICAgICAgICAgV2ViQ29yZTo6RmxvYXRQb2ludCB1bm9ic2N1cmVkQ2VudGVyVG9SZXN0 b3JlID0gX3Vub2JzY3VyZWRDZW50ZXJUb1Jlc3RvcmUudmFsdWUoKTsKICAgICAgICAgX3Vub2Jz Y3VyZWRDZW50ZXJUb1Jlc3RvcmUgPSBXVEY6Om51bGxvcHQ7CiAKQEAgLTkyMSw3ICs5MjIsOSBA QCBzdGF0aWMgdm9pZCBjaGFuZ2VDb250ZW50T2Zmc2V0Qm91bmRlZEluVmFsaWRSYW5nZShVSVNj cm9sbFZpZXcgKnNjcm9sbFZpZXcsIFdlYgogCiAgICAgaWYgKF9uZWVkc1Jlc2V0Vmlld1N0YXRl QWZ0ZXJDb21taXRMb2FkRm9yTWFpbkZyYW1lICYmIGxheWVyVHJlZVRyYW5zYWN0aW9uLnRyYW5z YWN0aW9uSUQoKSA+PSBfZmlyc3RQYWludEFmdGVyQ29tbWl0TG9hZFRyYW5zYWN0aW9uSUQpIHsK ICAgICAgICAgX25lZWRzUmVzZXRWaWV3U3RhdGVBZnRlckNvbW1pdExvYWRGb3JNYWluRnJhbWUg PSBOTzsKLSAgICAgICAgW19zY3JvbGxWaWV3IHNldENvbnRlbnRPZmZzZXQ6W3NlbGYgX2luaXRp YWxDb250ZW50T2Zmc2V0Rm9yU2Nyb2xsVmlld11dOworICAgICAgICBpZiAoIVtzZWxmIF9zY3Jv bGxWaWV3SXNSdWJiZXJCYW5kaW5nRm9yUmVmcmVzaENvbnRyb2xdKQorICAgICAgICAgICAgW19z Y3JvbGxWaWV3IHNldENvbnRlbnRPZmZzZXQ6W3NlbGYgX2luaXRpYWxDb250ZW50T2Zmc2V0Rm9y U2Nyb2xsVmlld11dOworCiAgICAgICAgIGlmIChfb2JzZXJ2ZWRSZW5kZXJpbmdQcm9ncmVzc0V2 ZW50cyAmIF9XS1JlbmRlcmluZ1Byb2dyZXNzRXZlbnRGaXJzdFBhaW50KQogICAgICAgICAgICAg X25hdmlnYXRpb25TdGF0ZS0+ZGlkRmlyc3RQYWludCgpOwogCkBAIC0xODk2LDYgKzE4OTksMTYg QEAgc3RhdGljIFdlYkNvcmU6OkZsb2F0UG9pbnQgY29uc3RyYWluQ29udGVudE9mZnNldChXZWJD b3JlOjpGbG9hdFBvaW50IGNvbnRlbnRPZmYKICAgICByZXR1cm4gIXBvaW50c0VxdWFsSW5EZXZp Y2VQaXhlbHMoY29udGVudE9mZnNldCwgYm91bmRlZE9mZnNldCwgZGV2aWNlU2NhbGVGYWN0b3Ip OwogfQogCistIChCT09MKV9zY3JvbGxWaWV3SXNSdWJiZXJCYW5kaW5nRm9yUmVmcmVzaENvbnRy b2wKK3sKKyAgICBpZiAoIVtfc2Nyb2xsVmlldyByZWZyZXNoQ29udHJvbF0pCisgICAgICAgIHJl dHVybiBOTzsKKworICAgIENHUG9pbnQgY29udGVudE9mZnNldCA9IFtfc2Nyb2xsVmlldyBjb250 ZW50T2Zmc2V0XTsKKyAgICBVSUVkZ2VJbnNldHMgY29udGVudEluc2V0cyA9IFtfc2Nyb2xsVmll dyBhZGp1c3RlZENvbnRlbnRJbnNldF07CisgICAgcmV0dXJuIGNvbnRlbnRPZmZzZXQueSA8IC1j b250ZW50SW5zZXRzLnRvcCAmJiBbc2VsZiBfc2Nyb2xsVmlld0lzUnViYmVyQmFuZGluZzpfc2Ny b2xsVmlldy5nZXQoKV07Cit9CisKIC8vIEZJWE1FOiBMaWtlbHkgd2UgY2FuIHJlbW92ZSB0aGlz IHNwZWNpYWwgY2FzZSBmb3Igd2F0Y2hPUyBhbmQgdHZPUy4KICNpZiAhUExBVEZPUk0oV0FUQ0hP UykgJiYgIVBMQVRGT1JNKEFQUExFVFYpCiAtICh2b2lkKXNhZmVBcmVhSW5zZXRzRGlkQ2hhbmdl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tTY3JvbGxWaWV3Lm1t IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLU2Nyb2xsVmlldy5tbQppbmRleCA3MzY4 YmY2NDE4NTcxN2ZhMWQ3OGFiYjFhZWNjZmYxYzZlMjBkNzY0Li4wMzFlZmY3MDdmYTI3N2YwNDE4 NmQ2YzUxYmY1YzNiYjExNWZkY2IxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tTY3JvbGxWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X S1Njcm9sbFZpZXcubW0KQEAgLTMzNiw3ICszMzYsNyBAQCBzdGF0aWMgaW5saW5lIGJvb2wgdmFs dWVzQXJlV2l0aGluT25lUGl4ZWwoQ0dGbG9hdCBhLCBDR0Zsb2F0IGIpCiB7CiAgICAgQ0dTaXpl IGN1cnJlbnRDb250ZW50U2l6ZSA9IFtzZWxmIGNvbnRlbnRTaXplXTsKIAotICAgIEJPT0wgbWln aHRCZVJ1YmJlcmJhbmRpbmcgPSBzZWxmLmlzRHJhZ2dpbmcgfHwgc2VsZi5pc1ZlcnRpY2FsQm91 bmNpbmcgfHwgc2VsZi5pc0hvcml6b250YWxCb3VuY2luZzsKKyAgICBCT09MIG1pZ2h0QmVSdWJi ZXJiYW5kaW5nID0gc2VsZi5pc0RyYWdnaW5nIHx8IHNlbGYuaXNWZXJ0aWNhbEJvdW5jaW5nIHx8 IHNlbGYuaXNIb3Jpem9udGFsQm91bmNpbmcgfHwgc2VsZi5yZWZyZXNoQ29udHJvbDsKICAgICBp ZiAoIW1pZ2h0QmVSdWJiZXJiYW5kaW5nIHx8IENHU2l6ZUVxdWFsVG9TaXplKGN1cnJlbnRDb250 ZW50U2l6ZSwgQ0dTaXplWmVybykgfHwgQ0dTaXplRXF1YWxUb1NpemUoY3VycmVudENvbnRlbnRT aXplLCBjb250ZW50U2l6ZSkgfHwgc2VsZi56b29tU2NhbGUgPCBzZWxmLm1pbmltdW1ab29tU2Nh bGUpIHsKICAgICAgICAgLy8gRklYTUU6IHJkYXI6Ly9wcm9ibGVtLzY1Mjc3NzU5IEZpbmQgb3V0 IHdoeSBpT1MgTWFpbCBuZWVkcyB0aGlzIGNhbGwgZXZlbiB3aGVuIHRoZSBjb250ZW50U2l6ZSBo YXMgbm90IGNoYW5nZWQuCiAgICAgICAgIFtzZWxmIHNldENvbnRlbnRTaXplOmNvbnRlbnRTaXpl XTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAx YWUyNzY2NDFlNjc5N2FjMzE5NDI5ZjIyMzc0NWU5ZjBiZDVkYzJiLi43NmYxMzFkNGU1ODVlYzg2 NjQ3ZDVhMWE4ZGFjOThmOTFmODU1M2UxIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysr IGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDUtMjcgIE1hdHQgR2ls bGlnYW4gIDxtYXR0aGV3X2dpbGxpZ2FuQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IHJl c2V0dGluZyBzY3JvbGwgcG9zaXRpb24gaW4gdW5uZWNlc3NhcnkgY2FzZXMgZHVyaW5nIHBhZ2Ug bG9hZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2 MzM4CisgICAgICAgIHJkYXI6Ly83NTMzNDY1MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvU2Nyb2xsVmll d0luc2V0VGVzdHMubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAyMS0w NS0yMyAgU2FtIFdlaW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQ29udmVydCBE ZXN0aW5hdGlvbkNvbG9yU3BhY2UgZnJvbSBhbiBlbnVtIHRvIGNsYXNzIHdyYXBwaW5nIGEgcGxh dGZvcm0gY29sb3Igc3BhY2UgKENHQ29sb3JTcGFjZVJlZiBmb3IgQ0cgcG9ydHMsIGV0Yy4pCmRp ZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9TY3JvbGxWaWV3SW5zZXRU ZXN0cy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL1Njcm9sbFZpZXdJbnNldFRl c3RzLm1tCmluZGV4IDdiYmRlNWZlM2U3OWJiZTdlNjUzYzNjNzY2Zjg2OWU1NmIzYWUzZmQuLjUz YjQxODk1ZTU1MGQ5YjkyOWYwZTFiYzk4NWY0ZDU0Mjk5NDc1NzQgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL1Njcm9sbFZpZXdJbnNldFRlc3RzLm1tCisrKyBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL1Njcm9sbFZpZXdJbnNldFRlc3RzLm1tCkBAIC0y NTksNiArMjU5LDIyIEBAIFRFU1QoU2Nyb2xsVmlld0luc2V0VGVzdHMsIENoYW5nZUluc2V0V2l0 aG91dEF1dG9tYXRpY0FkanVzdG1lbnRXaGlsZVdlYlByb2Nlc3NJCiAgICAgRVhQRUNUX0VRKDAs IFtbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQuc2Nyb2xs aW5nRWxlbWVudC5zY3JvbGxUb3AiXSBpbnRWYWx1ZV0pOwogfQogCitURVNUKFNjcm9sbFZpZXdJ bnNldFRlc3RzLCBQcmVzZXJ2ZUNvbnRlbnRPZmZzZXRGb3JSZWZyZXNoQ29udHJvbCkKK3sKKyAg ICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhG cmFtZTpDR1JlY3RNYWtlKDAsIDAsIDMyMCwgdmlld0hlaWdodCldKTsKKyAgICBbd2ViVmlldyBz Y3JvbGxWaWV3XS5yZWZyZXNoQ29udHJvbCA9IGFkb3B0TlMoW1tVSVJlZnJlc2hDb250cm9sIGFs bG9jXSBpbml0XSkuZ2V0KCk7CisgICAgW3dlYlZpZXcgc3luY2hyb25vdXNseUxvYWRIVE1MU3Ry aW5nOkAiIl07CisKKyAgICBbd2ViVmlldyBzY3JvbGxWaWV3XS5jb250ZW50T2Zmc2V0ID0gQ0dQ b2ludE1ha2UoMCwgLTEwMCk7CisKKyAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZEhUTUxT dHJpbmc6QCI8Ym9keSBiZ2NvbG9yPSdyZWQnPiJdOworICAgIFt3ZWJWaWV3IHdhaXRGb3JOZXh0 UHJlc2VudGF0aW9uVXBkYXRlXTsKKworICAgIENHUG9pbnQgY29udGVudE9mZnNldEFmdGVyTmF2 aWdhdGlvbiA9IFt3ZWJWaWV3IHNjcm9sbFZpZXddLmNvbnRlbnRPZmZzZXQ7CisgICAgRVhQRUNU X0VRKDAsIGNvbnRlbnRPZmZzZXRBZnRlck5hdmlnYXRpb24ueCk7CisgICAgRVhQRUNUX0VRKC0x MDAsIGNvbnRlbnRPZmZzZXRBZnRlck5hdmlnYXRpb24ueSk7Cit9CisKIH0gLy8gbmFtZXNwYWNl IFRlc3RXZWJLaXRBUEkKIAogI2VuZGlmIC8vIFBMQVRGT1JNKElPU19GQU1JTFkpCg== 430041 2021-05-28 12:30:50 -0700 2021-05-28 13:18:09 -0700 Patch bug-226338-20210528123049.patch text/plain 8253 matthew_gilligan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3OTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDcwMzhhYTk1ZTU3NDUxNWMz NDA0MmY2NDE5ODMyNTA1YzZjMjI2NmUuLjJlZmI1MTQ1Y2RhMTA0NWZkNmI5NGIzOTliYjNmYzE2 MGNmYzZlZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMjEtMDUtMjcgIE1hdHQgR2ls bGlnYW4gIDxtYXR0aGV3X2dpbGxpZ2FuQGFwcGxlLmNvbT4KKworICAgICAgICBQcmV2ZW50IHJl c2V0dGluZyBzY3JvbGwgcG9zaXRpb24gaW4gdW5uZWNlc3NhcnkgY2FzZXMgZHVyaW5nIHBhZ2Ug bG9hZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI2 MzM4CisgICAgICAgIHJkYXI6Ly83NTMzNDY1MQorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9u IEZyYXNlci4KKworICAgICAgICBXaGVuIFdLV2ViVmlldydzIHNjcm9sbCB2aWV3IGhhcyBhIHJl ZnJlc2ggY29udHJvbCBhbmQgaXMgcnViYmVyIGJhbmRpbmcgYWxvbmcgdGhlIHRvcAorICAgICAg ICBlZGdlLCBkb24ndCBjYW5jZWwgc2Nyb2xsaW5nIGFuaW1hdGlvbnMgb3IgcmVzZXQgY29udGVu dE9mZnNldCB3aXRoaW4gdmFsaWQgcmFuZ2UgZHVlIHRvCisgICAgICAgIHRoZSBwYWdlIGxvYWQu IFRoaXMgY2FuIGNhdXNlIGZsaWNrZXJpbmcgZHVyaW5nIGRyYWdnaW5nIGFuZCBjYW4gcHJldmVu dCB0aGUgYm91bmNlCisgICAgICAgIGFuaW1hdGlvbiBmcm9tIGZpbmlzaGluZy4KKworICAgICAg ICBUZXN0OiBTY3JvbGxWaWV3SW5zZXRUZXN0cy5QcmVzZXJ2ZUNvbnRlbnRPZmZzZXRGb3JSZWZy ZXNoQ29udHJvbAorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3SU9TLm1t OgorICAgICAgICAoLVtXS1dlYlZpZXcgX2RpZENvbW1pdExvYWRGb3JNYWluRnJhbWVdKToKKyAg ICAgICAgQXZvaWQgY2FsbGluZyAtX3N0b3BTY3JvbGxpbmdBbmRab29taW5nQW5pbWF0aW9ucyB3 aGVuIHJ1YmJlciBiYW5kaW5nIGZvciBhIHJlZnJlc2ggY29udHJvbAorICAgICAgICB0byBwcmV2 ZW50IGNhbmNlbGxpbmcgYSBib3VuY2UgYW5pbWF0aW9uLgorCisgICAgICAgICgtW1dLV2ViVmll dyBfcmVzdG9yZVNjcm9sbEFuZFpvb21TdGF0ZUZvclRyYW5zYWN0aW9uOl0pOgorICAgICAgICAo LVtXS1dlYlZpZXcgX2RpZENvbW1pdExheWVyVHJlZTpdKToKKyAgICAgICAgRG9uJ3QgYWRqdXN0 IGNvbnRlbnQgb2Zmc2V0IHRvIGJlIHdpdGhpbiB2YWxpZCByYW5nZSB3aGVuIHJ1YmJlciBiYW5k aW5nIGZvciBhIHJlZnJlc2gKKyAgICAgICAgY29udHJvbCwgb3IgdGhlIHNjcm9sbCBwb3NpdGlv biB3aWxsIGJlIHJlc2V0IHdoaWxlIGRyYWdnaW5nIG9yIGJvdW5jaW5nLgorCisgICAgICAgICgt W1dLV2ViVmlldyBfc2Nyb2xsVmlld0lzUnViYmVyQmFuZGluZ0ZvclJlZnJlc2hDb250cm9sXSk6 CisgICAgICAgIFJldHVybiB3aGV0aGVyIF9zY3JvbGxWaWV3IGhhcyBhIHJlZnJlc2ggY29udHJv bCBhbmQgaXMgcnViYmVyIGJhbmRpbmcgYWxvbmcgdGhlIHRvcCBlZGdlLgorCisgICAgICAgICog VUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcubW06CisgICAgICAgICgtW1dLU2Nyb2xsVmlldyBf c2V0Q29udGVudFNpemVQcmVzZXJ2aW5nQ29udGVudE9mZnNldER1cmluZ1J1YmJlcmJhbmQ6XSk6 CisgICAgICAgIFdoZW4gdGhlIHJlZnJlc2ggY29udHJvbCBpcyBkaXNtaXNzaW5nLCB0aGUgc2Ny b2xsIHZpZXcgd2lsbCBiZSBydWJiZXIgYmFuZGluZyBidXQgbm90CisgICAgICAgIGRyYWdnaW5n IG9yIGJvdW5jaW5nLiBUcmVhdCBhIG5vbi1uaWwgcmVmcmVzaENvbnRyb2wgYXMgYSBoaW50IHRo YXQgdGhlIHNjcm9sbCB2aWV3IG1pZ2h0CisgICAgICAgIGJlIHJ1YmJlciBiYW5kaW5nLgorCiAy MDIxLTA1LTIzICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBDb252 ZXJ0IERlc3RpbmF0aW9uQ29sb3JTcGFjZSBmcm9tIGFuIGVudW0gdG8gY2xhc3Mgd3JhcHBpbmcg YSBwbGF0Zm9ybSBjb2xvciBzcGFjZSAoQ0dDb2xvclNwYWNlUmVmIGZvciBDRyBwb3J0cywgZXRj LikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9pb3MvV0tXZWJWaWV3 SU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0K aW5kZXggOGNjMzM5NzZjMzM0NjUzMzdkNTYwMDAyMDVjM2Y1M2UxNjI4NjE0OS4uODBjNWExZGI4 MDk4ZDI4ZGQzY2ViYTI4MzMwMzEyOGMwYWVkYzYwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL2lvcy9XS1dlYlZpZXdJT1MubW0KQEAgLTcxOCw3ICs3MTgsOCBAQCBzdGF0 aWMgV2ViQ29yZTo6Q29sb3Igc2Nyb2xsVmlld0JhY2tncm91bmRDb2xvcihXS1dlYlZpZXcgKndl YlZpZXcpCiAgICAgX2hhc0NvbW1pdHRlZExvYWRGb3JNYWluRnJhbWUgPSBZRVM7CiAgICAgX25l ZWRzUmVzZXRWaWV3U3RhdGVBZnRlckNvbW1pdExvYWRGb3JNYWluRnJhbWUgPSBZRVM7CiAKLSAg ICBbX3Njcm9sbFZpZXcgX3N0b3BTY3JvbGxpbmdBbmRab29taW5nQW5pbWF0aW9uc107CisgICAg aWYgKCFbc2VsZiBfc2Nyb2xsVmlld0lzUnViYmVyQmFuZGluZ0ZvclJlZnJlc2hDb250cm9sXSkK KyAgICAgICAgW19zY3JvbGxWaWV3IF9zdG9wU2Nyb2xsaW5nQW5kWm9vbWluZ0FuaW1hdGlvbnNd OwogfQogCiBzdGF0aWMgQ0dQb2ludCBjb250ZW50T2Zmc2V0Qm91bmRlZEluVmFsaWRSYW5nZShV SVNjcm9sbFZpZXcgKnNjcm9sbFZpZXcsIENHUG9pbnQgY29udGVudE9mZnNldCkKQEAgLTgzNSw3 ICs4MzYsNyBAQCBzdGF0aWMgdm9pZCBjaGFuZ2VDb250ZW50T2Zmc2V0Qm91bmRlZEluVmFsaWRS YW5nZShVSVNjcm9sbFZpZXcgKnNjcm9sbFZpZXcsIFdlYgogCiAgICAgQk9PTCBuZWVkVXBkYXRl VmlzaWJsZUNvbnRlbnRSZWN0cyA9IE5POwogCi0gICAgaWYgKF9zY3JvbGxPZmZzZXRUb1Jlc3Rv cmUpIHsKKyAgICBpZiAoX3Njcm9sbE9mZnNldFRvUmVzdG9yZSAmJiAhW3NlbGYgX3Njcm9sbFZp ZXdJc1J1YmJlckJhbmRpbmdGb3JSZWZyZXNoQ29udHJvbF0pIHsKICAgICAgICAgV2ViQ29yZTo6 RmxvYXRQb2ludCBzY2FsZWRTY3JvbGxPZmZzZXQgPSBfc2Nyb2xsT2Zmc2V0VG9SZXN0b3JlLnZh bHVlKCk7CiAgICAgICAgIF9zY3JvbGxPZmZzZXRUb1Jlc3RvcmUgPSBXVEY6Om51bGxvcHQ7CiAK QEAgLTg1MCw3ICs4NTEsNyBAQCBzdGF0aWMgdm9pZCBjaGFuZ2VDb250ZW50T2Zmc2V0Qm91bmRl ZEluVmFsaWRSYW5nZShVSVNjcm9sbFZpZXcgKnNjcm9sbFZpZXcsIFdlYgogICAgICAgICBuZWVk VXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cyA9IFlFUzsKICAgICB9CiAKLSAgICBpZiAoX3Vub2Jz Y3VyZWRDZW50ZXJUb1Jlc3RvcmUpIHsKKyAgICBpZiAoX3Vub2JzY3VyZWRDZW50ZXJUb1Jlc3Rv cmUgJiYgIVtzZWxmIF9zY3JvbGxWaWV3SXNSdWJiZXJCYW5kaW5nRm9yUmVmcmVzaENvbnRyb2xd KSB7CiAgICAgICAgIFdlYkNvcmU6OkZsb2F0UG9pbnQgdW5vYnNjdXJlZENlbnRlclRvUmVzdG9y ZSA9IF91bm9ic2N1cmVkQ2VudGVyVG9SZXN0b3JlLnZhbHVlKCk7CiAgICAgICAgIF91bm9ic2N1 cmVkQ2VudGVyVG9SZXN0b3JlID0gV1RGOjpudWxsb3B0OwogCkBAIC05MjEsNyArOTIyLDkgQEAg c3RhdGljIHZvaWQgY2hhbmdlQ29udGVudE9mZnNldEJvdW5kZWRJblZhbGlkUmFuZ2UoVUlTY3Jv bGxWaWV3ICpzY3JvbGxWaWV3LCBXZWIKIAogICAgIGlmIChfbmVlZHNSZXNldFZpZXdTdGF0ZUFm dGVyQ29tbWl0TG9hZEZvck1haW5GcmFtZSAmJiBsYXllclRyZWVUcmFuc2FjdGlvbi50cmFuc2Fj dGlvbklEKCkgPj0gX2ZpcnN0UGFpbnRBZnRlckNvbW1pdExvYWRUcmFuc2FjdGlvbklEKSB7CiAg ICAgICAgIF9uZWVkc1Jlc2V0Vmlld1N0YXRlQWZ0ZXJDb21taXRMb2FkRm9yTWFpbkZyYW1lID0g Tk87Ci0gICAgICAgIFtfc2Nyb2xsVmlldyBzZXRDb250ZW50T2Zmc2V0OltzZWxmIF9pbml0aWFs Q29udGVudE9mZnNldEZvclNjcm9sbFZpZXddXTsKKyAgICAgICAgaWYgKCFbc2VsZiBfc2Nyb2xs Vmlld0lzUnViYmVyQmFuZGluZ0ZvclJlZnJlc2hDb250cm9sXSkKKyAgICAgICAgICAgIFtfc2Ny b2xsVmlldyBzZXRDb250ZW50T2Zmc2V0OltzZWxmIF9pbml0aWFsQ29udGVudE9mZnNldEZvclNj cm9sbFZpZXddXTsKKwogICAgICAgICBpZiAoX29ic2VydmVkUmVuZGVyaW5nUHJvZ3Jlc3NFdmVu dHMgJiBfV0tSZW5kZXJpbmdQcm9ncmVzc0V2ZW50Rmlyc3RQYWludCkKICAgICAgICAgICAgIF9u YXZpZ2F0aW9uU3RhdGUtPmRpZEZpcnN0UGFpbnQoKTsKIApAQCAtMTg5Niw2ICsxODk5LDE2IEBA IHN0YXRpYyBXZWJDb3JlOjpGbG9hdFBvaW50IGNvbnN0cmFpbkNvbnRlbnRPZmZzZXQoV2ViQ29y ZTo6RmxvYXRQb2ludCBjb250ZW50T2ZmCiAgICAgcmV0dXJuICFwb2ludHNFcXVhbEluRGV2aWNl UGl4ZWxzKGNvbnRlbnRPZmZzZXQsIGJvdW5kZWRPZmZzZXQsIGRldmljZVNjYWxlRmFjdG9yKTsK IH0KIAorLSAoQk9PTClfc2Nyb2xsVmlld0lzUnViYmVyQmFuZGluZ0ZvclJlZnJlc2hDb250cm9s Cit7CisgICAgaWYgKCFbX3Njcm9sbFZpZXcgcmVmcmVzaENvbnRyb2xdKQorICAgICAgICByZXR1 cm4gTk87CisKKyAgICBDR1BvaW50IGNvbnRlbnRPZmZzZXQgPSBbX3Njcm9sbFZpZXcgY29udGVu dE9mZnNldF07CisgICAgVUlFZGdlSW5zZXRzIGNvbnRlbnRJbnNldHMgPSBbX3Njcm9sbFZpZXcg YWRqdXN0ZWRDb250ZW50SW5zZXRdOworICAgIHJldHVybiBjb250ZW50T2Zmc2V0LnkgPCAtY29u dGVudEluc2V0cy50b3AgJiYgW3NlbGYgX3Njcm9sbFZpZXdJc1J1YmJlckJhbmRpbmc6X3Njcm9s bFZpZXcuZ2V0KCldOworfQorCiAvLyBGSVhNRTogTGlrZWx5IHdlIGNhbiByZW1vdmUgdGhpcyBz cGVjaWFsIGNhc2UgZm9yIHdhdGNoT1MgYW5kIHR2T1MuCiAjaWYgIVBMQVRGT1JNKFdBVENIT1Mp ICYmICFQTEFURk9STShBUFBMRVRWKQogLSAodm9pZClzYWZlQXJlYUluc2V0c0RpZENoYW5nZQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLU2Nyb2xsVmlldy5tbSBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcubW0KaW5kZXggNzM2OGJm NjQxODU3MTdmYTFkNzhhYmIxYWVjY2ZmMWM2ZTIwZDc2NC4uMDMxZWZmNzA3ZmEyNzdmMDQxODZk NmM1MWJmNWMzYmIxMTVmZGNiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLU2Nyb2xsVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tT Y3JvbGxWaWV3Lm1tCkBAIC0zMzYsNyArMzM2LDcgQEAgc3RhdGljIGlubGluZSBib29sIHZhbHVl c0FyZVdpdGhpbk9uZVBpeGVsKENHRmxvYXQgYSwgQ0dGbG9hdCBiKQogewogICAgIENHU2l6ZSBj dXJyZW50Q29udGVudFNpemUgPSBbc2VsZiBjb250ZW50U2l6ZV07CiAKLSAgICBCT09MIG1pZ2h0 QmVSdWJiZXJiYW5kaW5nID0gc2VsZi5pc0RyYWdnaW5nIHx8IHNlbGYuaXNWZXJ0aWNhbEJvdW5j aW5nIHx8IHNlbGYuaXNIb3Jpem9udGFsQm91bmNpbmc7CisgICAgQk9PTCBtaWdodEJlUnViYmVy YmFuZGluZyA9IHNlbGYuaXNEcmFnZ2luZyB8fCBzZWxmLmlzVmVydGljYWxCb3VuY2luZyB8fCBz ZWxmLmlzSG9yaXpvbnRhbEJvdW5jaW5nIHx8IHNlbGYucmVmcmVzaENvbnRyb2w7CiAgICAgaWYg KCFtaWdodEJlUnViYmVyYmFuZGluZyB8fCBDR1NpemVFcXVhbFRvU2l6ZShjdXJyZW50Q29udGVu dFNpemUsIENHU2l6ZVplcm8pIHx8IENHU2l6ZUVxdWFsVG9TaXplKGN1cnJlbnRDb250ZW50U2l6 ZSwgY29udGVudFNpemUpIHx8IHNlbGYuem9vbVNjYWxlIDwgc2VsZi5taW5pbXVtWm9vbVNjYWxl KSB7CiAgICAgICAgIC8vIEZJWE1FOiByZGFyOi8vcHJvYmxlbS82NTI3Nzc1OSBGaW5kIG91dCB3 aHkgaU9TIE1haWwgbmVlZHMgdGhpcyBjYWxsIGV2ZW4gd2hlbiB0aGUgY29udGVudFNpemUgaGFz IG5vdCBjaGFuZ2VkLgogICAgICAgICBbc2VsZiBzZXRDb250ZW50U2l6ZTpjb250ZW50U2l6ZV07 CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWFl Mjc2NjQxZTY3OTdhYzMxOTQyOWYyMjM3NDVlOWYwYmQ1ZGMyYi4uYzFmNWMxYzE2YTlmZDBhMGVj M2YzNjFlMzdmYThkNGJhMGUwNDA5NyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA1LTI3ICBNYXR0IEdpbGxp Z2FuICA8bWF0dGhld19naWxsaWdhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUHJldmVudCByZXNl dHRpbmcgc2Nyb2xsIHBvc2l0aW9uIGluIHVubmVjZXNzYXJ5IGNhc2VzIGR1cmluZyBwYWdlIGxv YWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjMz OAorICAgICAgICByZGFyOi8vNzUzMzQ2NTEKKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBG cmFzZXIuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9TY3JvbGxWaWV3SW5z ZXRUZXN0cy5tbToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDIxLTA1LTIz ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBDb252ZXJ0IERlc3Rp bmF0aW9uQ29sb3JTcGFjZSBmcm9tIGFuIGVudW0gdG8gY2xhc3Mgd3JhcHBpbmcgYSBwbGF0Zm9y bSBjb2xvciBzcGFjZSAoQ0dDb2xvclNwYWNlUmVmIGZvciBDRyBwb3J0cywgZXRjLikKZGlmZiAt LWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL1Njcm9sbFZpZXdJbnNldFRlc3Rz Lm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvU2Nyb2xsVmlld0luc2V0VGVzdHMu bW0KaW5kZXggN2JiZGU1ZmUzZTc5YmJlN2U2NTNjM2M3NjZmODY5ZTU2YjNhZTNmZC4uNTNiNDE4 OTVlNTUwZDliOTI5ZjBlMWJjOTg1ZjRkNTQyOTk0NzU3NCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9pb3MvU2Nyb2xsVmlld0luc2V0VGVzdHMubW0KKysrIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvU2Nyb2xsVmlld0luc2V0VGVzdHMubW0KQEAgLTI1OSw2 ICsyNTksMjIgQEAgVEVTVChTY3JvbGxWaWV3SW5zZXRUZXN0cywgQ2hhbmdlSW5zZXRXaXRob3V0 QXV0b21hdGljQWRqdXN0bWVudFdoaWxlV2ViUHJvY2Vzc0kKICAgICBFWFBFQ1RfRVEoMCwgW1t3 ZWJWaWV3IHN0cmluZ0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5zY3JvbGxpbmdF bGVtZW50LnNjcm9sbFRvcCJdIGludFZhbHVlXSk7CiB9CiAKK1RFU1QoU2Nyb2xsVmlld0luc2V0 VGVzdHMsIFByZXNlcnZlQ29udGVudE9mZnNldEZvclJlZnJlc2hDb250cm9sKQoreworICAgIGF1 dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1l OkNHUmVjdE1ha2UoMCwgMCwgMzIwLCB2aWV3SGVpZ2h0KV0pOworICAgIFt3ZWJWaWV3IHNjcm9s bFZpZXddLnJlZnJlc2hDb250cm9sID0gYWRvcHROUyhbW1VJUmVmcmVzaENvbnRyb2wgYWxsb2Nd IGluaXRdKS5nZXQoKTsKKyAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZEhUTUxTdHJpbmc6 QCIiXTsKKworICAgIFt3ZWJWaWV3IHNjcm9sbFZpZXddLmNvbnRlbnRPZmZzZXQgPSBDR1BvaW50 TWFrZSgwLCAtMTAwKTsKKworICAgIFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlMb2FkSFRNTFN0cmlu ZzpAIjxib2R5IGJnY29sb3I9J3JlZCc+Il07CisgICAgW3dlYlZpZXcgd2FpdEZvck5leHRQcmVz ZW50YXRpb25VcGRhdGVdOworCisgICAgQ0dQb2ludCBjb250ZW50T2Zmc2V0QWZ0ZXJOYXZpZ2F0 aW9uID0gW3dlYlZpZXcgc2Nyb2xsVmlld10uY29udGVudE9mZnNldDsKKyAgICBFWFBFQ1RfRVEo MCwgY29udGVudE9mZnNldEFmdGVyTmF2aWdhdGlvbi54KTsKKyAgICBFWFBFQ1RfRVEoLTEwMCwg Y29udGVudE9mZnNldEFmdGVyTmF2aWdhdGlvbi55KTsKK30KKwogfSAvLyBuYW1lc3BhY2UgVGVz dFdlYktpdEFQSQogCiAjZW5kaWYgLy8gUExBVEZPUk0oSU9TX0ZBTUlMWSkK