212917 2020-06-08 13:24:07 -0700 Extended Color: Rename Color::lighten() and Color::darken() to Color::lightened() and Color::darkened() 2020-06-08 17:11:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sam sam changseok darin esprehn+autocc ews-watchlist glenn kondapallykalyan pdr webkit-bug-importer oldest_to_newest 1660347 0 sam 2020-06-08 13:24:07 -0700 Extended Color: Rename Color::lighten() and Color::darken() to Color::lightened() and Color::darkened() 1660351 1 401365 sam 2020-06-08 13:31:28 -0700 Created attachment 401365 Patch 1660394 2 ews-feeder 2020-06-08 14:35:57 -0700 Tools/Scripts/svn-apply failed to apply attachment 401365 to trunk. Please resolve the conflicts and upload a new patch. 1660465 3 401391 sam 2020-06-08 16:06:32 -0700 Created attachment 401391 Patch 1660466 4 ews-feeder 2020-06-08 16:08:31 -0700 ChangeLog entry in Tools/ChangeLog contains OOPS!. 1660469 5 401393 sam 2020-06-08 16:12:24 -0700 Created attachment 401393 Patch 1660485 6 401393 darin 2020-06-08 16:30:30 -0700 Comment on attachment 401393 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401393&action=review > Tools/TestWebKitAPI/Tests/WebCore/ColorTests.cpp:222 > + auto cLigtened = Color(c).lightened().toSRGBASimpleColorLossy(); typo in existing code: "ligtened" 1660489 7 sam 2020-06-08 16:40:22 -0700 (In reply to Darin Adler from comment #6) > Comment on attachment 401393 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=401393&action=review > > > Tools/TestWebKitAPI/Tests/WebCore/ColorTests.cpp:222 > > + auto cLigtened = Color(c).lightened().toSRGBASimpleColorLossy(); > > typo in existing code: "ligtened" Gaaaaa :). I'll get it right one of these times. 1660506 8 ews-feeder 2020-06-08 17:11:00 -0700 Committed r262753: <https://trac.webkit.org/changeset/262753> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401393. 1660507 9 webkit-bug-importer 2020-06-08 17:11:18 -0700 <rdar://problem/64141679> 401365 2020-06-08 13:31:28 -0700 2020-06-08 16:06:31 -0700 Patch bug-212917-20200608133127.patch text/plain 7013 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2MjczNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA2LTA4ICBTYW0gV2Vp bmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBFeHRlbmRlZCBDb2xvcjogUmVuYW1l IENvbG9yOjpsaWdodGVuKCkgYW5kIENvbG9yOjpkYXJrZW4oKSB0byBDb2xvcjo6bGlnaHRlbmVk KCkgYW5kIENvbG9yOjpkYXJrZW5lZCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTI5MTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGRyZXNzZXMgZmVlZGJhY2sgZnJvbSBEYXJpbi4KKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbG9y OjpsaWdodGVuZWQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q29sb3I6OmRhcmtlbmVkIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbG9yOjpsaWdodGVuIGNvbnN0KTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkNvcmU6OkNvbG9yOjpkYXJrZW4gY29uc3QpOiBEZWxldGVkLgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmNhbGN1bGF0ZUJv cmRlclN0eWxlQ29sb3IpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZTo6ZGlzYWJsZWRUZXh0Q29sb3IgY29uc3QpOgor ICAgICAgICAqIHJlbmRlcmluZy9UZXh0UGFpbnRTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjphZGp1c3RDb2xvckZvclZpc2liaWxpdHlPbkJhY2tncm91bmQpOgorCiAyMDIwLTA2LTA4ICBE YXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgW0lQQ10gQWRvcHQg ZW51bSBjbGFzcyBmb3IgRHJhZ09wZXJhdGlvbgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvQ29sb3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0NvbG9yLmNwcAkocmV2aXNpb24gMjYyNzM1KQorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDAsNyAr MTAwLDcgQEAgU3RyaW5nIENvbG9yOjpuYW1lRm9yUmVuZGVyVHJlZUFzVGV4dCgpIAogICAgIHJl dHVybiBhc1NpbXBsZSgpLnNlcmlhbGl6YXRpb25Gb3JSZW5kZXJUcmVlQXNUZXh0KCk7CiB9CiAK LUNvbG9yIENvbG9yOjpsaWdodGVuKCkgY29uc3QKK0NvbG9yIENvbG9yOjpsaWdodGVuZWQoKSBj b25zdAogewogICAgIC8vIEhhcmRjb2RlIHRoaXMgY29tbW9uIGNhc2UgZm9yIHNwZWVkLgogICAg IGlmICghaXNFeHRlbmRlZCgpICYmIGFzU2ltcGxlKCkgPT0gYmxhY2spCkBAIC0xMTcsNyArMTE3 LDcgQEAgQ29sb3IgQ29sb3I6OmxpZ2h0ZW4oKSBjb25zdAogICAgIHJldHVybiBtYWtlU2ltcGxl Q29sb3JGcm9tRmxvYXRzKG11bHRpcGxpZXIgKiByLCBtdWx0aXBsaWVyICogZywgbXVsdGlwbGll ciAqIGIsIGEpOwogfQogCi1Db2xvciBDb2xvcjo6ZGFya2VuKCkgY29uc3QKK0NvbG9yIENvbG9y OjpkYXJrZW5lZCgpIGNvbnN0CiB7CiAgICAgLy8gSGFyZGNvZGUgdGhpcyBjb21tb24gY2FzZSBm b3Igc3BlZWQuCiAgICAgaWYgKCFpc0V4dGVuZGVkKCkgJiYgYXNTaW1wbGUoKSA9PSB3aGl0ZSkK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuaAkocmV2aXNpb24g MjYyNzM1KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuaAkod29y a2luZyBjb3B5KQpAQCAtMTM1LDggKzEzNSw4IEBAIHB1YmxpYzoKICAgICAvLyBUaGlzIHdpbGwg Y29udmVydCBub24tc1JHQiBjb2xvcnNwYWNlIGNvbG9ycyBpbnRvIHNSR0IuCiAgICAgV0VCQ09S RV9FWFBPUlQgQ29sb3JDb21wb25lbnRzPGZsb2F0PiB0b1NSR0JBQ29tcG9uZW50c0xvc3N5KCkg Y29uc3Q7CiAKLSAgICBXRUJDT1JFX0VYUE9SVCBDb2xvciBsaWdodGVuKCkgY29uc3Q7Ci0gICAg V0VCQ09SRV9FWFBPUlQgQ29sb3IgZGFya2VuKCkgY29uc3Q7CisgICAgV0VCQ09SRV9FWFBPUlQg Q29sb3IgbGlnaHRlbmVkKCkgY29uc3Q7CisgICAgV0VCQ09SRV9FWFBPUlQgQ29sb3IgZGFya2Vu ZWQoKSBjb25zdDsKIAogICAgIFdFQkNPUkVfRVhQT1JUIGZsb2F0IGx1bWluYW5jZSgpIGNvbnN0 OwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAkocmV2 aXNpb24gMjYyNzM1KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTE4MTUsMTAgKzE4MTUsMTAgQEAgdm9pZCBSZW5kZXJPYmpl Y3Q6OmNhbGN1bGF0ZUJvcmRlclN0eWxlQwogICAgIC8vIEhlcmUgd2Ugd2lsbCBkYXJrZW4gdGhl IGJvcmRlciBkZWNvcmF0aW9uIGNvbG9yIHdoZW4gbmVlZGVkLiBUaGlzIHdpbGwgeWllbGQgYSBz aW1pbGFyIGJlaGF2aW9yIGFzIGluIEZGLgogICAgIGlmIChvcGVyYXRpb24gPT0gRGFya2VuKSB7 CiAgICAgICAgIGlmIChjb2xvci5sdW1pbmFuY2UoKSA+IGJhc2VEYXJrQ29sb3JMdW1pbmFuY2Up Ci0gICAgICAgICAgICBjb2xvciA9IGNvbG9yLmRhcmtlbigpOworICAgICAgICAgICAgY29sb3Ig PSBjb2xvci5kYXJrZW5lZCgpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIGlmIChjb2xvci5sdW1p bmFuY2UoKSA8IGJhc2VMaWdodENvbG9yTHVtaW5hbmNlKQotICAgICAgICAgICAgY29sb3IgPSBj b2xvci5saWdodGVuKCk7CisgICAgICAgICAgICBjb2xvciA9IGNvbG9yLmxpZ2h0ZW5lZCgpOwog ICAgIH0KIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3Bw CShyZXZpc2lvbiAyNjI3MzUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhl bWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMzk0LDkgKzEzOTQsOSBAQCBDb2xvciBSZW5kZXJU aGVtZTo6ZGlzYWJsZWRUZXh0Q29sb3IoY29uCiAgICAgLy8gVGhpcyBhbHNvIG1lYW5zIHRoYXQg YmxhY2sgb24gYmxhY2sgd2lsbCB0dXJuIGludG8gZ3JleSBvbiBibGFjayB3aGVuIGRpc2FibGVk LgogICAgIENvbG9yIGRpc2FibGVkQ29sb3I7CiAgICAgaWYgKGVxdWFsSWdub3JpbmdTZW1hbnRp Y0NvbG9yKHRleHRDb2xvciwgQ29sb3I6OmJsYWNrKSB8fCBiYWNrZ3JvdW5kQ29sb3IuYWxwaGFB c0Zsb2F0KCkgPCBtaW5EaXNhYmxlZENvbG9yQWxwaGFWYWx1ZSB8fCB0ZXh0Q29sb3IubHVtaW5h bmNlKCkgPCBiYWNrZ3JvdW5kQ29sb3IubHVtaW5hbmNlKCkpCi0gICAgICAgIGRpc2FibGVkQ29s b3IgPSB0ZXh0Q29sb3IubGlnaHRlbigpOworICAgICAgICBkaXNhYmxlZENvbG9yID0gdGV4dENv bG9yLmxpZ2h0ZW5lZCgpOwogICAgIGVsc2UKLSAgICAgICAgZGlzYWJsZWRDb2xvciA9IHRleHRD b2xvci5kYXJrZW4oKTsKKyAgICAgICAgZGlzYWJsZWRDb2xvciA9IHRleHRDb2xvci5kYXJrZW5l ZCgpOwogICAgIAogICAgIC8vIElmIHRoZXJlJ3Mgbm90IHZlcnkgbXVjaCBjb250cmFzdCBiZXR3 ZWVuIHRoZSBkaXNhYmxlZCBjb2xvciBhbmQgdGhlIGJhY2tncm91bmQgY29sb3IsCiAgICAgLy8g anVzdCBsZWF2ZSB0aGUgdGV4dCBjb2xvciBhbG9uZS4gV2UgZG9uJ3Qgd2FudCB0byBjaGFuZ2Ug YSBnb29kIGNvbnRyYXN0IGNvbG9yIHNjaGVtZSBzbyB0aGF0IGl0IGhhcyByZWFsbHkgYmFkIGNv bnRyYXN0LgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1RleHRQYWludFN0eWxlLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dFBhaW50U3R5bGUu Y3BwCShyZXZpc2lvbiAyNjI3MzUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dFBh aW50U3R5bGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03Miw4ICs3Miw4IEBAIHN0YXRpYyBDb2xv ciBhZGp1c3RDb2xvckZvclZpc2liaWxpdHlPbkIKICAgICAgICAgcmV0dXJuIHRleHRDb2xvcjsK IAogICAgIGlmICh0ZXh0Q29sb3IubHVtaW5hbmNlKCkgPiAwLjUpCi0gICAgICAgIHJldHVybiB0 ZXh0Q29sb3IuZGFya2VuKCk7Ci0gICAgcmV0dXJuIHRleHRDb2xvci5saWdodGVuKCk7CisgICAg ICAgIHJldHVybiB0ZXh0Q29sb3IuZGFya2VuZWQoKTsKKyAgICByZXR1cm4gdGV4dENvbG9yLmxp Z2h0ZW5lZCgpOwogfQogCiBUZXh0UGFpbnRTdHlsZSBjb21wdXRlVGV4dFBhaW50U3R5bGUoY29u c3QgRnJhbWUmIGZyYW1lLCBjb25zdCBSZW5kZXJTdHlsZSYgbGluZVN0eWxlLCBjb25zdCBQYWlu dEluZm8mIHBhaW50SW5mbykKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2MjczNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIwLTA2LTA4ICBTYW0gV2VpbmlnICA8d2Vp bmlnQGFwcGxlLmNvbT4KKworICAgICAgICBFeHRlbmRlZCBDb2xvcjogUmVuYW1lIENvbG9yOjps aWdodGVuKCkgYW5kIENvbG9yOjpkYXJrZW4oKSB0byBDb2xvcjo6bGlnaHRlbmVkKCkgYW5kIENv bG9yOjpkYXJrZW5lZCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTI5MTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGRyZXNzZXMgZmVlZGJhY2sgZnJvbSBEYXJpbi4KKworICAgICAgICAqIFRlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Db2xvclRlc3RzLmNwcDoKKyAgICAgICAgKFRlc3RXZWJL aXRBUEk6OlRFU1QpOgorCiAyMDIwLTA2LTA4ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBs ZS5jb20+CiAKICAgICAgICAgW0lQQ10gQWRvcHQgZW51bSBjbGFzcyBmb3IgRHJhZ09wZXJhdGlv bgpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL0NvbG9yVGVzdHMuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Db2xvclRl c3RzLmNwcAkocmV2aXNpb24gMjYyNzMzKQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJDb3JlL0NvbG9yVGVzdHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTksMTcgKzIxOSwxNyBA QCBURVNUKENvbG9yLCBMdW1pbmFuY2UpCiAgICAgRVhQRUNUX0VRKGMuZ3JlZW5Db21wb25lbnQo KSwgOTApOwogICAgIEVYUEVDVF9FUShjLmJsdWVDb21wb25lbnQoKSwgMTYwKTsKIAotICAgIGF1 dG8gY0xpZ3RlbmVkID0gQ29sb3IoYykubGlnaHRlbigpLnRvU1JHQkFTaW1wbGVDb2xvckxvc3N5 KCk7CisgICAgYXV0byBjTGlndGVuZWQgPSBDb2xvcihjKS5saWdodGVuZWQoKS50b1NSR0JBU2lt cGxlQ29sb3JMb3NzeSgpOwogICAgIEVYUEVDVF9GTE9BVF9FUShDb2xvcihjTGlndGVuZWQpLmx1 bWluYW5jZSgpLCAwLjI5MjI5NzI0KTsKICAgICBFWFBFQ1RfRVEoY0xpZ3RlbmVkLnJlZENvbXBv bmVudCgpLCAxMzApOwogICAgIEVYUEVDVF9FUShjTGlndGVuZWQuZ3JlZW5Db21wb25lbnQoKSwg MTM3KTsKICAgICBFWFBFQ1RfRVEoY0xpZ3RlbmVkLmJsdWVDb21wb25lbnQoKSwgMjQ1KTsKIAot ICAgIGF1dG8gY0RhcmtlbiA9IENvbG9yKGMpLmRhcmtlbigpLnRvU1JHQkFTaW1wbGVDb2xvckxv c3N5KCk7Ci0gICAgRVhQRUNUX0ZMT0FUX0VRKENvbG9yKGNEYXJrZW4pLmx1bWluYW5jZSgpLCAw LjAyNjI4ODQ3Nik7Ci0gICAgRVhQRUNUX0VRKGNEYXJrZW4ucmVkQ29tcG9uZW50KCksIDQwKTsK LSAgICBFWFBFQ1RfRVEoY0Rhcmtlbi5ncmVlbkNvbXBvbmVudCgpLCA0Mik7Ci0gICAgRVhQRUNU X0VRKGNEYXJrZW4uYmx1ZUNvbXBvbmVudCgpLCA3Nik7CisgICAgYXV0byBjRGFya2VuZWQgPSBD b2xvcihjKS5kYXJrZW5lZCgpLnRvU1JHQkFTaW1wbGVDb2xvckxvc3N5KCk7CisgICAgRVhQRUNU X0ZMT0FUX0VRKENvbG9yKGNEYXJrZW5lZCkubHVtaW5hbmNlKCksIDAuMDI2Mjg4NDc2KTsKKyAg ICBFWFBFQ1RfRVEoY0RhcmtlbmVkLnJlZENvbXBvbmVudCgpLCA0MCk7CisgICAgRVhQRUNUX0VR KGNEYXJrZW5lZC5ncmVlbkNvbXBvbmVudCgpLCA0Mik7CisgICAgRVhQRUNUX0VRKGNEYXJrZW5l ZC5ibHVlQ29tcG9uZW50KCksIDc2KTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgVGVzdFdlYktpdEFQ SQo= 401391 2020-06-08 16:06:32 -0700 2020-06-08 16:12:23 -0700 Patch bug-212917-20200608160632.patch text/plain 7486 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2Mjc0NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA2LTA4ICBTYW0gV2Vp bmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBFeHRlbmRlZCBDb2xvcjogUmVuYW1l IENvbG9yOjpsaWdodGVuKCkgYW5kIENvbG9yOjpkYXJrZW4oKSB0byBDb2xvcjo6bGlnaHRlbmVk KCkgYW5kIENvbG9yOjpkYXJrZW5lZCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTI5MTcKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxl ci4KKworICAgICAgICBBZGRyZXNzZXMgZmVlZGJhY2sgZnJvbSBEYXJpbi4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbG9yOjps aWdodGVuZWQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q29sb3I6OmRhcmtlbmVkIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbG9yOjpsaWdodGVuIGNvbnN0KTogRGVsZXRlZC4KKyAg ICAgICAgKFdlYkNvcmU6OkNvbG9yOjpkYXJrZW4gY29uc3QpOiBEZWxldGVkLgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9i amVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmNhbGN1bGF0ZUJvcmRl clN0eWxlQ29sb3IpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZTo6ZGlzYWJsZWRUZXh0Q29sb3IgY29uc3QpOgorICAg ICAgICAqIHJlbmRlcmluZy9UZXh0UGFpbnRTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjph ZGp1c3RDb2xvckZvclZpc2liaWxpdHlPbkJhY2tncm91bmQpOgorCiAyMDIwLTA2LTA4ICBQaW5r aSBHeWFuY2hhbmRhbmkgIDxwZ3lhbmNoYW5kYW5pQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWxl YXNlIEFzc2VydCBAIFdlYkNvcmU6OlJlbmRlclRyZWVCdWlsZGVyOjpSZW5kZXJUcmVlQnVpbGRl cgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmNwcAkocmV2 aXNpb24gMjYyNzQ3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3Iu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDAsNyArMTAwLDcgQEAgU3RyaW5nIENvbG9yOjpuYW1l Rm9yUmVuZGVyVHJlZUFzVGV4dCgpIAogICAgIHJldHVybiBhc1NpbXBsZSgpLnNlcmlhbGl6YXRp b25Gb3JSZW5kZXJUcmVlQXNUZXh0KCk7CiB9CiAKLUNvbG9yIENvbG9yOjpsaWdodGVuKCkgY29u c3QKK0NvbG9yIENvbG9yOjpsaWdodGVuZWQoKSBjb25zdAogewogICAgIC8vIEhhcmRjb2RlIHRo aXMgY29tbW9uIGNhc2UgZm9yIHNwZWVkLgogICAgIGlmICghaXNFeHRlbmRlZCgpICYmIGFzU2lt cGxlKCkgPT0gYmxhY2spCkBAIC0xMTcsNyArMTE3LDcgQEAgQ29sb3IgQ29sb3I6OmxpZ2h0ZW4o KSBjb25zdAogICAgIHJldHVybiBtYWtlU2ltcGxlQ29sb3JGcm9tRmxvYXRzKG11bHRpcGxpZXIg KiByLCBtdWx0aXBsaWVyICogZywgbXVsdGlwbGllciAqIGIsIGEpOwogfQogCi1Db2xvciBDb2xv cjo6ZGFya2VuKCkgY29uc3QKK0NvbG9yIENvbG9yOjpkYXJrZW5lZCgpIGNvbnN0CiB7CiAgICAg Ly8gSGFyZGNvZGUgdGhpcyBjb21tb24gY2FzZSBmb3Igc3BlZWQuCiAgICAgaWYgKCFpc0V4dGVu ZGVkKCkgJiYgYXNTaW1wbGUoKSA9PSB3aGl0ZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0NvbG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvQ29sb3IuaAkocmV2aXNpb24gMjYyNzQ3KQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuaAkod29ya2luZyBjb3B5KQpAQCAtMTM1LDggKzEzNSw4 IEBAIHB1YmxpYzoKICAgICAvLyBUaGlzIHdpbGwgY29udmVydCBub24tc1JHQiBjb2xvcnNwYWNl IGNvbG9ycyBpbnRvIHNSR0IuCiAgICAgV0VCQ09SRV9FWFBPUlQgQ29sb3JDb21wb25lbnRzPGZs b2F0PiB0b1NSR0JBQ29tcG9uZW50c0xvc3N5KCkgY29uc3Q7CiAKLSAgICBXRUJDT1JFX0VYUE9S VCBDb2xvciBsaWdodGVuKCkgY29uc3Q7Ci0gICAgV0VCQ09SRV9FWFBPUlQgQ29sb3IgZGFya2Vu KCkgY29uc3Q7CisgICAgV0VCQ09SRV9FWFBPUlQgQ29sb3IgbGlnaHRlbmVkKCkgY29uc3Q7Cisg ICAgV0VCQ09SRV9FWFBPUlQgQ29sb3IgZGFya2VuZWQoKSBjb25zdDsKIAogICAgIFdFQkNPUkVf RVhQT1JUIGZsb2F0IGx1bWluYW5jZSgpIGNvbnN0OwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAkocmV2aXNpb24gMjYyNzQ3KQorKysgU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4MTUs MTAgKzE4MTUsMTAgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OmNhbGN1bGF0ZUJvcmRlclN0eWxlQwog ICAgIC8vIEhlcmUgd2Ugd2lsbCBkYXJrZW4gdGhlIGJvcmRlciBkZWNvcmF0aW9uIGNvbG9yIHdo ZW4gbmVlZGVkLiBUaGlzIHdpbGwgeWllbGQgYSBzaW1pbGFyIGJlaGF2aW9yIGFzIGluIEZGLgog ICAgIGlmIChvcGVyYXRpb24gPT0gRGFya2VuKSB7CiAgICAgICAgIGlmIChjb2xvci5sdW1pbmFu Y2UoKSA+IGJhc2VEYXJrQ29sb3JMdW1pbmFuY2UpCi0gICAgICAgICAgICBjb2xvciA9IGNvbG9y LmRhcmtlbigpOworICAgICAgICAgICAgY29sb3IgPSBjb2xvci5kYXJrZW5lZCgpOwogICAgIH0g ZWxzZSB7CiAgICAgICAgIGlmIChjb2xvci5sdW1pbmFuY2UoKSA8IGJhc2VMaWdodENvbG9yTHVt aW5hbmNlKQotICAgICAgICAgICAgY29sb3IgPSBjb2xvci5saWdodGVuKCk7CisgICAgICAgICAg ICBjb2xvciA9IGNvbG9yLmxpZ2h0ZW5lZCgpOwogICAgIH0KIH0KIApJbmRleDogU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCShyZXZpc2lvbiAyNjI3NDcpCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x Mzk0LDkgKzEzOTQsOSBAQCBDb2xvciBSZW5kZXJUaGVtZTo6ZGlzYWJsZWRUZXh0Q29sb3IoY29u CiAgICAgLy8gVGhpcyBhbHNvIG1lYW5zIHRoYXQgYmxhY2sgb24gYmxhY2sgd2lsbCB0dXJuIGlu dG8gZ3JleSBvbiBibGFjayB3aGVuIGRpc2FibGVkLgogICAgIENvbG9yIGRpc2FibGVkQ29sb3I7 CiAgICAgaWYgKGVxdWFsSWdub3JpbmdTZW1hbnRpY0NvbG9yKHRleHRDb2xvciwgQ29sb3I6OmJs YWNrKSB8fCBiYWNrZ3JvdW5kQ29sb3IuYWxwaGFBc0Zsb2F0KCkgPCBtaW5EaXNhYmxlZENvbG9y QWxwaGFWYWx1ZSB8fCB0ZXh0Q29sb3IubHVtaW5hbmNlKCkgPCBiYWNrZ3JvdW5kQ29sb3IubHVt aW5hbmNlKCkpCi0gICAgICAgIGRpc2FibGVkQ29sb3IgPSB0ZXh0Q29sb3IubGlnaHRlbigpOwor ICAgICAgICBkaXNhYmxlZENvbG9yID0gdGV4dENvbG9yLmxpZ2h0ZW5lZCgpOwogICAgIGVsc2UK LSAgICAgICAgZGlzYWJsZWRDb2xvciA9IHRleHRDb2xvci5kYXJrZW4oKTsKKyAgICAgICAgZGlz YWJsZWRDb2xvciA9IHRleHRDb2xvci5kYXJrZW5lZCgpOwogICAgIAogICAgIC8vIElmIHRoZXJl J3Mgbm90IHZlcnkgbXVjaCBjb250cmFzdCBiZXR3ZWVuIHRoZSBkaXNhYmxlZCBjb2xvciBhbmQg dGhlIGJhY2tncm91bmQgY29sb3IsCiAgICAgLy8ganVzdCBsZWF2ZSB0aGUgdGV4dCBjb2xvciBh bG9uZS4gV2UgZG9uJ3Qgd2FudCB0byBjaGFuZ2UgYSBnb29kIGNvbnRyYXN0IGNvbG9yIHNjaGVt ZSBzbyB0aGF0IGl0IGhhcyByZWFsbHkgYmFkIGNvbnRyYXN0LgpJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1RleHRQYWludFN0eWxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvVGV4dFBhaW50U3R5bGUuY3BwCShyZXZpc2lvbiAyNjI3NDcpCisrKyBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dFBhaW50U3R5bGUuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC03Miw4ICs3Miw4IEBAIHN0YXRpYyBDb2xvciBhZGp1c3RDb2xvckZvclZpc2liaWxpdHlP bkIKICAgICAgICAgcmV0dXJuIHRleHRDb2xvcjsKIAogICAgIGlmICh0ZXh0Q29sb3IubHVtaW5h bmNlKCkgPiAwLjUpCi0gICAgICAgIHJldHVybiB0ZXh0Q29sb3IuZGFya2VuKCk7Ci0gICAgcmV0 dXJuIHRleHRDb2xvci5saWdodGVuKCk7CisgICAgICAgIHJldHVybiB0ZXh0Q29sb3IuZGFya2Vu ZWQoKTsKKyAgICByZXR1cm4gdGV4dENvbG9yLmxpZ2h0ZW5lZCgpOwogfQogCiBUZXh0UGFpbnRT dHlsZSBjb21wdXRlVGV4dFBhaW50U3R5bGUoY29uc3QgRnJhbWUmIGZyYW1lLCBjb25zdCBSZW5k ZXJTdHlsZSYgbGluZVN0eWxlLCBjb25zdCBQYWludEluZm8mIHBhaW50SW5mbykKSW5kZXg6IFRv b2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2 Mjc0NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBA CisyMDIwLTA2LTA4ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBF eHRlbmRlZCBDb2xvcjogUmVuYW1lIENvbG9yOjpsaWdodGVuKCkgYW5kIENvbG9yOjpkYXJrZW4o KSB0byBDb2xvcjo6bGlnaHRlbmVkKCkgYW5kIENvbG9yOjpkYXJrZW5lZCgpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTI5MTcKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRyZXNzZXMgZmVlZGJhY2sg ZnJvbSBEYXJpbi4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Db2xv clRlc3RzLmNwcDoKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCisyMDIwLTA2LTA4 ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBFeHRlbmRlZCBDb2xv cjogUmVuYW1lIENvbG9yOjpsaWdodGVuKCkgYW5kIENvbG9yOjpkYXJrZW4oKSB0byBDb2xvcjo6 bGlnaHRlbmVkKCkgYW5kIENvbG9yOjpkYXJrZW5lZCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTI5MTcKKworICAgICAgICBSZXZpZXdlZCBieSBE YXJpbiBBZGxlci4KKworICAgICAgICBBZGRyZXNzZXMgZmVlZGJhY2sgZnJvbSBEYXJpbi4KKwor ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Db2xvclRlc3RzLmNwcDoKKyAg ICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDIwLTA2LTA4ICBTYW0gV2VpbmlnICA8 d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBFeHRlbmRlZCBDb2xvcjogUmVuYW1lIENvbG9y OjpsaWdodGVuKCkgYW5kIENvbG9yOjpkYXJrZW4oKSB0byBDb2xvcjo6bGlnaHRlbmVkKCkgYW5k IENvbG9yOjpkYXJrZW5lZCgpCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNv cmUvQ29sb3JUZXN0cy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJDb3JlL0NvbG9yVGVzdHMuY3BwCShyZXZpc2lvbiAyNjI3NDcpCisrKyBUb29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvQ29sb3JUZXN0cy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTIxOSwxNyArMjE5LDE3IEBAIFRFU1QoQ29sb3IsIEx1bWluYW5jZSkKICAgICBFWFBFQ1RfRVEo Yy5ncmVlbkNvbXBvbmVudCgpLCA5MCk7CiAgICAgRVhQRUNUX0VRKGMuYmx1ZUNvbXBvbmVudCgp LCAxNjApOwogCi0gICAgYXV0byBjTGlndGVuZWQgPSBDb2xvcihjKS5saWdodGVuKCkudG9TUkdC QVNpbXBsZUNvbG9yTG9zc3koKTsKKyAgICBhdXRvIGNMaWd0ZW5lZCA9IENvbG9yKGMpLmxpZ2h0 ZW5lZCgpLnRvU1JHQkFTaW1wbGVDb2xvckxvc3N5KCk7CiAgICAgRVhQRUNUX0ZMT0FUX0VRKENv bG9yKGNMaWd0ZW5lZCkubHVtaW5hbmNlKCksIDAuMjkxNjg4MDgpOwogICAgIEVYUEVDVF9FUShj TGlndGVuZWQucmVkQ29tcG9uZW50KCksIDEzMCk7CiAgICAgRVhQRUNUX0VRKGNMaWd0ZW5lZC5n cmVlbkNvbXBvbmVudCgpLCAxMzcpOwogICAgIEVYUEVDVF9FUShjTGlndGVuZWQuYmx1ZUNvbXBv bmVudCgpLCAyNDQpOwogCi0gICAgYXV0byBjRGFya2VuID0gQ29sb3IoYykuZGFya2VuKCkudG9T UkdCQVNpbXBsZUNvbG9yTG9zc3koKTsKLSAgICBFWFBFQ1RfRkxPQVRfRVEoQ29sb3IoY0Rhcmtl bikubHVtaW5hbmNlKCksIDAuMDI3MDA2NzI3KTsKLSAgICBFWFBFQ1RfRVEoY0Rhcmtlbi5yZWRD b21wb25lbnQoKSwgNDApOwotICAgIEVYUEVDVF9FUShjRGFya2VuLmdyZWVuQ29tcG9uZW50KCks IDQzKTsKLSAgICBFWFBFQ1RfRVEoY0Rhcmtlbi5ibHVlQ29tcG9uZW50KCksIDc2KTsKKyAgICBh dXRvIGNEYXJrZW5lZCA9IENvbG9yKGMpLmRhcmtlbmVkKCkudG9TUkdCQVNpbXBsZUNvbG9yTG9z c3koKTsKKyAgICBFWFBFQ1RfRkxPQVRfRVEoQ29sb3IoY0RhcmtlbmVkKS5sdW1pbmFuY2UoKSwg MC4wMjcwMDY3MjcpOworICAgIEVYUEVDVF9FUShjRGFya2VuZWQucmVkQ29tcG9uZW50KCksIDQw KTsKKyAgICBFWFBFQ1RfRVEoY0RhcmtlbmVkLmdyZWVuQ29tcG9uZW50KCksIDQzKTsKKyAgICBF WFBFQ1RfRVEoY0RhcmtlbmVkLmJsdWVDb21wb25lbnQoKSwgNzYpOwogfQogCiB9IC8vIG5hbWVz cGFjZSBUZXN0V2ViS2l0QVBJCg== 401393 2020-06-08 16:12:24 -0700 2020-06-08 17:11:01 -0700 Patch bug-212917-20200608161223.patch text/plain 7027 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2Mjc0NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA2LTA4ICBTYW0gV2Vp bmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBFeHRlbmRlZCBDb2xvcjogUmVuYW1l IENvbG9yOjpsaWdodGVuKCkgYW5kIENvbG9yOjpkYXJrZW4oKSB0byBDb2xvcjo6bGlnaHRlbmVk KCkgYW5kIENvbG9yOjpkYXJrZW5lZCgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTI5MTcKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxl ci4KKworICAgICAgICBBZGRyZXNzZXMgZmVlZGJhY2sgZnJvbSBEYXJpbi4KKworICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbG9yOjps aWdodGVuZWQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6Q29sb3I6OmRhcmtlbmVkIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbG9yOjpsaWdodGVuIGNvbnN0KTogRGVsZXRlZC4KKyAg ICAgICAgKFdlYkNvcmU6OkNvbG9yOjpkYXJrZW4gY29uc3QpOiBEZWxldGVkLgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9i amVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OmNhbGN1bGF0ZUJvcmRl clN0eWxlQ29sb3IpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZTo6ZGlzYWJsZWRUZXh0Q29sb3IgY29uc3QpOgorICAg ICAgICAqIHJlbmRlcmluZy9UZXh0UGFpbnRTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjph ZGp1c3RDb2xvckZvclZpc2liaWxpdHlPbkJhY2tncm91bmQpOgorCiAyMDIwLTA2LTA4ICBQaW5r aSBHeWFuY2hhbmRhbmkgIDxwZ3lhbmNoYW5kYW5pQGFwcGxlLmNvbT4KIAogICAgICAgICBSZWxl YXNlIEFzc2VydCBAIFdlYkNvcmU6OlJlbmRlclRyZWVCdWlsZGVyOjpSZW5kZXJUcmVlQnVpbGRl cgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0NvbG9yLmNwcAkocmV2 aXNpb24gMjYyNzQ3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3Iu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDAsNyArMTAwLDcgQEAgU3RyaW5nIENvbG9yOjpuYW1l Rm9yUmVuZGVyVHJlZUFzVGV4dCgpIAogICAgIHJldHVybiBhc1NpbXBsZSgpLnNlcmlhbGl6YXRp b25Gb3JSZW5kZXJUcmVlQXNUZXh0KCk7CiB9CiAKLUNvbG9yIENvbG9yOjpsaWdodGVuKCkgY29u c3QKK0NvbG9yIENvbG9yOjpsaWdodGVuZWQoKSBjb25zdAogewogICAgIC8vIEhhcmRjb2RlIHRo aXMgY29tbW9uIGNhc2UgZm9yIHNwZWVkLgogICAgIGlmICghaXNFeHRlbmRlZCgpICYmIGFzU2lt cGxlKCkgPT0gYmxhY2spCkBAIC0xMTcsNyArMTE3LDcgQEAgQ29sb3IgQ29sb3I6OmxpZ2h0ZW4o KSBjb25zdAogICAgIHJldHVybiBtYWtlU2ltcGxlQ29sb3JGcm9tRmxvYXRzKG11bHRpcGxpZXIg KiByLCBtdWx0aXBsaWVyICogZywgbXVsdGlwbGllciAqIGIsIGEpOwogfQogCi1Db2xvciBDb2xv cjo6ZGFya2VuKCkgY29uc3QKK0NvbG9yIENvbG9yOjpkYXJrZW5lZCgpIGNvbnN0CiB7CiAgICAg Ly8gSGFyZGNvZGUgdGhpcyBjb21tb24gY2FzZSBmb3Igc3BlZWQuCiAgICAgaWYgKCFpc0V4dGVu ZGVkKCkgJiYgYXNTaW1wbGUoKSA9PSB3aGl0ZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0NvbG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvQ29sb3IuaAkocmV2aXNpb24gMjYyNzQ3KQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvQ29sb3IuaAkod29ya2luZyBjb3B5KQpAQCAtMTM1LDggKzEzNSw4 IEBAIHB1YmxpYzoKICAgICAvLyBUaGlzIHdpbGwgY29udmVydCBub24tc1JHQiBjb2xvcnNwYWNl IGNvbG9ycyBpbnRvIHNSR0IuCiAgICAgV0VCQ09SRV9FWFBPUlQgQ29sb3JDb21wb25lbnRzPGZs b2F0PiB0b1NSR0JBQ29tcG9uZW50c0xvc3N5KCkgY29uc3Q7CiAKLSAgICBXRUJDT1JFX0VYUE9S VCBDb2xvciBsaWdodGVuKCkgY29uc3Q7Ci0gICAgV0VCQ09SRV9FWFBPUlQgQ29sb3IgZGFya2Vu KCkgY29uc3Q7CisgICAgV0VCQ09SRV9FWFBPUlQgQ29sb3IgbGlnaHRlbmVkKCkgY29uc3Q7Cisg ICAgV0VCQ09SRV9FWFBPUlQgQ29sb3IgZGFya2VuZWQoKSBjb25zdDsKIAogICAgIFdFQkNPUkVf RVhQT1JUIGZsb2F0IGx1bWluYW5jZSgpIGNvbnN0OwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAkocmV2aXNpb24gMjYyNzQ3KQorKysgU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4MTUs MTAgKzE4MTUsMTAgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OmNhbGN1bGF0ZUJvcmRlclN0eWxlQwog ICAgIC8vIEhlcmUgd2Ugd2lsbCBkYXJrZW4gdGhlIGJvcmRlciBkZWNvcmF0aW9uIGNvbG9yIHdo ZW4gbmVlZGVkLiBUaGlzIHdpbGwgeWllbGQgYSBzaW1pbGFyIGJlaGF2aW9yIGFzIGluIEZGLgog ICAgIGlmIChvcGVyYXRpb24gPT0gRGFya2VuKSB7CiAgICAgICAgIGlmIChjb2xvci5sdW1pbmFu Y2UoKSA+IGJhc2VEYXJrQ29sb3JMdW1pbmFuY2UpCi0gICAgICAgICAgICBjb2xvciA9IGNvbG9y LmRhcmtlbigpOworICAgICAgICAgICAgY29sb3IgPSBjb2xvci5kYXJrZW5lZCgpOwogICAgIH0g ZWxzZSB7CiAgICAgICAgIGlmIChjb2xvci5sdW1pbmFuY2UoKSA8IGJhc2VMaWdodENvbG9yTHVt aW5hbmNlKQotICAgICAgICAgICAgY29sb3IgPSBjb2xvci5saWdodGVuKCk7CisgICAgICAgICAg ICBjb2xvciA9IGNvbG9yLmxpZ2h0ZW5lZCgpOwogICAgIH0KIH0KIApJbmRleDogU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCShyZXZpc2lvbiAyNjI3NDcpCisrKyBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x Mzk0LDkgKzEzOTQsOSBAQCBDb2xvciBSZW5kZXJUaGVtZTo6ZGlzYWJsZWRUZXh0Q29sb3IoY29u CiAgICAgLy8gVGhpcyBhbHNvIG1lYW5zIHRoYXQgYmxhY2sgb24gYmxhY2sgd2lsbCB0dXJuIGlu dG8gZ3JleSBvbiBibGFjayB3aGVuIGRpc2FibGVkLgogICAgIENvbG9yIGRpc2FibGVkQ29sb3I7 CiAgICAgaWYgKGVxdWFsSWdub3JpbmdTZW1hbnRpY0NvbG9yKHRleHRDb2xvciwgQ29sb3I6OmJs YWNrKSB8fCBiYWNrZ3JvdW5kQ29sb3IuYWxwaGFBc0Zsb2F0KCkgPCBtaW5EaXNhYmxlZENvbG9y QWxwaGFWYWx1ZSB8fCB0ZXh0Q29sb3IubHVtaW5hbmNlKCkgPCBiYWNrZ3JvdW5kQ29sb3IubHVt aW5hbmNlKCkpCi0gICAgICAgIGRpc2FibGVkQ29sb3IgPSB0ZXh0Q29sb3IubGlnaHRlbigpOwor ICAgICAgICBkaXNhYmxlZENvbG9yID0gdGV4dENvbG9yLmxpZ2h0ZW5lZCgpOwogICAgIGVsc2UK LSAgICAgICAgZGlzYWJsZWRDb2xvciA9IHRleHRDb2xvci5kYXJrZW4oKTsKKyAgICAgICAgZGlz YWJsZWRDb2xvciA9IHRleHRDb2xvci5kYXJrZW5lZCgpOwogICAgIAogICAgIC8vIElmIHRoZXJl J3Mgbm90IHZlcnkgbXVjaCBjb250cmFzdCBiZXR3ZWVuIHRoZSBkaXNhYmxlZCBjb2xvciBhbmQg dGhlIGJhY2tncm91bmQgY29sb3IsCiAgICAgLy8ganVzdCBsZWF2ZSB0aGUgdGV4dCBjb2xvciBh bG9uZS4gV2UgZG9uJ3Qgd2FudCB0byBjaGFuZ2UgYSBnb29kIGNvbnRyYXN0IGNvbG9yIHNjaGVt ZSBzbyB0aGF0IGl0IGhhcyByZWFsbHkgYmFkIGNvbnRyYXN0LgpJbmRleDogU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1RleHRQYWludFN0eWxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvVGV4dFBhaW50U3R5bGUuY3BwCShyZXZpc2lvbiAyNjI3NDcpCisrKyBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dFBhaW50U3R5bGUuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC03Miw4ICs3Miw4IEBAIHN0YXRpYyBDb2xvciBhZGp1c3RDb2xvckZvclZpc2liaWxpdHlP bkIKICAgICAgICAgcmV0dXJuIHRleHRDb2xvcjsKIAogICAgIGlmICh0ZXh0Q29sb3IubHVtaW5h bmNlKCkgPiAwLjUpCi0gICAgICAgIHJldHVybiB0ZXh0Q29sb3IuZGFya2VuKCk7Ci0gICAgcmV0 dXJuIHRleHRDb2xvci5saWdodGVuKCk7CisgICAgICAgIHJldHVybiB0ZXh0Q29sb3IuZGFya2Vu ZWQoKTsKKyAgICByZXR1cm4gdGV4dENvbG9yLmxpZ2h0ZW5lZCgpOwogfQogCiBUZXh0UGFpbnRT dHlsZSBjb21wdXRlVGV4dFBhaW50U3R5bGUoY29uc3QgRnJhbWUmIGZyYW1lLCBjb25zdCBSZW5k ZXJTdHlsZSYgbGluZVN0eWxlLCBjb25zdCBQYWludEluZm8mIHBhaW50SW5mbykKSW5kZXg6IFRv b2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2 Mjc0NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBA CisyMDIwLTA2LTA4ICBTYW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KKworICAgICAgICBF eHRlbmRlZCBDb2xvcjogUmVuYW1lIENvbG9yOjpsaWdodGVuKCkgYW5kIENvbG9yOjpkYXJrZW4o KSB0byBDb2xvcjo6bGlnaHRlbmVkKCkgYW5kIENvbG9yOjpkYXJrZW5lZCgpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTI5MTcKKworICAgICAgICBS ZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBBZGRyZXNzZXMgZmVlZGJhY2sgZnJv bSBEYXJpbi4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Db2xvclRl c3RzLmNwcDoKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDIwLTA2LTA4ICBT YW0gV2VpbmlnICA8d2VpbmlnQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggdGVzdCByZXN1bHRz IGFmdGVyIHIyNjI3MzMuCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUv Q29sb3JUZXN0cy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJDb3JlL0NvbG9yVGVzdHMuY3BwCShyZXZpc2lvbiAyNjI3NDcpCisrKyBUb29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYkNvcmUvQ29sb3JUZXN0cy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIx OSwxNyArMjE5LDE3IEBAIFRFU1QoQ29sb3IsIEx1bWluYW5jZSkKICAgICBFWFBFQ1RfRVEoYy5n cmVlbkNvbXBvbmVudCgpLCA5MCk7CiAgICAgRVhQRUNUX0VRKGMuYmx1ZUNvbXBvbmVudCgpLCAx NjApOwogCi0gICAgYXV0byBjTGlndGVuZWQgPSBDb2xvcihjKS5saWdodGVuKCkudG9TUkdCQVNp bXBsZUNvbG9yTG9zc3koKTsKKyAgICBhdXRvIGNMaWd0ZW5lZCA9IENvbG9yKGMpLmxpZ2h0ZW5l ZCgpLnRvU1JHQkFTaW1wbGVDb2xvckxvc3N5KCk7CiAgICAgRVhQRUNUX0ZMT0FUX0VRKENvbG9y KGNMaWd0ZW5lZCkubHVtaW5hbmNlKCksIDAuMjkxNjg4MDgpOwogICAgIEVYUEVDVF9FUShjTGln dGVuZWQucmVkQ29tcG9uZW50KCksIDEzMCk7CiAgICAgRVhQRUNUX0VRKGNMaWd0ZW5lZC5ncmVl bkNvbXBvbmVudCgpLCAxMzcpOwogICAgIEVYUEVDVF9FUShjTGlndGVuZWQuYmx1ZUNvbXBvbmVu dCgpLCAyNDQpOwogCi0gICAgYXV0byBjRGFya2VuID0gQ29sb3IoYykuZGFya2VuKCkudG9TUkdC QVNpbXBsZUNvbG9yTG9zc3koKTsKLSAgICBFWFBFQ1RfRkxPQVRfRVEoQ29sb3IoY0Rhcmtlbiku bHVtaW5hbmNlKCksIDAuMDI3MDA2NzI3KTsKLSAgICBFWFBFQ1RfRVEoY0Rhcmtlbi5yZWRDb21w b25lbnQoKSwgNDApOwotICAgIEVYUEVDVF9FUShjRGFya2VuLmdyZWVuQ29tcG9uZW50KCksIDQz KTsKLSAgICBFWFBFQ1RfRVEoY0Rhcmtlbi5ibHVlQ29tcG9uZW50KCksIDc2KTsKKyAgICBhdXRv IGNEYXJrZW5lZCA9IENvbG9yKGMpLmRhcmtlbmVkKCkudG9TUkdCQVNpbXBsZUNvbG9yTG9zc3ko KTsKKyAgICBFWFBFQ1RfRkxPQVRfRVEoQ29sb3IoY0RhcmtlbmVkKS5sdW1pbmFuY2UoKSwgMC4w MjcwMDY3MjcpOworICAgIEVYUEVDVF9FUShjRGFya2VuZWQucmVkQ29tcG9uZW50KCksIDQwKTsK KyAgICBFWFBFQ1RfRVEoY0RhcmtlbmVkLmdyZWVuQ29tcG9uZW50KCksIDQzKTsKKyAgICBFWFBF Q1RfRVEoY0RhcmtlbmVkLmJsdWVDb21wb25lbnQoKSwgNzYpOwogfQogCiB9IC8vIG5hbWVzcGFj ZSBUZXN0V2ViS2l0QVBJCg==