206909 2020-01-28 14:44:28 -0800 REGRESSION (r254406): Gmail.com star/favorite icons are not rendering 2021-10-01 07:13:15 -0700 1 1 1 Unclassified WebKit Images Safari Technology Preview Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=160934 https://bugs.webkit.org/show_bug.cgi?id=229909 https://bugs.webkit.org/show_bug.cgi?id=231078 InRadar P2 Normal --- 1 simon.fraser noam commit-queue darin esprehn+autocc ews-watchlist glenn gyuyoung.kim macpherson menard mjs noam simon.fraser webkit-bug-importer oldest_to_newest 1612187 0 simon.fraser 2020-01-28 14:44:28 -0800 r254406 broke the icons in the "star" column in Gmail. The ::before has: content: -webkit-image-set('' 1x,'' 2x); It seems this was previously invalid, so that content:'' was used. But now it's treated as valid, so we show the missing image icon. I think we need to preserve the old behavior of image-set in -webkit-image-set. 1612189 1 simon.fraser 2020-01-28 14:44:45 -0800 rdar://problem/58858225 1612325 2 noam 2020-01-28 22:42:04 -0800 (In reply to Simon Fraser (smfr) from comment #0) > r254406 broke the icons in the "star" column in Gmail. > > The ::before has: > content: -webkit-image-set('' 1x,'' 2x); > > It seems this was previously invalid, so that content:'' was used. But now > it's treated as valid, so we show the missing image icon. > > I think we need to preserve the old behavior of image-set in > -webkit-image-set. or maybe disallow empty images? 1612330 3 noam 2020-01-28 22:56:40 -0800 (In reply to Noam Rosenthal from comment #2) > (In reply to Simon Fraser (smfr) from comment #0) > > r254406 broke the icons in the "star" column in Gmail. > > > > The ::before has: > > content: -webkit-image-set('' 1x,'' 2x); > > > > It seems this was previously invalid, so that content:'' was used. But now > > it's treated as valid, so we show the missing image icon. > > > > I think we need to preserve the old behavior of image-set in > > -webkit-image-set. > > or maybe disallow empty images? I think I'll do both for now. 1612346 4 389111 noam 2020-01-29 00:52:37 -0800 Created attachment 389111 Patch 1612550 5 simon.fraser 2020-01-29 10:51:48 -0800 (In reply to Noam Rosenthal from comment #2) > (In reply to Simon Fraser (smfr) from comment #0) > > r254406 broke the icons in the "star" column in Gmail. > > > > The ::before has: > > content: -webkit-image-set('' 1x,'' 2x); > > > > It seems this was previously invalid, so that content:'' was used. But now > > it's treated as valid, so we show the missing image icon. > > > > I think we need to preserve the old behavior of image-set in > > -webkit-image-set. > > or maybe disallow empty images? Are empty images allowed per spec? 1612554 6 389111 simon.fraser 2020-01-29 10:55:43 -0800 Comment on attachment 389111 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=389111&action=review > Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp:1706 > + if ((range.peek().type() == StringToken) && (allowedImageTypes & AllowedImageType::RawStringAsURL)) { I think we prefer allowedImageTypes.contains(AllowedImageType::RawStringAsURL) > Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp:1714 > CSSValueID id = range.peek().functionId(); Not this patch, but please don't use 'id'; it's a reserved word in Objective-C. > Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp:1715 > + if ((allowedImageTypes & AllowedImageType::GeneratedImage) && isGeneratedImage(id)) .contains() > Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp:1718 > + if (allowedImageTypes & AllowedImageType::ImageSet) { .contains() > Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp:1726 > + if (allowedImageTypes & AllowedImageType::URLFunction) { .contains() 1612904 7 389238 noam 2020-01-30 04:27:51 -0800 Created attachment 389238 Patch for landing 1612906 8 noam 2020-01-30 04:28:40 -0800 (In reply to Simon Fraser (smfr) from comment #5) > (In reply to Noam Rosenthal from comment #2) > > (In reply to Simon Fraser (smfr) from comment #0) > > > r254406 broke the icons in the "star" column in Gmail. > > > > > > The ::before has: > > > content: -webkit-image-set('' 1x,'' 2x); > > > > > > It seems this was previously invalid, so that content:'' was used. But now > > > it's treated as valid, so we show the missing image icon. > > > > > > I think we need to preserve the old behavior of image-set in > > > -webkit-image-set. > > > > or maybe disallow empty images? > > Are empty images allowed per spec? They actually are, considered empty URLs. Removed that part from the patch. 1612917 9 389238 commit-queue 2020-01-30 05:10:12 -0800 Comment on attachment 389238 Patch for landing Clearing flags on attachment: 389238 Committed r255420: <https://trac.webkit.org/changeset/255420> 1612918 10 commit-queue 2020-01-30 05:10:14 -0800 All reviewed patches have been landed. Closing bug. 1613762 11 darin 2020-02-01 16:35:55 -0800 Did we check the behavior of other browsers in image-set? It would be unfortunate if we were the only one who matched the spec on this. 1613791 12 noam 2020-02-02 01:18:28 -0800 (In reply to Darin Adler from comment #11) > Did we check the behavior of other browsers in image-set? It would be > unfortunate if we were the only one who matched the spec on this. Of course, working on other browsers in parallel, currently getting the W3C tests around this to be comprehensive. 389111 2020-01-29 00:52:37 -0800 2020-01-30 04:27:43 -0800 Patch bug-206909-20200129105234.patch text/plain 11192 noam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1NTM0MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAxLTI5ICBOb2FtIFJv c2VudGhhbCAgPG5vYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSRUdSRVNTSU9OIChyMjU0NDA2 KTogR21haWwuY29tIHN0YXIvZmF2b3JpdGUgaWNvbnMgYXJlIG5vdCByZW5kZXJpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNjkwOQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgaW1hZ2Utc2V0 IHBhcnNpbmcgbW9yZSBjb25zZXJ2YXRpdmUsIGZvciBiYWNrd2FyZHMgY29tcGF0aWJpbGl0eToK KyAgICAgICAgLSBEaWZmZXJlbnRpYXRlIGJldHdlZW4gaW1hZ2Utc2V0IGFuZCAtd2Via2l0LWlt YWdlLXNldCB3aGVuIHBhcnNpbmcsIC13ZWJraXQtaW1hZ2Utc2V0IG1haW50YWlucyBvbGQgYmVo YXZpb3IuCisgICAgICAgIC0gRG9uJ3QgYWxsb3cgZW1wdHkgdXJscyB3aGVuIHVzaW5nIHJhdyBz dHJpbmdzLCBlLmcuIGltYWdlLXNldCgnJyAxeCkgaXMgaW52YWxpZC4KKworICAgICAgICBUZXN0 cyB1cGRhdGVkOiBmYXN0L2Nzcy9pbWFnZS1zZXQtcGFyc2luZy5odG1sLgorCisgICAgICAgICog Y3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzOjpjb25zdW1lSW1hZ2VTZXQpOgorICAgICAgICAo V2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzOjpjb25zdW1lSW1hZ2UpOgorCiAyMDIw LTAxLTI5ICBTdW5ueSBIZSAgPHN1bm55X2hlQGFwcGxlLmNvbT4KIAogICAgICAgICBOdWxscHRy IGNyYXNoIHdoZW4gc2V0dGluZyBjdXN0b20gcHJvcGVydGllcyBvbiBkZXRhY2hlZCBzdHlsZQpJ bmRleDogU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQ YXJzZXJIZWxwZXJzLmNwcAkocmV2aXNpb24gMjU1MzM2KQorKysgU291cmNlL1dlYkNvcmUvY3Nz L3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlckhlbHBlcnMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x NDgyLDEzICsxNDgyLDEzIEBAIHN0YXRpYyBSZWZQdHI8Q1NTVmFsdWU+IGNvbnN1bWVHZW5lcmF0 ZWQKICAgICByZXR1cm4gcmVzdWx0OwogfQogCi1zdGF0aWMgUmVmUHRyPENTU1ZhbHVlPiBjb25z dW1lSW1hZ2VTZXQoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UsIGNvbnN0IENTU1BhcnNlckNv bnRleHQmIGNvbnRleHQsIE9wdGlvblNldDxBbGxvd2VkSW1hZ2VUeXBlPiBhbGxvd2VkSW1hZ2VU eXBlKQorc3RhdGljIFJlZlB0cjxDU1NWYWx1ZT4gY29uc3VtZUltYWdlU2V0KENTU1BhcnNlclRv a2VuUmFuZ2UmIHJhbmdlLCBjb25zdCBDU1NQYXJzZXJDb250ZXh0JiBjb250ZXh0LCBPcHRpb25T ZXQ8QWxsb3dlZEltYWdlVHlwZT4gYWxsb3dlZEltYWdlVHlwZXMpCiB7CiAgICAgQ1NTUGFyc2Vy VG9rZW5SYW5nZSByYW5nZUNvcHkgPSByYW5nZTsKICAgICBDU1NQYXJzZXJUb2tlblJhbmdlIGFy Z3MgPSBjb25zdW1lRnVuY3Rpb24ocmFuZ2VDb3B5KTsKICAgICBSZWZQdHI8Q1NTSW1hZ2VTZXRW YWx1ZT4gaW1hZ2VTZXQgPSBDU1NJbWFnZVNldFZhbHVlOjpjcmVhdGUoKTsKICAgICBkbyB7Ci0g ICAgICAgIGF1dG8gaW1hZ2UgPSBjb25zdW1lSW1hZ2UoYXJncywgY29udGV4dCwgKGFsbG93ZWRJ bWFnZVR5cGUgfCBBbGxvd2VkSW1hZ2VUeXBlOjpSYXdTdHJpbmdBc1VSTCkgLSBBbGxvd2VkSW1h Z2VUeXBlOjpJbWFnZVNldCk7CisgICAgICAgIGF1dG8gaW1hZ2UgPSBjb25zdW1lSW1hZ2UoYXJn cywgY29udGV4dCwgYWxsb3dlZEltYWdlVHlwZXMpOwogICAgICAgICBpZiAoIWltYWdlKQogICAg ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKQEAgLTE3MDEsMjAgKzE3MDEsMjkgQEAgUmVmUHRy PENTU1NoYWRvd1ZhbHVlPiBjb25zdW1lU2luZ2xlU2hhZAogICAgIHJldHVybiBDU1NTaGFkb3dW YWx1ZTo6Y3JlYXRlKFdURk1vdmUoaG9yaXpvbnRhbE9mZnNldCksIFdURk1vdmUodmVydGljYWxP ZmZzZXQpLCBXVEZNb3ZlKGJsdXJSYWRpdXMpLCBXVEZNb3ZlKHNwcmVhZERpc3RhbmNlKSwgV1RG TW92ZShzdHlsZSksIFdURk1vdmUoY29sb3IpKTsKIH0KIAotUmVmUHRyPENTU1ZhbHVlPiBjb25z dW1lSW1hZ2UoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UsIENTU1BhcnNlckNvbnRleHQgY29u dGV4dCwgT3B0aW9uU2V0PEFsbG93ZWRJbWFnZVR5cGU+IEFsbG93ZWRJbWFnZVR5cGUpCitSZWZQ dHI8Q1NTVmFsdWU+IGNvbnN1bWVJbWFnZShDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSwgQ1NT UGFyc2VyQ29udGV4dCBjb250ZXh0LCBPcHRpb25TZXQ8QWxsb3dlZEltYWdlVHlwZT4gYWxsb3dl ZEltYWdlVHlwZXMpCiB7Ci0gICAgaWYgKChyYW5nZS5wZWVrKCkudHlwZSgpID09IFN0cmluZ1Rv a2VuKSAmJiAoQWxsb3dlZEltYWdlVHlwZSAmIEFsbG93ZWRJbWFnZVR5cGU6OlJhd1N0cmluZ0Fz VVJMKSkKLSAgICAgICAgcmV0dXJuIENTU0ltYWdlVmFsdWU6OmNyZWF0ZShjb21wbGV0ZVVSTChj b250ZXh0LCByYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVzcGFjZSgpLnZhbHVlKCkudG9BdG9t U3RyaW5nKCkpLCBjb250ZXh0LmlzQ29udGVudE9wYXF1ZSA/IExvYWRlZEZyb21PcGFxdWVTb3Vy Y2U6OlllcyA6IExvYWRlZEZyb21PcGFxdWVTb3VyY2U6Ok5vKTsKKyAgICBpZiAoKHJhbmdlLnBl ZWsoKS50eXBlKCkgPT0gU3RyaW5nVG9rZW4pICYmIChhbGxvd2VkSW1hZ2VUeXBlcyAmIEFsbG93 ZWRJbWFnZVR5cGU6OlJhd1N0cmluZ0FzVVJMKSkgeworICAgICAgICBhdXRvIHVybFN0cmluZ1Zp ZXcgPSByYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVzcGFjZSgpLnZhbHVlKCk7CisgICAgICAg IGlmICh1cmxTdHJpbmdWaWV3LmlzRW1wdHkoKSkKKyAgICAgICAgICAgIHJldHVybiBudWxscHRy OworICAgICAgICByZXR1cm4gQ1NTSW1hZ2VWYWx1ZTo6Y3JlYXRlKGNvbXBsZXRlVVJMKGNvbnRl eHQsIHVybFN0cmluZ1ZpZXcudG9BdG9tU3RyaW5nKCkpLCBjb250ZXh0LmlzQ29udGVudE9wYXF1 ZSA/IExvYWRlZEZyb21PcGFxdWVTb3VyY2U6OlllcyA6IExvYWRlZEZyb21PcGFxdWVTb3VyY2U6 Ok5vKTsKKyAgICB9CiAKICAgICBpZiAocmFuZ2UucGVlaygpLnR5cGUoKSA9PSBGdW5jdGlvblRv a2VuKSB7CiAgICAgICAgIENTU1ZhbHVlSUQgaWQgPSByYW5nZS5wZWVrKCkuZnVuY3Rpb25JZCgp OwotICAgICAgICBpZiAoKEFsbG93ZWRJbWFnZVR5cGUgJiBBbGxvd2VkSW1hZ2VUeXBlOjpJbWFn ZVNldCkgJiYgKGlkID09IENTU1ZhbHVlV2Via2l0SW1hZ2VTZXQgfHwgaWQgPT0gQ1NTVmFsdWVJ bWFnZVNldCkpCi0gICAgICAgICAgICByZXR1cm4gY29uc3VtZUltYWdlU2V0KHJhbmdlLCBjb250 ZXh0LCBBbGxvd2VkSW1hZ2VUeXBlKTsKLSAgICAgICAgaWYgKChBbGxvd2VkSW1hZ2VUeXBlICYg QWxsb3dlZEltYWdlVHlwZTo6R2VuZXJhdGVkSW1hZ2UpICYmIGlzR2VuZXJhdGVkSW1hZ2UoaWQp KQorICAgICAgICBpZiAoKGFsbG93ZWRJbWFnZVR5cGVzICYgQWxsb3dlZEltYWdlVHlwZTo6R2Vu ZXJhdGVkSW1hZ2UpICYmIGlzR2VuZXJhdGVkSW1hZ2UoaWQpKQogICAgICAgICAgICAgcmV0dXJu IGNvbnN1bWVHZW5lcmF0ZWRJbWFnZShyYW5nZSwgY29udGV4dCk7CisKKyAgICAgICAgaWYgKGFs bG93ZWRJbWFnZVR5cGVzICYgQWxsb3dlZEltYWdlVHlwZTo6SW1hZ2VTZXQpIHsKKyAgICAgICAg ICAgIGlmIChpZCA9PSBDU1NWYWx1ZUltYWdlU2V0KQorICAgICAgICAgICAgICAgIHJldHVybiBj b25zdW1lSW1hZ2VTZXQocmFuZ2UsIGNvbnRleHQsIChhbGxvd2VkSW1hZ2VUeXBlcyB8IEFsbG93 ZWRJbWFnZVR5cGU6OlJhd1N0cmluZ0FzVVJMKSAtIEFsbG93ZWRJbWFnZVR5cGU6OkltYWdlU2V0 KTsKKyAgICAgICAgICAgIGlmIChpZCA9PSBDU1NWYWx1ZVdlYmtpdEltYWdlU2V0KQorICAgICAg ICAgICAgICAgIHJldHVybiBjb25zdW1lSW1hZ2VTZXQocmFuZ2UsIGNvbnRleHQsIEFsbG93ZWRJ bWFnZVR5cGU6OlVSTEZ1bmN0aW9uKTsKKyAgICAgICAgfQogICAgIH0KIAotICAgIGlmIChBbGxv d2VkSW1hZ2VUeXBlICYgQWxsb3dlZEltYWdlVHlwZTo6VVJMRnVuY3Rpb24pIHsKKyAgICBpZiAo YWxsb3dlZEltYWdlVHlwZXMgJiBBbGxvd2VkSW1hZ2VUeXBlOjpVUkxGdW5jdGlvbikgewogICAg ICAgICBhdXRvIHVyaSA9IGNvbnN1bWVVcmxBc1N0cmluZ1ZpZXcocmFuZ2UpOwogICAgICAgICBp ZiAoIXVyaS5pc051bGwoKSkKICAgICAgICAgICAgIHJldHVybiBDU1NJbWFnZVZhbHVlOjpjcmVh dGUoY29tcGxldGVVUkwoY29udGV4dCwgdXJpLnRvQXRvbVN0cmluZygpKSwgY29udGV4dC5pc0Nv bnRlbnRPcGFxdWUgPyBMb2FkZWRGcm9tT3BhcXVlU291cmNlOjpZZXMgOiBMb2FkZWRGcm9tT3Bh cXVlU291cmNlOjpObyk7CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTUzMzYpCisrKyBMYXlvdXRUZXN0 cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOCBAQAorMjAyMC0wMS0yOSAg Tm9hbSBSb3NlbnRoYWwgIDxub2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTiAo cjI1NDQwNik6IEdtYWlsLmNvbSBzdGFyL2Zhdm9yaXRlIGljb25zIGFyZSBub3QgcmVuZGVyaW5n CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY5MDkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCBl bXB0eSBVUkxzIGFuZCBuZXcgc3ludGF4IHdpdGggcHJlZml4ZWQgaW1hZ2Utc2V0IHRvIGludmFs aWQgdGVzdHMuCisgICAgICAgIE1vZGlmaWVkIHZhbGlkIGltYWdlLXNldCBwYXJzaW5nIHRlc3Qg dG8gc2VwYXJhdGUgcHJlZml4ZWQvbm9uLXByZWZpeGVkLgorCisgICAgICAgICogZmFzdC9jc3Mv aW1hZ2Utc2V0LXBhcnNpbmctZ2VuZXJhdGVkLmh0bWw6CisgICAgICAgICogZmFzdC9jc3MvaW1h Z2Utc2V0LXBhcnNpbmctaW52YWxpZC1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9jc3Mv aW1hZ2Utc2V0LXBhcnNpbmctaW52YWxpZC5odG1sOgorICAgICAgICAqIGZhc3QvY3NzL2ltYWdl LXNldC1wYXJzaW5nLmh0bWw6CisKIDIwMjAtMDEtMjggIFBpbmtpIEd5YW5jaGFuZGFuaSAgPHBn eWFuY2hhbmRhbmlAYXBwbGUuY29tPgogCiAgICAgICAgIE51bGwgZGVyZWYgY3Jhc2ggaW4gRE9N V2luZG93OjpzY3JvbGxCeSBhZnRlciBldm9raW5nIHVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdT dHlsZXNoZWV0cygpCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9pbWFnZS1zZXQtcGFyc2lu Zy1nZW5lcmF0ZWQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9pbWFn ZS1zZXQtcGFyc2luZy1nZW5lcmF0ZWQuaHRtbAkocmV2aXNpb24gMjU1MzM2KQorKysgTGF5b3V0 VGVzdHMvZmFzdC9jc3MvaW1hZ2Utc2V0LXBhcnNpbmctZ2VuZXJhdGVkLmh0bWwJKHdvcmtpbmcg Y29weSkKQEAgLTcyLDcgKzcyLDcgQEAgZnVuY3Rpb24gdGVzdEltYWdlU2V0UnVsZShkZXNjcmlw dGlvbiwgcAogfQogCiB0ZXN0SW1hZ2VTZXRSdWxlKCJTaW5nbGUgdmFsdWUgZm9yIGJhY2tncm91 bmQtaW1hZ2Ugd2l0aCBncmFkaWVudCIsCi0gICAgICAgICAgICAgICAgImJhY2tncm91bmQtaW1h Z2UiLAorICAgICAgICAgICAgICAgICJiYWNrZ3JvdW5kLWltYWdlIiwgCiAgICAgICAgICAgICAg ICAgImxpbmVhci1ncmFkaWVudChncmVlbiwgd2hpdGUpIDF4IiwgMiwKICAgICAgICAgICAgICAg ICBbImxpbmVhci1ncmFkaWVudChncmVlbiwgd2hpdGUpIiwgIjFkcHB4Il0pOwogdGVzdEltYWdl U2V0UnVsZSgiU2luZ2xlIHZhbHVlIGZvciBjb250ZW50IHdpdGggZ3JhZGllbnQiLApJbmRleDog TGF5b3V0VGVzdHMvZmFzdC9jc3MvaW1hZ2Utc2V0LXBhcnNpbmctaW52YWxpZC1leHBlY3RlZC50 eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9jc3MvaW1hZ2Utc2V0LXBhcnNpbmct aW52YWxpZC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDI1NTMzNikKKysrIExheW91dFRlc3RzL2Zh c3QvY3NzL2ltYWdlLXNldC1wYXJzaW5nLWludmFsaWQtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNv cHkpCkBAIC0xMCw2ICsxMCwyMSBAQCBQQVNTIGNzc1J1bGUgaXMgbnVsbAogTm8geCA6IHVybCgn I2EnKSAxCiBQQVNTIGNzc1J1bGUgaXMgbnVsbAogCitObyByYXcgc3RyaW5nIFVSTHMgd2l0aCBw cmVmaXhlZCBpbWFnZS1zZXQgOiAnaW1hZ2UucG5nJyAxeAorUEFTUyBjc3NSdWxlIGlzIG51bGwK KworQ29tYmluYXRpb24gb2YgdmFsaWQgYW5kIGludmFsaWQgd2l0aCBwcmVmaXhlZCBpbWFnZS1z ZXQgOiAnaW1hZ2UucG5nJyAxeCwgdXJsKGltYWdlLnBuZykgMngKK1BBU1MgY3NzUnVsZSBpcyBu dWxsCisKK0NvbWJpbmF0aW9uIG9mIHZhbGlkIGFuZCBpbnZhbGlkIHdpdGggdW5wcmVmaXhlZCBp bWFnZS1zZXQgOiAnJyAxeCwgdXJsKGltYWdlLnBuZykgMngKK1BBU1MgY3NzUnVsZSBpcyBudWxs CisKK05vIGdyYWRpZW50cyB3aXRoIHByZWZpeGVkIGltYWdlLXNldCA6IGxpbmVhci1ncmFkaWVu dChibGFjaywgd2hpdGUpIDF4CitQQVNTIGNzc1J1bGUgaXMgbnVsbAorCitObyBlbXB0eSBzdHJp bmdzIDogJycgMXgKK1BBU1MgY3NzUnVsZSBpcyBudWxsCisKIE5vIGNvbW1hIDogdXJsKCcjYScp IDF4IHVybCgnI2InKSAyeAogUEFTUyBjc3NSdWxlIGlzIG51bGwKIApJbmRleDogTGF5b3V0VGVz dHMvZmFzdC9jc3MvaW1hZ2Utc2V0LXBhcnNpbmctaW52YWxpZC5odG1sCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL2Zhc3QvY3NzL2ltYWdlLXNldC1wYXJzaW5nLWludmFsaWQuaHRtbAkocmV2 aXNpb24gMjU1MzM2KQorKysgTGF5b3V0VGVzdHMvZmFzdC9jc3MvaW1hZ2Utc2V0LXBhcnNpbmct aW52YWxpZC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0xMiwxMyArMTIsMTMgQEAgZGVzY3JpcHRp b24oIlRlc3QgdGhlIHBhcnNpbmcgb2YgdGhlIC13ZQogLy8gVGhlc2UgaGF2ZSB0byBiZSBnbG9i YWwgZm9yIHRoZSB0ZXN0IGhlbHBlcnMgdG8gc2VlIHRoZW0uCiB2YXIgY3NzUnVsZTsKIAotZnVu Y3Rpb24gdGVzdEludmFsaWRJbWFnZVNldChkZXNjcmlwdGlvbiwgcHJvcGVydHksIHJ1bGUpCitm dW5jdGlvbiB0ZXN0SW52YWxpZEltYWdlU2V0KGRlc2NyaXB0aW9uLCBwcm9wZXJ0eSwgcnVsZSwg YXR0cmlidXRlID0gImltYWdlLXNldCIpCiB7CiAgICAgZGVidWcoIiIpOwogICAgIGRlYnVnKGRl c2NyaXB0aW9uICsgIiA6ICIgKyBydWxlKTsKIAogICAgIHZhciBkaXYgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJkaXYiKTsKLSAgICBkaXYuc2V0QXR0cmlidXRlKCJzdHlsZSIsIHByb3BlcnR5 ICsgIjogLXdlYmtpdC1pbWFnZS1zZXQoIiArIHJ1bGUgKyAiKSIpOworICAgIGRpdi5zZXRBdHRy aWJ1dGUoInN0eWxlIiwgcHJvcGVydHkgKyAiOiAiICsgYXR0cmlidXRlICsgIigiICsgcnVsZSAr ICIpIik7CiAgICAgZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChkaXYpOwogCiAgICAgY3NzUnVs ZSA9IGRpdi5zdHlsZS5nZXRQcm9wZXJ0eUNTU1ZhbHVlKHByb3BlcnR5KTsKQEAgLTI5LDYgKzI5 LDExIEBAIGZ1bmN0aW9uIHRlc3RJbnZhbGlkSW1hZ2VTZXQoZGVzY3JpcHRpb24KIAogdGVzdElu dmFsaWRJbWFnZVNldCgiVG9vIG1hbnkgdXJsIHBhcmFtZXRlcnMiLCAiYmFja2dyb3VuZC1pbWFn ZSIsICJ1cmwoI2EgI2IpIik7CiB0ZXN0SW52YWxpZEltYWdlU2V0KCJObyB4IiwgImJhY2tncm91 bmQtaW1hZ2UiLCAidXJsKCcjYScpIDEiKTsKK3Rlc3RJbnZhbGlkSW1hZ2VTZXQoIk5vIHJhdyBz dHJpbmcgVVJMcyB3aXRoIHByZWZpeGVkIGltYWdlLXNldCIsICJiYWNrZ3JvdW5kLWltYWdlIiwg IidpbWFnZS5wbmcnIDF4IiwgIi13ZWJraXQtaW1hZ2Utc2V0Iik7Cit0ZXN0SW52YWxpZEltYWdl U2V0KCJDb21iaW5hdGlvbiBvZiB2YWxpZCBhbmQgaW52YWxpZCB3aXRoIHByZWZpeGVkIGltYWdl LXNldCIsICJiYWNrZ3JvdW5kLWltYWdlIiwgIidpbWFnZS5wbmcnIDF4LCB1cmwoaW1hZ2UucG5n KSAyeCIsICItd2Via2l0LWltYWdlLXNldCIpOwordGVzdEludmFsaWRJbWFnZVNldCgiQ29tYmlu YXRpb24gb2YgdmFsaWQgYW5kIGludmFsaWQgd2l0aCB1bnByZWZpeGVkIGltYWdlLXNldCIsICJi YWNrZ3JvdW5kLWltYWdlIiwgIicnIDF4LCB1cmwoaW1hZ2UucG5nKSAyeCIpOwordGVzdEludmFs aWRJbWFnZVNldCgiTm8gZ3JhZGllbnRzIHdpdGggcHJlZml4ZWQgaW1hZ2Utc2V0IiwgImJhY2tn cm91bmQtaW1hZ2UiLCAibGluZWFyLWdyYWRpZW50KGJsYWNrLCB3aGl0ZSkgMXgiLCAiLXdlYmtp dC1pbWFnZS1zZXQiKTsKK3Rlc3RJbnZhbGlkSW1hZ2VTZXQoIk5vIGVtcHR5IHN0cmluZ3MiLCAi YmFja2dyb3VuZC1pbWFnZSIsICInJyAxeCIpOwogdGVzdEludmFsaWRJbWFnZVNldCgiTm8gY29t bWEiLCAiYmFja2dyb3VuZC1pbWFnZSIsICJ1cmwoJyNhJykgMXggdXJsKCcjYicpIDJ4Iik7CiB0 ZXN0SW52YWxpZEltYWdlU2V0KCJUb28gbWFueSBzY2FsZSBmYWN0b3IgcGFyYW1ldGVycyIsICJi YWNrZ3JvdW5kLWltYWdlIiwgInVybCgnI2EnKSAxeCAyeCIpOwogdGVzdEludmFsaWRJbWFnZVNl dCgiU2NhbGUgZmFjdG9yIGlzIDAiLCAiYmFja2dyb3VuZC1pbWFnZSIsICJ1cmwoJyNhJykgMHgi KTsKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvY3NzL2ltYWdlLXNldC1wYXJzaW5nLmh0bWwKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9jc3MvaW1hZ2Utc2V0LXBhcnNpbmcuaHRtbAko cmV2aXNpb24gMjU1MzM2KQorKysgTGF5b3V0VGVzdHMvZmFzdC9jc3MvaW1hZ2Utc2V0LXBhcnNp bmcuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMzEsMTMgKzMxLDEzIEBAIGZ1bmN0aW9uIHNob3Vs ZEJlVHlwZShleHByZXNzaW9uLCBjbGFzc04KIC8vIFRoZXNlIGhhdmUgdG8gYmUgZ2xvYmFsIGZv ciB0aGUgdGVzdCBoZWxwZXJzIHRvIHNlZSB0aGVtLgogdmFyIGltYWdlU2V0UnVsZSwgc3ViUnVs ZTsKIAotZnVuY3Rpb24gdGVzdEltYWdlU2V0UnVsZShkZXNjcmlwdGlvbiwgcHJvcGVydHksIHJ1 bGUsIGV4cGVjdGVkTGVuZ3RoLCBleHBlY3RlZFRleHRzKQorZnVuY3Rpb24gdGVzdEltYWdlU2V0 UnVsZShkZXNjcmlwdGlvbiwgcHJvcGVydHksIHJ1bGUsIGV4cGVjdGVkTGVuZ3RoLCBleHBlY3Rl ZFRleHRzLCBwcm9wTmFtZSA9ICItd2Via2l0LWltYWdlLXNldCIpCiB7CiAgICAgZGVidWcoIiIp OwogICAgIGRlYnVnKGRlc2NyaXB0aW9uICsgIiA6ICIgKyBydWxlKTsKIAogICAgIHZhciBkaXYg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICBkaXYuc2V0QXR0cmlidXRlKCJz dHlsZSIsIHByb3BlcnR5ICsgIjogLXdlYmtpdC1pbWFnZS1zZXQoIiArIHJ1bGUgKyAiKSIpOwor ICAgIGRpdi5zZXRBdHRyaWJ1dGUoInN0eWxlIiwgcHJvcGVydHkgKyAiOiAiICsgcHJvcE5hbWUg KyAiKCIgKyBydWxlICsgIikiKTsKICAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGRpdik7 CiAKICAgICBpbWFnZVNldFJ1bGUgPSBkaXYuc3R5bGUuZ2V0UHJvcGVydHlDU1NWYWx1ZShwcm9w ZXJ0eSk7CkBAIC04NCwxNyArODQsMTcgQEAgdGVzdEltYWdlU2V0UnVsZSgiTXVsdGlwbGUgdmFs dWVzIGZvciBiYQogdGVzdEltYWdlU2V0UnVsZSgiU2luZ2xlIHZhbHVlIGZvciBiYWNrZ3JvdW5k LWltYWdlIHdpdGhvdXQgdXJsKCkgZnVuY3Rpb24iLAogICAgICAgICAgICAgICAgICJiYWNrZ3Jv dW5kLWltYWdlIiwKICAgICAgICAgICAgICAgICAiJyNhJyAxeCIsIDIsCi0gICAgICAgICAgICAg ICAgWyJhIiwgIjFkcHB4Il0pOworICAgICAgICAgICAgICAgIFsiYSIsICIxZHBweCJdLCAiaW1h Z2Utc2V0Iik7CiAKIHRlc3RJbWFnZVNldFJ1bGUoIk11bHRpcGxlIHZhbHVlcyBmb3IgYmFja2dy b3VuZC1pbWFnZSB3aXRob3V0IHVybCgpIGZ1bmN0aW9uIiwKICAgICAgICAgICAgICAgICAiYmFj a2dyb3VuZC1pbWFnZSIsCiAgICAgICAgICAgICAgICAgIicjYScgMXgsICcjYicgMngiLCA0LAot ICAgICAgICAgICAgICAgIFsiYSIsICIxZHBweCIsICJiIiwgIjJkcHB4Il0pOworICAgICAgICAg ICAgICAgIFsiYSIsICIxZHBweCIsICJiIiwgIjJkcHB4Il0sICJpbWFnZS1zZXQiKTsKIAogdGVz dEltYWdlU2V0UnVsZSgiTWl4IHZhbHVlcyB3aXRoIGFuZCB3aXRob3V0IHVybCgpIGZ1bmN0aW9u IiwKICAgICAgICAgICAgICAgICAiYmFja2dyb3VuZC1pbWFnZSIsCiAgICAgICAgICAgICAgICAg IicjYScgMXgsIHVybCgnI2InKSAyeCIsIDQsCi0gICAgICAgICAgICAgICAgWyJhIiwgIjFkcHB4 IiwgImIiLCAiMmRwcHgiXSk7CisgICAgICAgICAgICAgICAgWyJhIiwgIjFkcHB4IiwgImIiLCAi MmRwcHgiXSwgImltYWdlLXNldCIpOwogCiB0ZXN0SW1hZ2VTZXRSdWxlKCJNdWx0aXBsZSB2YWx1 ZXMgZm9yIGJhY2tncm91bmQtaW1hZ2UsIG91dCBvZiBvcmRlciIsCiAgICAgICAgICAgICAgICAg ImJhY2tncm91bmQtaW1hZ2UiLAo= 389238 2020-01-30 04:27:51 -0800 2020-01-30 05:10:12 -0800 Patch for landing bug-206909-20200130142749.patch text/plain 11151 noam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1NTM0MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAxLTI5ICBOb2FtIFJv c2VudGhhbCAgPG5vYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSRUdSRVNTSU9OIChyMjU0NDA2 KTogR21haWwuY29tIHN0YXIvZmF2b3JpdGUgaWNvbnMgYXJlIG5vdCByZW5kZXJpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNjkwOQorCisgICAg ICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAgICBNYWtlIGltYWdlLXNldCBw YXJzaW5nIG1vcmUgY29uc2VydmF0aXZlLCBmb3IgYmFja3dhcmRzIGNvbXBhdGliaWxpdHk6Cisg ICAgICAgIC0gRGlmZmVyZW50aWF0ZSBiZXR3ZWVuIGltYWdlLXNldCBhbmQgLXdlYmtpdC1pbWFn ZS1zZXQgd2hlbiBwYXJzaW5nLCAtd2Via2l0LWltYWdlLXNldCBtYWludGFpbnMgb2xkIGJlaGF2 aW9yLgorICAgICAgICAtIERvbid0IGFsbG93IGVtcHR5IHVybHMgd2hlbiB1c2luZyByYXcgc3Ry aW5ncywgZS5nLiBpbWFnZS1zZXQoJycgMXgpIGlzIGludmFsaWQuCisKKyAgICAgICAgVGVzdHMg dXBkYXRlZDogZmFzdC9jc3MvaW1hZ2Utc2V0LXBhcnNpbmcuaHRtbC4KKworICAgICAgICAqIGNz cy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkNTU1Byb3BlcnR5UGFyc2VySGVscGVyczo6Y29uc3VtZUltYWdlU2V0KToKKyAgICAgICAgKFdl YkNvcmU6OkNTU1Byb3BlcnR5UGFyc2VySGVscGVyczo6Y29uc3VtZUltYWdlKToKKwogMjAyMC0w MS0yOSAgU3VubnkgSGUgIDxzdW5ueV9oZUBhcHBsZS5jb20+CiAKICAgICAgICAgTnVsbHB0ciBj cmFzaCB3aGVuIHNldHRpbmcgY3VzdG9tIHByb3BlcnRpZXMgb24gZGV0YWNoZWQgc3R5bGUKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFy c2VySGVscGVycy5jcHAJKHJldmlzaW9uIDI1NTMzNikKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9w YXJzZXIvQ1NTUHJvcGVydHlQYXJzZXJIZWxwZXJzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ4 MiwxMyArMTQ4MiwxMyBAQCBzdGF0aWMgUmVmUHRyPENTU1ZhbHVlPiBjb25zdW1lR2VuZXJhdGVk CiAgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAotc3RhdGljIFJlZlB0cjxDU1NWYWx1ZT4gY29uc3Vt ZUltYWdlU2V0KENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlLCBjb25zdCBDU1NQYXJzZXJDb250 ZXh0JiBjb250ZXh0LCBPcHRpb25TZXQ8QWxsb3dlZEltYWdlVHlwZT4gYWxsb3dlZEltYWdlVHlw ZSkKK3N0YXRpYyBSZWZQdHI8Q1NTVmFsdWU+IGNvbnN1bWVJbWFnZVNldChDU1NQYXJzZXJUb2tl blJhbmdlJiByYW5nZSwgY29uc3QgQ1NTUGFyc2VyQ29udGV4dCYgY29udGV4dCwgT3B0aW9uU2V0 PEFsbG93ZWRJbWFnZVR5cGU+IGFsbG93ZWRJbWFnZVR5cGVzKQogewogICAgIENTU1BhcnNlclRv a2VuUmFuZ2UgcmFuZ2VDb3B5ID0gcmFuZ2U7CiAgICAgQ1NTUGFyc2VyVG9rZW5SYW5nZSBhcmdz ID0gY29uc3VtZUZ1bmN0aW9uKHJhbmdlQ29weSk7CiAgICAgUmVmUHRyPENTU0ltYWdlU2V0VmFs dWU+IGltYWdlU2V0ID0gQ1NTSW1hZ2VTZXRWYWx1ZTo6Y3JlYXRlKCk7CiAgICAgZG8gewotICAg ICAgICBhdXRvIGltYWdlID0gY29uc3VtZUltYWdlKGFyZ3MsIGNvbnRleHQsIChhbGxvd2VkSW1h Z2VUeXBlIHwgQWxsb3dlZEltYWdlVHlwZTo6UmF3U3RyaW5nQXNVUkwpIC0gQWxsb3dlZEltYWdl VHlwZTo6SW1hZ2VTZXQpOworICAgICAgICBhdXRvIGltYWdlID0gY29uc3VtZUltYWdlKGFyZ3Ms IGNvbnRleHQsIGFsbG93ZWRJbWFnZVR5cGVzKTsKICAgICAgICAgaWYgKCFpbWFnZSkKICAgICAg ICAgICAgIHJldHVybiBudWxscHRyOwogCkBAIC0xNzAxLDIwICsxNzAxLDI3IEBAIFJlZlB0cjxD U1NTaGFkb3dWYWx1ZT4gY29uc3VtZVNpbmdsZVNoYWQKICAgICByZXR1cm4gQ1NTU2hhZG93VmFs dWU6OmNyZWF0ZShXVEZNb3ZlKGhvcml6b250YWxPZmZzZXQpLCBXVEZNb3ZlKHZlcnRpY2FsT2Zm c2V0KSwgV1RGTW92ZShibHVyUmFkaXVzKSwgV1RGTW92ZShzcHJlYWREaXN0YW5jZSksIFdURk1v dmUoc3R5bGUpLCBXVEZNb3ZlKGNvbG9yKSk7CiB9CiAKLVJlZlB0cjxDU1NWYWx1ZT4gY29uc3Vt ZUltYWdlKENTU1BhcnNlclRva2VuUmFuZ2UmIHJhbmdlLCBDU1NQYXJzZXJDb250ZXh0IGNvbnRl eHQsIE9wdGlvblNldDxBbGxvd2VkSW1hZ2VUeXBlPiBBbGxvd2VkSW1hZ2VUeXBlKQorUmVmUHRy PENTU1ZhbHVlPiBjb25zdW1lSW1hZ2UoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgcmFuZ2UsIENTU1Bh cnNlckNvbnRleHQgY29udGV4dCwgT3B0aW9uU2V0PEFsbG93ZWRJbWFnZVR5cGU+IGFsbG93ZWRJ bWFnZVR5cGVzKQogewotICAgIGlmICgocmFuZ2UucGVlaygpLnR5cGUoKSA9PSBTdHJpbmdUb2tl bikgJiYgKEFsbG93ZWRJbWFnZVR5cGUgJiBBbGxvd2VkSW1hZ2VUeXBlOjpSYXdTdHJpbmdBc1VS TCkpCi0gICAgICAgIHJldHVybiBDU1NJbWFnZVZhbHVlOjpjcmVhdGUoY29tcGxldGVVUkwoY29u dGV4dCwgcmFuZ2UuY29uc3VtZUluY2x1ZGluZ1doaXRlc3BhY2UoKS52YWx1ZSgpLnRvQXRvbVN0 cmluZygpKSwgY29udGV4dC5pc0NvbnRlbnRPcGFxdWUgPyBMb2FkZWRGcm9tT3BhcXVlU291cmNl OjpZZXMgOiBMb2FkZWRGcm9tT3BhcXVlU291cmNlOjpObyk7CisgICAgaWYgKChyYW5nZS5wZWVr KCkudHlwZSgpID09IFN0cmluZ1Rva2VuKSAmJiAoYWxsb3dlZEltYWdlVHlwZXMuY29udGFpbnMo QWxsb3dlZEltYWdlVHlwZTo6UmF3U3RyaW5nQXNVUkwpKSkgeworICAgICAgICBhdXRvIHVybFN0 cmluZ1ZpZXcgPSByYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVzcGFjZSgpLnZhbHVlKCk7Cisg ICAgICAgIHJldHVybiBDU1NJbWFnZVZhbHVlOjpjcmVhdGUoY29tcGxldGVVUkwoY29udGV4dCwg dXJsU3RyaW5nVmlldy50b0F0b21TdHJpbmcoKSksIGNvbnRleHQuaXNDb250ZW50T3BhcXVlID8g TG9hZGVkRnJvbU9wYXF1ZVNvdXJjZTo6WWVzIDogTG9hZGVkRnJvbU9wYXF1ZVNvdXJjZTo6Tm8p OworICAgIH0KIAogICAgIGlmIChyYW5nZS5wZWVrKCkudHlwZSgpID09IEZ1bmN0aW9uVG9rZW4p IHsKLSAgICAgICAgQ1NTVmFsdWVJRCBpZCA9IHJhbmdlLnBlZWsoKS5mdW5jdGlvbklkKCk7Ci0g ICAgICAgIGlmICgoQWxsb3dlZEltYWdlVHlwZSAmIEFsbG93ZWRJbWFnZVR5cGU6OkltYWdlU2V0 KSAmJiAoaWQgPT0gQ1NTVmFsdWVXZWJraXRJbWFnZVNldCB8fCBpZCA9PSBDU1NWYWx1ZUltYWdl U2V0KSkKLSAgICAgICAgICAgIHJldHVybiBjb25zdW1lSW1hZ2VTZXQocmFuZ2UsIGNvbnRleHQs IEFsbG93ZWRJbWFnZVR5cGUpOwotICAgICAgICBpZiAoKEFsbG93ZWRJbWFnZVR5cGUgJiBBbGxv d2VkSW1hZ2VUeXBlOjpHZW5lcmF0ZWRJbWFnZSkgJiYgaXNHZW5lcmF0ZWRJbWFnZShpZCkpCisg ICAgICAgIENTU1ZhbHVlSUQgZnVuY3Rpb25JZCA9IHJhbmdlLnBlZWsoKS5mdW5jdGlvbklkKCk7 CisgICAgICAgIGlmICgoYWxsb3dlZEltYWdlVHlwZXMuY29udGFpbnMoQWxsb3dlZEltYWdlVHlw ZTo6R2VuZXJhdGVkSW1hZ2UpKSAmJiBpc0dlbmVyYXRlZEltYWdlKGZ1bmN0aW9uSWQpKQogICAg ICAgICAgICAgcmV0dXJuIGNvbnN1bWVHZW5lcmF0ZWRJbWFnZShyYW5nZSwgY29udGV4dCk7CisK KyAgICAgICAgaWYgKGFsbG93ZWRJbWFnZVR5cGVzLmNvbnRhaW5zKEFsbG93ZWRJbWFnZVR5cGU6 OkltYWdlU2V0KSkgeworICAgICAgICAgICAgaWYgKGZ1bmN0aW9uSWQgPT0gQ1NTVmFsdWVJbWFn ZVNldCkKKyAgICAgICAgICAgICAgICByZXR1cm4gY29uc3VtZUltYWdlU2V0KHJhbmdlLCBjb250 ZXh0LCAoYWxsb3dlZEltYWdlVHlwZXMgfCBBbGxvd2VkSW1hZ2VUeXBlOjpSYXdTdHJpbmdBc1VS TCkgLSBBbGxvd2VkSW1hZ2VUeXBlOjpJbWFnZVNldCk7CisgICAgICAgICAgICBpZiAoZnVuY3Rp b25JZCA9PSBDU1NWYWx1ZVdlYmtpdEltYWdlU2V0KQorICAgICAgICAgICAgICAgIHJldHVybiBj b25zdW1lSW1hZ2VTZXQocmFuZ2UsIGNvbnRleHQsIEFsbG93ZWRJbWFnZVR5cGU6OlVSTEZ1bmN0 aW9uKTsKKyAgICAgICAgfQogICAgIH0KIAotICAgIGlmIChBbGxvd2VkSW1hZ2VUeXBlICYgQWxs b3dlZEltYWdlVHlwZTo6VVJMRnVuY3Rpb24pIHsKKyAgICBpZiAoYWxsb3dlZEltYWdlVHlwZXMu Y29udGFpbnMoQWxsb3dlZEltYWdlVHlwZTo6VVJMRnVuY3Rpb24pKSB7CiAgICAgICAgIGF1dG8g dXJpID0gY29uc3VtZVVybEFzU3RyaW5nVmlldyhyYW5nZSk7CiAgICAgICAgIGlmICghdXJpLmlz TnVsbCgpKQogICAgICAgICAgICAgcmV0dXJuIENTU0ltYWdlVmFsdWU6OmNyZWF0ZShjb21wbGV0 ZVVSTChjb250ZXh0LCB1cmkudG9BdG9tU3RyaW5nKCkpLCBjb250ZXh0LmlzQ29udGVudE9wYXF1 ZSA/IExvYWRlZEZyb21PcGFxdWVTb3VyY2U6OlllcyA6IExvYWRlZEZyb21PcGFxdWVTb3VyY2U6 Ok5vKTsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1NTMzNikKKysrIExheW91dFRlc3RzL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDIwLTAxLTI5ICBOb2FtIFJvc2Vu dGhhbCAgPG5vYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSRUdSRVNTSU9OIChyMjU0NDA2KTog R21haWwuY29tIHN0YXIvZmF2b3JpdGUgaWNvbnMgYXJlIG5vdCByZW5kZXJpbmcKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNjkwOQorCisgICAgICAg IFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAgICBBZGRlZCBlbXB0eSBVUkxzIGFu ZCBuZXcgc3ludGF4IHdpdGggcHJlZml4ZWQgaW1hZ2Utc2V0IHRvIGludmFsaWQgdGVzdHMuCisg ICAgICAgIE1vZGlmaWVkIHZhbGlkIGltYWdlLXNldCBwYXJzaW5nIHRlc3QgdG8gc2VwYXJhdGUg cHJlZml4ZWQvbm9uLXByZWZpeGVkLgorCisgICAgICAgICogZmFzdC9jc3MvaW1hZ2Utc2V0LXBh cnNpbmctZ2VuZXJhdGVkLmh0bWw6CisgICAgICAgICogZmFzdC9jc3MvaW1hZ2Utc2V0LXBhcnNp bmctaW52YWxpZC1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9jc3MvaW1hZ2Utc2V0LXBh cnNpbmctaW52YWxpZC5odG1sOgorICAgICAgICAqIGZhc3QvY3NzL2ltYWdlLXNldC1wYXJzaW5n Lmh0bWw6CisKIDIwMjAtMDEtMjggIFBpbmtpIEd5YW5jaGFuZGFuaSAgPHBneWFuY2hhbmRhbmlA YXBwbGUuY29tPgogCiAgICAgICAgIE51bGwgZGVyZWYgY3Jhc2ggaW4gRE9NV2luZG93OjpzY3Jv bGxCeSBhZnRlciBldm9raW5nIHVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygp CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9pbWFnZS1zZXQtcGFyc2luZy1nZW5lcmF0ZWQu aHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9pbWFnZS1zZXQtcGFyc2lu Zy1nZW5lcmF0ZWQuaHRtbAkocmV2aXNpb24gMjU1MzM2KQorKysgTGF5b3V0VGVzdHMvZmFzdC9j c3MvaW1hZ2Utc2V0LXBhcnNpbmctZ2VuZXJhdGVkLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTcy LDcgKzcyLDcgQEAgZnVuY3Rpb24gdGVzdEltYWdlU2V0UnVsZShkZXNjcmlwdGlvbiwgcAogfQog CiB0ZXN0SW1hZ2VTZXRSdWxlKCJTaW5nbGUgdmFsdWUgZm9yIGJhY2tncm91bmQtaW1hZ2Ugd2l0 aCBncmFkaWVudCIsCi0gICAgICAgICAgICAgICAgImJhY2tncm91bmQtaW1hZ2UiLAorICAgICAg ICAgICAgICAgICJiYWNrZ3JvdW5kLWltYWdlIiwgCiAgICAgICAgICAgICAgICAgImxpbmVhci1n cmFkaWVudChncmVlbiwgd2hpdGUpIDF4IiwgMiwKICAgICAgICAgICAgICAgICBbImxpbmVhci1n cmFkaWVudChncmVlbiwgd2hpdGUpIiwgIjFkcHB4Il0pOwogdGVzdEltYWdlU2V0UnVsZSgiU2lu Z2xlIHZhbHVlIGZvciBjb250ZW50IHdpdGggZ3JhZGllbnQiLApJbmRleDogTGF5b3V0VGVzdHMv ZmFzdC9jc3MvaW1hZ2Utc2V0LXBhcnNpbmctaW52YWxpZC1leHBlY3RlZC50eHQKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9jc3MvaW1hZ2Utc2V0LXBhcnNpbmctaW52YWxpZC1leHBl Y3RlZC50eHQJKHJldmlzaW9uIDI1NTMzNikKKysrIExheW91dFRlc3RzL2Zhc3QvY3NzL2ltYWdl LXNldC1wYXJzaW5nLWludmFsaWQtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0xMCw2 ICsxMCwxOCBAQCBQQVNTIGNzc1J1bGUgaXMgbnVsbAogTm8geCA6IHVybCgnI2EnKSAxCiBQQVNT IGNzc1J1bGUgaXMgbnVsbAogCitObyByYXcgc3RyaW5nIFVSTHMgd2l0aCBwcmVmaXhlZCBpbWFn ZS1zZXQgOiAnaW1hZ2UucG5nJyAxeAorUEFTUyBjc3NSdWxlIGlzIG51bGwKKworQ29tYmluYXRp b24gb2YgdmFsaWQgYW5kIGludmFsaWQgd2l0aCBwcmVmaXhlZCBpbWFnZS1zZXQgOiAnaW1hZ2Uu cG5nJyAxeCwgdXJsKGltYWdlLnBuZykgMngKK1BBU1MgY3NzUnVsZSBpcyBudWxsCisKK0NvbWJp bmF0aW9uIG9mIHZhbGlkIGFuZCBpbnZhbGlkIHdpdGggdW5wcmVmaXhlZCBpbWFnZS1zZXQgOiAn JyAxeCwgdXJsKGltYWdlLnBuZykgMngKK0ZBSUwgY3NzUnVsZSBzaG91bGQgYmUgbnVsbC4gV2Fz IFtvYmplY3QgQ1NTVmFsdWVMaXN0XS4KKworTm8gZ3JhZGllbnRzIHdpdGggcHJlZml4ZWQgaW1h Z2Utc2V0IDogbGluZWFyLWdyYWRpZW50KGJsYWNrLCB3aGl0ZSkgMXgKK1BBU1MgY3NzUnVsZSBp cyBudWxsCisKIE5vIGNvbW1hIDogdXJsKCcjYScpIDF4IHVybCgnI2InKSAyeAogUEFTUyBjc3NS dWxlIGlzIG51bGwKIApJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9jc3MvaW1hZ2Utc2V0LXBhcnNp bmctaW52YWxpZC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvY3NzL2ltYWdl LXNldC1wYXJzaW5nLWludmFsaWQuaHRtbAkocmV2aXNpb24gMjU1MzM2KQorKysgTGF5b3V0VGVz dHMvZmFzdC9jc3MvaW1hZ2Utc2V0LXBhcnNpbmctaW52YWxpZC5odG1sCSh3b3JraW5nIGNvcHkp CkBAIC0xMiwxMyArMTIsMTMgQEAgZGVzY3JpcHRpb24oIlRlc3QgdGhlIHBhcnNpbmcgb2YgdGhl IC13ZQogLy8gVGhlc2UgaGF2ZSB0byBiZSBnbG9iYWwgZm9yIHRoZSB0ZXN0IGhlbHBlcnMgdG8g c2VlIHRoZW0uCiB2YXIgY3NzUnVsZTsKIAotZnVuY3Rpb24gdGVzdEludmFsaWRJbWFnZVNldChk ZXNjcmlwdGlvbiwgcHJvcGVydHksIHJ1bGUpCitmdW5jdGlvbiB0ZXN0SW52YWxpZEltYWdlU2V0 KGRlc2NyaXB0aW9uLCBwcm9wZXJ0eSwgcnVsZSwgYXR0cmlidXRlID0gImltYWdlLXNldCIpCiB7 CiAgICAgZGVidWcoIiIpOwogICAgIGRlYnVnKGRlc2NyaXB0aW9uICsgIiA6ICIgKyBydWxlKTsK IAogICAgIHZhciBkaXYgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICBkaXYu c2V0QXR0cmlidXRlKCJzdHlsZSIsIHByb3BlcnR5ICsgIjogLXdlYmtpdC1pbWFnZS1zZXQoIiAr IHJ1bGUgKyAiKSIpOworICAgIGRpdi5zZXRBdHRyaWJ1dGUoInN0eWxlIiwgcHJvcGVydHkgKyAi OiAiICsgYXR0cmlidXRlICsgIigiICsgcnVsZSArICIpIik7CiAgICAgZG9jdW1lbnQuYm9keS5h cHBlbmRDaGlsZChkaXYpOwogCiAgICAgY3NzUnVsZSA9IGRpdi5zdHlsZS5nZXRQcm9wZXJ0eUNT U1ZhbHVlKHByb3BlcnR5KTsKQEAgLTI5LDYgKzI5LDEwIEBAIGZ1bmN0aW9uIHRlc3RJbnZhbGlk SW1hZ2VTZXQoZGVzY3JpcHRpb24KIAogdGVzdEludmFsaWRJbWFnZVNldCgiVG9vIG1hbnkgdXJs IHBhcmFtZXRlcnMiLCAiYmFja2dyb3VuZC1pbWFnZSIsICJ1cmwoI2EgI2IpIik7CiB0ZXN0SW52 YWxpZEltYWdlU2V0KCJObyB4IiwgImJhY2tncm91bmQtaW1hZ2UiLCAidXJsKCcjYScpIDEiKTsK K3Rlc3RJbnZhbGlkSW1hZ2VTZXQoIk5vIHJhdyBzdHJpbmcgVVJMcyB3aXRoIHByZWZpeGVkIGlt YWdlLXNldCIsICJiYWNrZ3JvdW5kLWltYWdlIiwgIidpbWFnZS5wbmcnIDF4IiwgIi13ZWJraXQt aW1hZ2Utc2V0Iik7Cit0ZXN0SW52YWxpZEltYWdlU2V0KCJDb21iaW5hdGlvbiBvZiB2YWxpZCBh bmQgaW52YWxpZCB3aXRoIHByZWZpeGVkIGltYWdlLXNldCIsICJiYWNrZ3JvdW5kLWltYWdlIiwg IidpbWFnZS5wbmcnIDF4LCB1cmwoaW1hZ2UucG5nKSAyeCIsICItd2Via2l0LWltYWdlLXNldCIp OwordGVzdEludmFsaWRJbWFnZVNldCgiQ29tYmluYXRpb24gb2YgdmFsaWQgYW5kIGludmFsaWQg d2l0aCB1bnByZWZpeGVkIGltYWdlLXNldCIsICJiYWNrZ3JvdW5kLWltYWdlIiwgIicnIDF4LCB1 cmwoaW1hZ2UucG5nKSAyeCIpOwordGVzdEludmFsaWRJbWFnZVNldCgiTm8gZ3JhZGllbnRzIHdp dGggcHJlZml4ZWQgaW1hZ2Utc2V0IiwgImJhY2tncm91bmQtaW1hZ2UiLCAibGluZWFyLWdyYWRp ZW50KGJsYWNrLCB3aGl0ZSkgMXgiLCAiLXdlYmtpdC1pbWFnZS1zZXQiKTsKIHRlc3RJbnZhbGlk SW1hZ2VTZXQoIk5vIGNvbW1hIiwgImJhY2tncm91bmQtaW1hZ2UiLCAidXJsKCcjYScpIDF4IHVy bCgnI2InKSAyeCIpOwogdGVzdEludmFsaWRJbWFnZVNldCgiVG9vIG1hbnkgc2NhbGUgZmFjdG9y IHBhcmFtZXRlcnMiLCAiYmFja2dyb3VuZC1pbWFnZSIsICJ1cmwoJyNhJykgMXggMngiKTsKIHRl c3RJbnZhbGlkSW1hZ2VTZXQoIlNjYWxlIGZhY3RvciBpcyAwIiwgImJhY2tncm91bmQtaW1hZ2Ui LCAidXJsKCcjYScpIDB4Iik7CkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2Nzcy9pbWFnZS1zZXQt cGFyc2luZy5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvY3NzL2ltYWdlLXNl dC1wYXJzaW5nLmh0bWwJKHJldmlzaW9uIDI1NTMzNikKKysrIExheW91dFRlc3RzL2Zhc3QvY3Nz L2ltYWdlLXNldC1wYXJzaW5nLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTMxLDEzICszMSwxMyBA QCBmdW5jdGlvbiBzaG91bGRCZVR5cGUoZXhwcmVzc2lvbiwgY2xhc3NOCiAvLyBUaGVzZSBoYXZl IHRvIGJlIGdsb2JhbCBmb3IgdGhlIHRlc3QgaGVscGVycyB0byBzZWUgdGhlbS4KIHZhciBpbWFn ZVNldFJ1bGUsIHN1YlJ1bGU7CiAKLWZ1bmN0aW9uIHRlc3RJbWFnZVNldFJ1bGUoZGVzY3JpcHRp b24sIHByb3BlcnR5LCBydWxlLCBleHBlY3RlZExlbmd0aCwgZXhwZWN0ZWRUZXh0cykKK2Z1bmN0 aW9uIHRlc3RJbWFnZVNldFJ1bGUoZGVzY3JpcHRpb24sIHByb3BlcnR5LCBydWxlLCBleHBlY3Rl ZExlbmd0aCwgZXhwZWN0ZWRUZXh0cywgcHJvcE5hbWUgPSAiLXdlYmtpdC1pbWFnZS1zZXQiKQog ewogICAgIGRlYnVnKCIiKTsKICAgICBkZWJ1ZyhkZXNjcmlwdGlvbiArICIgOiAiICsgcnVsZSk7 CiAKICAgICB2YXIgZGl2ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Ci0gICAgZGl2 LnNldEF0dHJpYnV0ZSgic3R5bGUiLCBwcm9wZXJ0eSArICI6IC13ZWJraXQtaW1hZ2Utc2V0KCIg KyBydWxlICsgIikiKTsKKyAgICBkaXYuc2V0QXR0cmlidXRlKCJzdHlsZSIsIHByb3BlcnR5ICsg IjogIiArIHByb3BOYW1lICsgIigiICsgcnVsZSArICIpIik7CiAgICAgZG9jdW1lbnQuYm9keS5h cHBlbmRDaGlsZChkaXYpOwogCiAgICAgaW1hZ2VTZXRSdWxlID0gZGl2LnN0eWxlLmdldFByb3Bl cnR5Q1NTVmFsdWUocHJvcGVydHkpOwpAQCAtODQsMTcgKzg0LDE3IEBAIHRlc3RJbWFnZVNldFJ1 bGUoIk11bHRpcGxlIHZhbHVlcyBmb3IgYmEKIHRlc3RJbWFnZVNldFJ1bGUoIlNpbmdsZSB2YWx1 ZSBmb3IgYmFja2dyb3VuZC1pbWFnZSB3aXRob3V0IHVybCgpIGZ1bmN0aW9uIiwKICAgICAgICAg ICAgICAgICAiYmFja2dyb3VuZC1pbWFnZSIsCiAgICAgICAgICAgICAgICAgIicjYScgMXgiLCAy LAotICAgICAgICAgICAgICAgIFsiYSIsICIxZHBweCJdKTsKKyAgICAgICAgICAgICAgICBbImEi LCAiMWRwcHgiXSwgImltYWdlLXNldCIpOwogCiB0ZXN0SW1hZ2VTZXRSdWxlKCJNdWx0aXBsZSB2 YWx1ZXMgZm9yIGJhY2tncm91bmQtaW1hZ2Ugd2l0aG91dCB1cmwoKSBmdW5jdGlvbiIsCiAgICAg ICAgICAgICAgICAgImJhY2tncm91bmQtaW1hZ2UiLAogICAgICAgICAgICAgICAgICInI2EnIDF4 LCAnI2InIDJ4IiwgNCwKLSAgICAgICAgICAgICAgICBbImEiLCAiMWRwcHgiLCAiYiIsICIyZHBw eCJdKTsKKyAgICAgICAgICAgICAgICBbImEiLCAiMWRwcHgiLCAiYiIsICIyZHBweCJdLCAiaW1h Z2Utc2V0Iik7CiAKIHRlc3RJbWFnZVNldFJ1bGUoIk1peCB2YWx1ZXMgd2l0aCBhbmQgd2l0aG91 dCB1cmwoKSBmdW5jdGlvbiIsCiAgICAgICAgICAgICAgICAgImJhY2tncm91bmQtaW1hZ2UiLAog ICAgICAgICAgICAgICAgICInI2EnIDF4LCB1cmwoJyNiJykgMngiLCA0LAotICAgICAgICAgICAg ICAgIFsiYSIsICIxZHBweCIsICJiIiwgIjJkcHB4Il0pOworICAgICAgICAgICAgICAgIFsiYSIs ICIxZHBweCIsICJiIiwgIjJkcHB4Il0sICJpbWFnZS1zZXQiKTsKIAogdGVzdEltYWdlU2V0UnVs ZSgiTXVsdGlwbGUgdmFsdWVzIGZvciBiYWNrZ3JvdW5kLWltYWdlLCBvdXQgb2Ygb3JkZXIiLAog ICAgICAgICAgICAgICAgICJiYWNrZ3JvdW5kLWltYWdlIiwK