208175 2020-02-24 20:02:07 -0800 IsolatedObject support for ProgressIndicator and Meter. 2020-02-25 08:29:13 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall apinheiro cfleizach commit-queue darin dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1622489 0 andresg_22 2020-02-24 20:02:07 -0800 IsolatedObject support for ProgressIndicator and Meter. 1622490 1 391621 andresg_22 2020-02-24 20:15:02 -0800 Created attachment 391621 Patch 1622491 2 391621 darin 2020-02-24 22:05:37 -0800 Comment on attachment 391621 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391621&action=review > Source/WebCore/accessibility/AccessibilityProgressIndicator.cpp:97 > + if (!gaugeRegionValue.isEmpty()) { > + StringBuilder builder; > + builder.append(description); > + if (builder.length()) > + builder.appendLiteral(", "); > + builder.append(gaugeRegionValue); > + description = builder.toString(); > + } Here’s a more efficient way to write this: if (!gaugeRegionValue.isEmpty()) description = makeString(description, description.isEmpty() ? "" : ", ", gaugeRegionValue); Or we could use the + operator if you prefer that to makeString. if (!gaugeRegionValue.isEmpty()) description = description + (description.isEmpty() ? "" : ", ") + gaugeRegionValue; 1622577 3 391644 andresg_22 2020-02-25 06:02:47 -0800 Created attachment 391644 Patch 1622580 4 andresg_22 2020-02-25 06:12:41 -0800 (In reply to Darin Adler from comment #2) > Comment on attachment 391621 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=391621&action=review > > > Source/WebCore/accessibility/AccessibilityProgressIndicator.cpp:97 > > + if (!gaugeRegionValue.isEmpty()) { > > + StringBuilder builder; > > + builder.append(description); > > + if (builder.length()) > > + builder.appendLiteral(", "); > > + builder.append(gaugeRegionValue); > > + description = builder.toString(); > > + } > > Here’s a more efficient way to write this: > > if (!gaugeRegionValue.isEmpty()) > description = makeString(description, description.isEmpty() ? "" : > ", ", gaugeRegionValue); > > Or we could use the + operator if you prefer that to makeString. > > if (!gaugeRegionValue.isEmpty()) > description = description + (description.isEmpty() ? "" : ", ") + > gaugeRegionValue; Thanks very much, Darin. Changed it to: if (!gaugeRegionValue.isEmpty()) description = description.isEmpty() ? gaugeRegionValue : description + ", " + gaugeRegionValue; So that we don't call operator+ unnecessarily when description.isEmpty. I assumed that the StringBuilder implementation was more efficient than the String concatenation and so I kept it. Good to know that that is not the case. Thanks again. 1622612 5 391644 commit-queue 2020-02-25 08:28:56 -0800 Comment on attachment 391644 Patch Clearing flags on attachment: 391644 Committed r257356: <https://trac.webkit.org/changeset/257356> 1622613 6 commit-queue 2020-02-25 08:28:58 -0800 All reviewed patches have been landed. Closing bug. 1622614 7 webkit-bug-importer 2020-02-25 08:29:13 -0800 <rdar://problem/59765193> 391621 2020-02-24 20:15:02 -0800 2020-02-25 06:02:44 -0800 Patch bug-208175-20200224231500.patch text/plain 10824 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGU1Yjg2ZWNlNWVmMWM2 MzljOTRkN2EwZjc4MTgyYWExMTQwZGNmOS4uYTc1NWI1ZDRmZTFmMzBmNmNkNGU3YjU4ZmYzZjc3 ODIxNWI3YmMyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTAyLTI0ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBJc29sYXRlZE9i amVjdCBzdXBwb3J0IGZvciBQcm9ncmVzc0luZGljYXRvciBhbmQgTWV0ZXIuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDgxNzUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIEVsaW1pbmF0ZWQgdGhlIG5l ZWQgdG8gZG93bmNhc3QgdG8gYW4gQWNjZXNzaWJpbGl0eVByb2dyZXNzSW5kaWNhdG9yCisgICAg ICAgIGJ5IGluY2x1ZGluZyBnYXVnZVJlZ2lvblZhbHVlRGVzY3JpcHRpb24gaW4gdGhlIHZhbHVl RGVzY3JpcHRpb24KKyAgICAgICAgbWV0aG9kLgorICAgICAgICAtIFNlcGFyYXRlZCBpc0FjY2Vz c2liaWxpdHlQcm9ncmVzc0luZGljYXRvckluc3RhbmNlIGZyb20KKyAgICAgICAgaXNQcm9ncmVz c0luZGljYXRvciwgc28gdGhhdCB0aGUgbGF0dGVyIG5vdyB3b3JrcyBmb3IgYm90aAorICAgICAg ICBBY2Nlc3NpYmlsaXR5T2JqZWN0cyBhbmQgQVhJc29sYXRlZE9iamVjdHMuCisgICAgICAgIC0g Q29tcGxldGVkIGltcGxlbWVudGF0aW9uIG9mIGlzTWV0ZXIgaW4gQVhJc29sYXRlZE9iamVjdC4K KworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oOgorICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oOgorICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVByb2dyZXNzSW5kaWNhdG9yLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvcjo6dmFsdWVEZXNj cmlwdGlvbiBjb25zdCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UHJv Z3Jlc3NJbmRpY2F0b3IuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9B WElzb2xhdGVkT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6 OmluaXRpYWxpemVBdHRyaWJ1dGVEYXRhKTogU2V0cyB0aGUgaXNNZXRlciBwcm9wZXJ0eS4KKyAg ICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmlzQWNjZXNzaWJpbGl0eVByb2dyZXNz SW5kaWNhdG9ySW5zdGFuY2UgY29uc3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0 ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9X ZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbToKKyAgICAgICAgKC1bV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlOl0pOgorICAg ICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciB2YWx1ZURlc2NyaXB0aW9uRm9y TWV0ZXJdKTogRGVsZXRlZCwgbm8gbmVlZGVkIGFueSBsb25nZXIuCisKIDIwMjAtMDItMjQgIEFu ZHJlcyBHb256YWxleiAgPGFuZHJlc2dfMjJAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJBY2Nl c3NpYmlsaXR5T2JqZWN0V3JhcHBlciB1cGRhdGVPYmplY3RCYWNraW5nU3RvcmVdIHNob3VsZCBy ZXR1cm4gdGhlIGJhY2tpbmcgb2JqZWN0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAppbmRleCA5NGNhNTlkYjY2N2EzMTIzNTU2ZGFh YWEwZjI5MDkwYTA5ODhmYjNlLi5kZDA0YTA3ZGMyMDRkMTBhNDI1N2U1YWVlNTMxYTY3MWU3MzEy ODQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlPYmplY3QuaApAQCAtMTE0LDYgKzExNCw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzQWNjZXNz aWJpbGl0eVNWR1Jvb3QoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBmYWxzZTsgfQogICAgIGJv b2wgaXNBY2Nlc3NpYmlsaXR5U1ZHRWxlbWVudCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIGZh bHNlOyB9CiAgICAgYm9vbCBpc0FjY2Vzc2liaWxpdHlUYWJsZUluc3RhbmNlKCkgY29uc3Qgb3Zl cnJpZGUgeyByZXR1cm4gZmFsc2U7IH0KKyAgICBib29sIGlzQWNjZXNzaWJpbGl0eVByb2dyZXNz SW5kaWNhdG9ySW5zdGFuY2UoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBmYWxzZTsgfQogCiAg ICAgYm9vbCBpc0F0dGFjaG1lbnRFbGVtZW50KCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gZmFs c2U7IH0KICAgICBib29sIGlzSGVhZGluZygpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIGZhbHNl OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlPYmplY3RJbnRlcmZhY2UuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eU9iamVjdEludGVyZmFjZS5oCmluZGV4IDhkZjdkMmZjZGY5NjNmNmVhMzM5NWI1YzAz ZDVlYWM0NmI0MTAzNDkuLjNhNzlhMTA2N2FkZDRhNDAzMGZjYWU3OGU1Y2U5ZWM5MWEzNGU4MzQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9i amVjdEludGVyZmFjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eU9iamVjdEludGVyZmFjZS5oCkBAIC00ODksNiArNDg5LDcgQEAgcHVibGljOgogICAg IHZpcnR1YWwgYm9vbCBpc0FjY2Vzc2liaWxpdHlTVkdSb290KCkgY29uc3QgPSAwOwogICAgIHZp cnR1YWwgYm9vbCBpc0FjY2Vzc2liaWxpdHlTVkdFbGVtZW50KCkgY29uc3QgPSAwOwogICAgIHZp cnR1YWwgYm9vbCBpc0FjY2Vzc2liaWxpdHlUYWJsZUluc3RhbmNlKCkgY29uc3QgPSAwOworICAg IHZpcnR1YWwgYm9vbCBpc0FjY2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvckluc3RhbmNlKCkg Y29uc3QgPSAwOwogCiAgICAgdmlydHVhbCBib29sIGlzQXR0YWNobWVudEVsZW1lbnQoKSBjb25z dCA9IDA7CiAgICAgdmlydHVhbCBib29sIGlzSGVhZGluZygpIGNvbnN0ID0gMDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVByb2dyZXNzSW5k aWNhdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVBy b2dyZXNzSW5kaWNhdG9yLmNwcAppbmRleCBmODEwNjljYTEwNWVmMmJmNDU3MzE3N2MwYzhmNTc3 NGM5ZDBkNGMxLi4xZjc1M2U5ZDQ4NDYyMjZjMjk5NjMyNmExYWRiZDE4ZGI5OWViOWU0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlQcm9ncmVz c0luZGljYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5UHJvZ3Jlc3NJbmRpY2F0b3IuY3BwCkBAIC03MSwyNSArNzEsMzMgQEAgU3RyaW5nIEFj Y2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvcjo6dmFsdWVEZXNjcmlwdGlvbigpIGNvbnN0CiAK ICNpZiBFTkFCTEUoTUVURVJfRUxFTUVOVCkKICAgICBpZiAoIW1fcmVuZGVyZXItPmlzTWV0ZXIo KSkKLSAgICAgICAgcmV0dXJuIFN0cmluZygpOworICAgICAgICByZXR1cm4gZGVzY3JpcHRpb247 CiAKICAgICBIVE1MTWV0ZXJFbGVtZW50KiBtZXRlciA9IG1ldGVyRWxlbWVudCgpOwogICAgIGlm ICghbWV0ZXIpCi0gICAgICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICAgICAgcmV0dXJuIGRlc2Ny aXB0aW9uOwogCiAgICAgLy8gVGhlIEhUTUwgc3BlYyBlbmNvdXJhZ2VzIGF1dGhvcnMgdG8gaW5j bHVkZSBhIHRleHR1YWwgcmVwcmVzZW50YXRpb24gb2YgdGhlIG1ldGVyJ3Mgc3RhdGUgaW4KICAg ICAvLyB0aGUgZWxlbWVudCdzIGNvbnRlbnRzLiBXZSdsbCBmYWxsIGJhY2sgb24gdGhhdCBpZiB0 aGVyZSBpcyBub3QgYSBtb3JlIGFjY2Vzc2libGUgYWx0ZXJuYXRpdmUuCiAgICAgQWNjZXNzaWJp bGl0eU9iamVjdCogYXhNZXRlciA9IGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUobWV0ZXIp OwotICAgIGlmIChpczxBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdD4oYXhNZXRlcikpIHsKKyAgICBp ZiAoaXM8QWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q+KGF4TWV0ZXIpKQogICAgICAgICBkZXNjcmlw dGlvbiA9IGRvd25jYXN0PEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0PihheE1ldGVyKS0+YWNjZXNz aWJpbGl0eURlc2NyaXB0aW9uRm9yQ2hpbGRyZW4oKTsKLSAgICAgICAgaWYgKCFkZXNjcmlwdGlv bi5pc0VtcHR5KCkpCi0gICAgICAgICAgICByZXR1cm4gZGVzY3JpcHRpb247Ci0gICAgfQogCi0g ICAgcmV0dXJuIG1ldGVyLT50ZXh0Q29udGVudCgpOworICAgIGlmIChkZXNjcmlwdGlvbi5pc0Vt cHR5KCkpCisgICAgICAgIGRlc2NyaXB0aW9uID0gbWV0ZXItPnRleHRDb250ZW50KCk7CisKKyAg ICBTdHJpbmcgZ2F1Z2VSZWdpb25WYWx1ZSA9IGdhdWdlUmVnaW9uVmFsdWVEZXNjcmlwdGlvbigp OworICAgIGlmICghZ2F1Z2VSZWdpb25WYWx1ZS5pc0VtcHR5KCkpIHsKKyAgICAgICAgU3RyaW5n QnVpbGRlciBidWlsZGVyOworICAgICAgICBidWlsZGVyLmFwcGVuZChkZXNjcmlwdGlvbik7Cisg ICAgICAgIGlmIChidWlsZGVyLmxlbmd0aCgpKQorICAgICAgICAgICAgYnVpbGRlci5hcHBlbmRM aXRlcmFsKCIsICIpOworICAgICAgICBidWlsZGVyLmFwcGVuZChnYXVnZVJlZ2lvblZhbHVlKTsK KyAgICAgICAgZGVzY3JpcHRpb24gPSBidWlsZGVyLnRvU3RyaW5nKCk7CisgICAgfQogI2VuZGlm CiAKLSAgICByZXR1cm4gU3RyaW5nKCk7CisgICAgcmV0dXJuIGRlc2NyaXB0aW9uOwogfQogCiBm bG9hdCBBY2Nlc3NpYmlsaXR5UHJvZ3Jlc3NJbmRpY2F0b3I6OnZhbHVlRm9yUmFuZ2UoKSBjb25z dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 UHJvZ3Jlc3NJbmRpY2F0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eVByb2dyZXNzSW5kaWNhdG9yLmgKaW5kZXggN2JiMDM2MGJlMjdmYzY2OWE5ODVmMmE4 NTBmNjdkOTYwNTE3Zjg1NS4uZDE1ZTBjODI1MTg5MDJmZGMyMjI2M2ZiYjUxMjAxYzIwNjNjNzc1 YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 UHJvZ3Jlc3NJbmRpY2F0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0Fj Y2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvci5oCkBAIC0zNywxNiArMzcsMjAgQEAgcHVibGlj OgogICAgIHN0YXRpYyBSZWY8QWNjZXNzaWJpbGl0eVByb2dyZXNzSW5kaWNhdG9yPiBjcmVhdGUo UmVuZGVyUHJvZ3Jlc3MqKTsKICNpZiBFTkFCTEUoTUVURVJfRUxFTUVOVCkKICAgICBzdGF0aWMg UmVmPEFjY2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvcj4gY3JlYXRlKFJlbmRlck1ldGVyKik7 Ci0gICAgU3RyaW5nIGdhdWdlUmVnaW9uVmFsdWVEZXNjcmlwdGlvbigpIGNvbnN0OwogI2VuZGlm CiAgICAgRWxlbWVudCogZWxlbWVudCgpIGNvbnN0IG92ZXJyaWRlOwogCiBwcml2YXRlOgogICAg IEFjY2Vzc2liaWxpdHlSb2xlIHJvbGVWYWx1ZSgpIGNvbnN0IG92ZXJyaWRlOwotCiAgICAgYm9v bCBpc1Byb2dyZXNzSW5kaWNhdG9yKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQog CisgICAgLy8gVXNlZCBpbiB0eXBlIGNoZWNraW5nIGZ1bmN0aW9uIGlzPEFjY2Vzc2liaWxpdHlQ cm9ncmVzc0luZGljYXRvcj4uCisgICAgYm9vbCBpc0FjY2Vzc2liaWxpdHlQcm9ncmVzc0luZGlj YXRvckluc3RhbmNlKCkgY29uc3QgZmluYWwgeyByZXR1cm4gdHJ1ZTsgfQorCiAgICAgU3RyaW5n IHZhbHVlRGVzY3JpcHRpb24oKSBjb25zdCBvdmVycmlkZTsKKyNpZiBFTkFCTEUoTUVURVJfRUxF TUVOVCkKKyAgICBTdHJpbmcgZ2F1Z2VSZWdpb25WYWx1ZURlc2NyaXB0aW9uKCkgY29uc3Q7Cisj ZW5kaWYKICAgICBmbG9hdCB2YWx1ZUZvclJhbmdlKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgZmxv YXQgbWF4VmFsdWVGb3JSYW5nZSgpIGNvbnN0IG92ZXJyaWRlOwogICAgIGZsb2F0IG1pblZhbHVl Rm9yUmFuZ2UoKSBjb25zdCBvdmVycmlkZTsKQEAgLTY0LDQgKzY4LDQgQEAgcHJpdmF0ZToKIAog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCi1TUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0FDQ0VTU0lC SUxJVFkoQWNjZXNzaWJpbGl0eVByb2dyZXNzSW5kaWNhdG9yLCBpc1Byb2dyZXNzSW5kaWNhdG9y KCkpCitTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0FDQ0VTU0lCSUxJVFkoQWNjZXNzaWJpbGl0eVBy b2dyZXNzSW5kaWNhdG9yLCBpc0FjY2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvckluc3RhbmNl KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJl ZS9BWElzb2xhdGVkT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNv bGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCmluZGV4IGZlYTc5MzM5MDg2Yjg2NjgzNTZl MDRmM2NiZWVkYzgyZmExNjUwZDAuLjdiMTQ2ZTdjYjVjODc5MzJmNWE4ZWQ1ZmRiMjdiOTdjMDBk ZWZkYjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0 cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuY3BwCkBAIC05Nyw2ICs5Nyw3IEBAIHZv aWQgQVhJc29sYXRlZE9iamVjdDo6aW5pdGlhbGl6ZUF0dHJpYnV0ZURhdGEoQVhDb3JlT2JqZWN0 JiBvYmplY3QsIGJvb2wgaXNSb290CiAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6Oklz TWVudUxpc3RPcHRpb24sIG9iamVjdC5pc01lbnVMaXN0T3B0aW9uKCkpOwogICAgIHNldFByb3Bl cnR5KEFYUHJvcGVydHlOYW1lOjpJc01lbnVMaXN0UG9wdXAsIG9iamVjdC5pc01lbnVMaXN0UG9w dXAoKSk7CiAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OklzTWVudVJlbGF0ZWQsIG9i amVjdC5pc01lbnVSZWxhdGVkKCkpOworICAgIHNldFByb3BlcnR5KEFYUHJvcGVydHlOYW1lOjpJ c01ldGVyLCBvYmplY3QuaXNNZXRlcigpKTsKICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFt ZTo6SXNNdWx0aVNlbGVjdGFibGUsIG9iamVjdC5pc011bHRpU2VsZWN0YWJsZSgpKTsKICAgICBz ZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6SXNPZmZTY3JlZW4sIG9iamVjdC5pc09mZlNjcmVl bigpKTsKICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6SXNPblNjcmVlbiwgb2JqZWN0 LmlzT25TY3JlZW4oKSk7CkBAIC05MzQsNiArOTM1LDEyIEBAIGJvb2wgQVhJc29sYXRlZE9iamVj dDo6aXNBY2Nlc3NpYmlsaXR5VGFibGVJbnN0YW5jZSgpIGNvbnN0CiAgICAgcmV0dXJuIGZhbHNl OwogfQogCitib29sIEFYSXNvbGF0ZWRPYmplY3Q6OmlzQWNjZXNzaWJpbGl0eVByb2dyZXNzSW5k aWNhdG9ySW5zdGFuY2UoKSBjb25zdAoreworICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAg IHJldHVybiBmYWxzZTsKK30KKwogYm9vbCBBWElzb2xhdGVkT2JqZWN0Ojppc0F0dGFjaG1lbnRF bGVtZW50KCkgY29uc3QKIHsKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmpl Y3QuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0 ZWRPYmplY3QuaAppbmRleCAxMWUwOWMyMDRiY2Y5YjIyZjY2ZjA1MjUwNWJlMDFlNWZhMmRjYzdi Li5hZGE5OTEzZGJmYzYzNjMxNzlkN2M5YmNhNzIxZjI3OTVjYWU3MmY5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0 LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29s YXRlZE9iamVjdC5oCkBAIC02ODksNiArNjg5LDcgQEAgcHJpdmF0ZToKICAgICBib29sIGlzQWNj ZXNzaWJpbGl0eVNWR1Jvb3QoKSBjb25zdCBvdmVycmlkZTsKICAgICBib29sIGlzQWNjZXNzaWJp bGl0eVNWR0VsZW1lbnQoKSBjb25zdCBvdmVycmlkZTsKICAgICBib29sIGlzQWNjZXNzaWJpbGl0 eVRhYmxlSW5zdGFuY2UoKSBjb25zdCBvdmVycmlkZTsKKyAgICBib29sIGlzQWNjZXNzaWJpbGl0 eVByb2dyZXNzSW5kaWNhdG9ySW5zdGFuY2UoKSBjb25zdCBvdmVycmlkZTsKICAgICBib29sIGlz QXR0YWNobWVudEVsZW1lbnQoKSBjb25zdCBvdmVycmlkZTsKICAgICBib29sIGlzTmF0aXZlSW1h Z2UoKSBjb25zdCBvdmVycmlkZTsKICAgICBib29sIGlzSW1hZ2VCdXR0b24oKSBjb25zdCBvdmVy cmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFj Y2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KaW5kZXggNDczNTc1 ZmNjNDQ1NmVhOGE4NGNhYWFmZTE1YzAwYjIwN2ZkMDFjZi4uNTc2YTRiYjhmNWU5NmUwZmVlYWQ3 M2RlNTFmZmMxYWIxMzc1MDEzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KKysrIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJN YWMubW0KQEAgLTIzMjEsMjkgKzIzMjEsNiBAQCBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9O U19FTkQKICAgICB9KTsKIH0KIAotLSAoTlNTdHJpbmcgKil2YWx1ZURlc2NyaXB0aW9uRm9yTWV0 ZXIKLXsKLSAgICBpZiAoIXNlbGYuYXhCYWNraW5nT2JqZWN0KQotICAgICAgICByZXR1cm4gbmls OwotICAgIAotICAgIFN0cmluZyB2YWx1ZURlc2NyaXB0aW9uID0gc2VsZi5heEJhY2tpbmdPYmpl Y3QtPnZhbHVlRGVzY3JpcHRpb24oKTsKLSNpZiBFTkFCTEUoTUVURVJfRUxFTUVOVCkKLSAgICBp ZiAoIWlzPEFjY2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvcj4oc2VsZi5heEJhY2tpbmdPYmpl Y3QpKQotICAgICAgICByZXR1cm4gdmFsdWVEZXNjcmlwdGlvbjsKLSAgICBhdXRvICZtZXRlciA9 IGRvd25jYXN0PEFjY2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvcj4oKnNlbGYuYXhCYWNraW5n T2JqZWN0KTsKLSAgICBTdHJpbmcgZ2F1Z2VSZWdpb25WYWx1ZSA9IG1ldGVyLmdhdWdlUmVnaW9u VmFsdWVEZXNjcmlwdGlvbigpOwotICAgIGlmICghZ2F1Z2VSZWdpb25WYWx1ZS5pc0VtcHR5KCkp IHsKLSAgICAgICAgU3RyaW5nQnVpbGRlciBidWlsZGVyOwotICAgICAgICBidWlsZGVyLmFwcGVu ZCh2YWx1ZURlc2NyaXB0aW9uKTsKLSAgICAgICAgaWYgKGJ1aWxkZXIubGVuZ3RoKCkpCi0gICAg ICAgICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIiwgIik7Ci0gICAgICAgIGJ1aWxkZXIuYXBw ZW5kKGdhdWdlUmVnaW9uVmFsdWUpOwotICAgICAgICByZXR1cm4gYnVpbGRlci50b1N0cmluZygp OwotICAgIH0KLSNlbmRpZgotICAgIHJldHVybiB2YWx1ZURlc2NyaXB0aW9uOwotfQotCiAtIChp ZCl3aW5kb3dFbGVtZW50OihOU1N0cmluZyopYXR0cmlidXRlTmFtZQogewogICAgIHJldHVybiBB Y2Nlc3NpYmlsaXR5OjpyZXRyaWV2ZUF1dG9yZWxlYXNlZFZhbHVlRnJvbU1haW5UaHJlYWQ8aWQ+ KFthdHRyaWJ1dGVOYW1lLCBwcm90ZWN0ZWRTZWxmID0gUmV0YWluUHRyPFdlYkFjY2Vzc2liaWxp dHlPYmplY3RXcmFwcGVyPihzZWxmKV0gKCkgLT4gUmV0YWluUHRyPGlkPiB7CkBAIC0yOTM5LDEx ICsyOTE2LDggQEAgQUxMT1dfREVQUkVDQVRFRF9JTVBMRU1FTlRBVElPTlNfRU5ECiAgICAgICAg IHJldHVybiBuaWw7CiAgICAgfQogCi0gICAgaWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1YWxUb1N0 cmluZzpOU0FjY2Vzc2liaWxpdHlWYWx1ZURlc2NyaXB0aW9uQXR0cmlidXRlXSkgewotICAgICAg ICBpZiAoYmFja2luZ09iamVjdC0+aXNNZXRlcigpKQotICAgICAgICAgICAgcmV0dXJuIFtzZWxm IHZhbHVlRGVzY3JpcHRpb25Gb3JNZXRlcl07CisgICAgaWYgKFthdHRyaWJ1dGVOYW1lIGlzRXF1 YWxUb1N0cmluZzpOU0FjY2Vzc2liaWxpdHlWYWx1ZURlc2NyaXB0aW9uQXR0cmlidXRlXSkKICAg ICAgICAgcmV0dXJuIGJhY2tpbmdPYmplY3QtPnZhbHVlRGVzY3JpcHRpb24oKTsKLSAgICB9CiAK ICAgICBpZiAoW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJpbGl0eU9y aWVudGF0aW9uQXR0cmlidXRlXSkgewogICAgICAgICBBY2Nlc3NpYmlsaXR5T3JpZW50YXRpb24g ZWxlbWVudE9yaWVudGF0aW9uID0gYmFja2luZ09iamVjdC0+b3JpZW50YXRpb24oKTsK 391644 2020-02-25 06:02:47 -0800 2020-02-25 08:28:56 -0800 Patch bug-208175-20200225090246.patch text/plain 10691 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MjU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGU1Yjg2ZWNlNWVmMWM2 MzljOTRkN2EwZjc4MTgyYWExMTQwZGNmOS4uYTc1NWI1ZDRmZTFmMzBmNmNkNGU3YjU4ZmYzZjc3 ODIxNWI3YmMyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTAyLTI0ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBJc29sYXRlZE9i amVjdCBzdXBwb3J0IGZvciBQcm9ncmVzc0luZGljYXRvciBhbmQgTWV0ZXIuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDgxNzUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIEVsaW1pbmF0ZWQgdGhlIG5l ZWQgdG8gZG93bmNhc3QgdG8gYW4gQWNjZXNzaWJpbGl0eVByb2dyZXNzSW5kaWNhdG9yCisgICAg ICAgIGJ5IGluY2x1ZGluZyBnYXVnZVJlZ2lvblZhbHVlRGVzY3JpcHRpb24gaW4gdGhlIHZhbHVl RGVzY3JpcHRpb24KKyAgICAgICAgbWV0aG9kLgorICAgICAgICAtIFNlcGFyYXRlZCBpc0FjY2Vz c2liaWxpdHlQcm9ncmVzc0luZGljYXRvckluc3RhbmNlIGZyb20KKyAgICAgICAgaXNQcm9ncmVz c0luZGljYXRvciwgc28gdGhhdCB0aGUgbGF0dGVyIG5vdyB3b3JrcyBmb3IgYm90aAorICAgICAg ICBBY2Nlc3NpYmlsaXR5T2JqZWN0cyBhbmQgQVhJc29sYXRlZE9iamVjdHMuCisgICAgICAgIC0g Q29tcGxldGVkIGltcGxlbWVudGF0aW9uIG9mIGlzTWV0ZXIgaW4gQVhJc29sYXRlZE9iamVjdC4K KworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oOgorICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdEludGVyZmFjZS5oOgorICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVByb2dyZXNzSW5kaWNhdG9yLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvcjo6dmFsdWVEZXNj cmlwdGlvbiBjb25zdCk6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UHJv Z3Jlc3NJbmRpY2F0b3IuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9B WElzb2xhdGVkT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6 OmluaXRpYWxpemVBdHRyaWJ1dGVEYXRhKTogU2V0cyB0aGUgaXNNZXRlciBwcm9wZXJ0eS4KKyAg ICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRPYmplY3Q6OmlzQWNjZXNzaWJpbGl0eVByb2dyZXNz SW5kaWNhdG9ySW5zdGFuY2UgY29uc3QpOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0 ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9X ZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbToKKyAgICAgICAgKC1bV2ViQWNjZXNz aWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlOl0pOgorICAg ICAgICAoLVtXZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciB2YWx1ZURlc2NyaXB0aW9uRm9y TWV0ZXJdKTogRGVsZXRlZCwgbm8gbmVlZGVkIGFueSBsb25nZXIuCisKIDIwMjAtMDItMjQgIEFu ZHJlcyBHb256YWxleiAgPGFuZHJlc2dfMjJAYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJBY2Nl c3NpYmlsaXR5T2JqZWN0V3JhcHBlciB1cGRhdGVPYmplY3RCYWNraW5nU3RvcmVdIHNob3VsZCBy ZXR1cm4gdGhlIGJhY2tpbmcgb2JqZWN0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAppbmRleCA5NGNhNTlkYjY2N2EzMTIzNTU2ZGFh YWEwZjI5MDkwYTA5ODhmYjNlLi5kZDA0YTA3ZGMyMDRkMTBhNDI1N2U1YWVlNTMxYTY3MWU3MzEy ODQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlPYmplY3QuaApAQCAtMTE0LDYgKzExNCw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzQWNjZXNz aWJpbGl0eVNWR1Jvb3QoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBmYWxzZTsgfQogICAgIGJv b2wgaXNBY2Nlc3NpYmlsaXR5U1ZHRWxlbWVudCgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIGZh bHNlOyB9CiAgICAgYm9vbCBpc0FjY2Vzc2liaWxpdHlUYWJsZUluc3RhbmNlKCkgY29uc3Qgb3Zl cnJpZGUgeyByZXR1cm4gZmFsc2U7IH0KKyAgICBib29sIGlzQWNjZXNzaWJpbGl0eVByb2dyZXNz SW5kaWNhdG9ySW5zdGFuY2UoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBmYWxzZTsgfQogCiAg ICAgYm9vbCBpc0F0dGFjaG1lbnRFbGVtZW50KCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gZmFs c2U7IH0KICAgICBib29sIGlzSGVhZGluZygpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIGZhbHNl OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxp dHlPYmplY3RJbnRlcmZhY2UuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eU9iamVjdEludGVyZmFjZS5oCmluZGV4IDhkZjdkMmZjZGY5NjNmNmVhMzM5NWI1YzAz ZDVlYWM0NmI0MTAzNDkuLjNhNzlhMTA2N2FkZDRhNDAzMGZjYWU3OGU1Y2U5ZWM5MWEzNGU4MzQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9i amVjdEludGVyZmFjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eU9iamVjdEludGVyZmFjZS5oCkBAIC00ODksNiArNDg5LDcgQEAgcHVibGljOgogICAg IHZpcnR1YWwgYm9vbCBpc0FjY2Vzc2liaWxpdHlTVkdSb290KCkgY29uc3QgPSAwOwogICAgIHZp cnR1YWwgYm9vbCBpc0FjY2Vzc2liaWxpdHlTVkdFbGVtZW50KCkgY29uc3QgPSAwOwogICAgIHZp cnR1YWwgYm9vbCBpc0FjY2Vzc2liaWxpdHlUYWJsZUluc3RhbmNlKCkgY29uc3QgPSAwOworICAg IHZpcnR1YWwgYm9vbCBpc0FjY2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvckluc3RhbmNlKCkg Y29uc3QgPSAwOwogCiAgICAgdmlydHVhbCBib29sIGlzQXR0YWNobWVudEVsZW1lbnQoKSBjb25z dCA9IDA7CiAgICAgdmlydHVhbCBib29sIGlzSGVhZGluZygpIGNvbnN0ID0gMDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVByb2dyZXNzSW5k aWNhdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVBy b2dyZXNzSW5kaWNhdG9yLmNwcAppbmRleCBmODEwNjljYTEwNWVmMmJmNDU3MzE3N2MwYzhmNTc3 NGM5ZDBkNGMxLi4xZGE5YTg1NzcwNzU5N2JhYWM1ZTc1MzgxMTFiM2QwZmFlZTIzNzUxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlQcm9ncmVz c0luZGljYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3Np YmlsaXR5UHJvZ3Jlc3NJbmRpY2F0b3IuY3BwCkBAIC03MSwyNSArNzEsMjcgQEAgU3RyaW5nIEFj Y2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvcjo6dmFsdWVEZXNjcmlwdGlvbigpIGNvbnN0CiAK ICNpZiBFTkFCTEUoTUVURVJfRUxFTUVOVCkKICAgICBpZiAoIW1fcmVuZGVyZXItPmlzTWV0ZXIo KSkKLSAgICAgICAgcmV0dXJuIFN0cmluZygpOworICAgICAgICByZXR1cm4gZGVzY3JpcHRpb247 CiAKICAgICBIVE1MTWV0ZXJFbGVtZW50KiBtZXRlciA9IG1ldGVyRWxlbWVudCgpOwogICAgIGlm ICghbWV0ZXIpCi0gICAgICAgIHJldHVybiBTdHJpbmcoKTsKKyAgICAgICAgcmV0dXJuIGRlc2Ny aXB0aW9uOwogCiAgICAgLy8gVGhlIEhUTUwgc3BlYyBlbmNvdXJhZ2VzIGF1dGhvcnMgdG8gaW5j bHVkZSBhIHRleHR1YWwgcmVwcmVzZW50YXRpb24gb2YgdGhlIG1ldGVyJ3Mgc3RhdGUgaW4KICAg ICAvLyB0aGUgZWxlbWVudCdzIGNvbnRlbnRzLiBXZSdsbCBmYWxsIGJhY2sgb24gdGhhdCBpZiB0 aGVyZSBpcyBub3QgYSBtb3JlIGFjY2Vzc2libGUgYWx0ZXJuYXRpdmUuCiAgICAgQWNjZXNzaWJp bGl0eU9iamVjdCogYXhNZXRlciA9IGF4T2JqZWN0Q2FjaGUoKS0+Z2V0T3JDcmVhdGUobWV0ZXIp OwotICAgIGlmIChpczxBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdD4oYXhNZXRlcikpIHsKKyAgICBp ZiAoaXM8QWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q+KGF4TWV0ZXIpKQogICAgICAgICBkZXNjcmlw dGlvbiA9IGRvd25jYXN0PEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0PihheE1ldGVyKS0+YWNjZXNz aWJpbGl0eURlc2NyaXB0aW9uRm9yQ2hpbGRyZW4oKTsKLSAgICAgICAgaWYgKCFkZXNjcmlwdGlv bi5pc0VtcHR5KCkpCi0gICAgICAgICAgICByZXR1cm4gZGVzY3JpcHRpb247Ci0gICAgfQogCi0g ICAgcmV0dXJuIG1ldGVyLT50ZXh0Q29udGVudCgpOworICAgIGlmIChkZXNjcmlwdGlvbi5pc0Vt cHR5KCkpCisgICAgICAgIGRlc2NyaXB0aW9uID0gbWV0ZXItPnRleHRDb250ZW50KCk7CisKKyAg ICBTdHJpbmcgZ2F1Z2VSZWdpb25WYWx1ZSA9IGdhdWdlUmVnaW9uVmFsdWVEZXNjcmlwdGlvbigp OworICAgIGlmICghZ2F1Z2VSZWdpb25WYWx1ZS5pc0VtcHR5KCkpCisgICAgICAgIGRlc2NyaXB0 aW9uID0gZGVzY3JpcHRpb24uaXNFbXB0eSgpID8gZ2F1Z2VSZWdpb25WYWx1ZSA6IGRlc2NyaXB0 aW9uICsgIiwgIiArIGdhdWdlUmVnaW9uVmFsdWU7CiAjZW5kaWYKIAotICAgIHJldHVybiBTdHJp bmcoKTsKKyAgICByZXR1cm4gZGVzY3JpcHRpb247CiB9CiAKIGZsb2F0IEFjY2Vzc2liaWxpdHlQ cm9ncmVzc0luZGljYXRvcjo6dmFsdWVGb3JSYW5nZSgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvci5o IGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UHJvZ3Jlc3NJbmRp Y2F0b3IuaAppbmRleCA3YmIwMzYwYmUyN2ZjNjY5YTk4NWYyYTg1MGY2N2Q5NjA1MTdmODU1Li5k MTVlMGM4MjUxODkwMmZkYzIyMjYzZmJiNTEyMDFjMjA2M2M3NzVhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVByb2dyZXNz SW5kaWNhdG9yLmgKQEAgLTM3LDE2ICszNywyMCBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFJlZjxB Y2Nlc3NpYmlsaXR5UHJvZ3Jlc3NJbmRpY2F0b3I+IGNyZWF0ZShSZW5kZXJQcm9ncmVzcyopOwog I2lmIEVOQUJMRShNRVRFUl9FTEVNRU5UKQogICAgIHN0YXRpYyBSZWY8QWNjZXNzaWJpbGl0eVBy b2dyZXNzSW5kaWNhdG9yPiBjcmVhdGUoUmVuZGVyTWV0ZXIqKTsKLSAgICBTdHJpbmcgZ2F1Z2VS ZWdpb25WYWx1ZURlc2NyaXB0aW9uKCkgY29uc3Q7CiAjZW5kaWYKICAgICBFbGVtZW50KiBlbGVt ZW50KCkgY29uc3Qgb3ZlcnJpZGU7CiAKIHByaXZhdGU6CiAgICAgQWNjZXNzaWJpbGl0eVJvbGUg cm9sZVZhbHVlKCkgY29uc3Qgb3ZlcnJpZGU7Ci0KICAgICBib29sIGlzUHJvZ3Jlc3NJbmRpY2F0 b3IoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiB0cnVlOyB9CiAKKyAgICAvLyBVc2VkIGluIHR5 cGUgY2hlY2tpbmcgZnVuY3Rpb24gaXM8QWNjZXNzaWJpbGl0eVByb2dyZXNzSW5kaWNhdG9yPi4K KyAgICBib29sIGlzQWNjZXNzaWJpbGl0eVByb2dyZXNzSW5kaWNhdG9ySW5zdGFuY2UoKSBjb25z dCBmaW5hbCB7IHJldHVybiB0cnVlOyB9CisKICAgICBTdHJpbmcgdmFsdWVEZXNjcmlwdGlvbigp IGNvbnN0IG92ZXJyaWRlOworI2lmIEVOQUJMRShNRVRFUl9FTEVNRU5UKQorICAgIFN0cmluZyBn YXVnZVJlZ2lvblZhbHVlRGVzY3JpcHRpb24oKSBjb25zdDsKKyNlbmRpZgogICAgIGZsb2F0IHZh bHVlRm9yUmFuZ2UoKSBjb25zdCBvdmVycmlkZTsKICAgICBmbG9hdCBtYXhWYWx1ZUZvclJhbmdl KCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgZmxvYXQgbWluVmFsdWVGb3JSYW5nZSgpIGNvbnN0IG92 ZXJyaWRlOwpAQCAtNjQsNCArNjgsNCBAQCBwcml2YXRlOgogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCiAKLVNQRUNJQUxJWkVfVFlQRV9UUkFJVFNfQUNDRVNTSUJJTElUWShBY2Nlc3NpYmlsaXR5 UHJvZ3Jlc3NJbmRpY2F0b3IsIGlzUHJvZ3Jlc3NJbmRpY2F0b3IoKSkKK1NQRUNJQUxJWkVfVFlQ RV9UUkFJVFNfQUNDRVNTSUJJTElUWShBY2Nlc3NpYmlsaXR5UHJvZ3Jlc3NJbmRpY2F0b3IsIGlz QWNjZXNzaWJpbGl0eVByb2dyZXNzSW5kaWNhdG9ySW5zdGFuY2UoKSkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3Qu Y3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRl ZE9iamVjdC5jcHAKaW5kZXggZmVhNzkzMzkwODZiODY2ODM1NmUwNGYzY2JlZWRjODJmYTE2NTBk MC4uN2IxNDZlN2NiNWM4NzkzMmY1YThlZDVmZGIyN2I5N2MwMGRlZmRiMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVj dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJ c29sYXRlZE9iamVjdC5jcHAKQEAgLTk3LDYgKzk3LDcgQEAgdm9pZCBBWElzb2xhdGVkT2JqZWN0 Ojppbml0aWFsaXplQXR0cmlidXRlRGF0YShBWENvcmVPYmplY3QmIG9iamVjdCwgYm9vbCBpc1Jv b3QKICAgICBzZXRQcm9wZXJ0eShBWFByb3BlcnR5TmFtZTo6SXNNZW51TGlzdE9wdGlvbiwgb2Jq ZWN0LmlzTWVudUxpc3RPcHRpb24oKSk7CiAgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6 OklzTWVudUxpc3RQb3B1cCwgb2JqZWN0LmlzTWVudUxpc3RQb3B1cCgpKTsKICAgICBzZXRQcm9w ZXJ0eShBWFByb3BlcnR5TmFtZTo6SXNNZW51UmVsYXRlZCwgb2JqZWN0LmlzTWVudVJlbGF0ZWQo KSk7CisgICAgc2V0UHJvcGVydHkoQVhQcm9wZXJ0eU5hbWU6OklzTWV0ZXIsIG9iamVjdC5pc01l dGVyKCkpOwogICAgIHNldFByb3BlcnR5KEFYUHJvcGVydHlOYW1lOjpJc011bHRpU2VsZWN0YWJs ZSwgb2JqZWN0LmlzTXVsdGlTZWxlY3RhYmxlKCkpOwogICAgIHNldFByb3BlcnR5KEFYUHJvcGVy dHlOYW1lOjpJc09mZlNjcmVlbiwgb2JqZWN0LmlzT2ZmU2NyZWVuKCkpOwogICAgIHNldFByb3Bl cnR5KEFYUHJvcGVydHlOYW1lOjpJc09uU2NyZWVuLCBvYmplY3QuaXNPblNjcmVlbigpKTsKQEAg LTkzNCw2ICs5MzUsMTIgQEAgYm9vbCBBWElzb2xhdGVkT2JqZWN0Ojppc0FjY2Vzc2liaWxpdHlU YWJsZUluc3RhbmNlKCkgY29uc3QKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKK2Jvb2wgQVhJc29s YXRlZE9iamVjdDo6aXNBY2Nlc3NpYmlsaXR5UHJvZ3Jlc3NJbmRpY2F0b3JJbnN0YW5jZSgpIGNv bnN0Cit7CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIGZhbHNlOworfQor CiBib29sIEFYSXNvbGF0ZWRPYmplY3Q6OmlzQXR0YWNobWVudEVsZW1lbnQoKSBjb25zdAogewog ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZE9iamVjdC5oCmluZGV4IDEx ZTA5YzIwNGJjZjliMjJmNjZmMDUyNTA1YmUwMWU1ZmEyZGNjN2IuLmFkYTk5MTNkYmZjNjM2MzE3 OWQ3YzliY2E3MjFmMjc5NWNhZTcyZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRPYmplY3QuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkT2JqZWN0LmgKQEAgLTY4 OSw2ICs2ODksNyBAQCBwcml2YXRlOgogICAgIGJvb2wgaXNBY2Nlc3NpYmlsaXR5U1ZHUm9vdCgp IGNvbnN0IG92ZXJyaWRlOwogICAgIGJvb2wgaXNBY2Nlc3NpYmlsaXR5U1ZHRWxlbWVudCgpIGNv bnN0IG92ZXJyaWRlOwogICAgIGJvb2wgaXNBY2Nlc3NpYmlsaXR5VGFibGVJbnN0YW5jZSgpIGNv bnN0IG92ZXJyaWRlOworICAgIGJvb2wgaXNBY2Nlc3NpYmlsaXR5UHJvZ3Jlc3NJbmRpY2F0b3JJ bnN0YW5jZSgpIGNvbnN0IG92ZXJyaWRlOwogICAgIGJvb2wgaXNBdHRhY2htZW50RWxlbWVudCgp IGNvbnN0IG92ZXJyaWRlOwogICAgIGJvb2wgaXNOYXRpdmVJbWFnZSgpIGNvbnN0IG92ZXJyaWRl OwogICAgIGJvb2wgaXNJbWFnZUJ1dHRvbigpIGNvbnN0IG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdy YXBwZXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQppbmRleCA0NzM1NzVmY2M0NDU2ZWE4YTg0Y2FhYWZl MTVjMDBiMjA3ZmQwMWNmLi41NzZhNGJiOGY1ZTk2ZTBmZWVhZDczZGU1MWZmYzFhYjEzNzUwMTNh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQpAQCAtMjMyMSwyOSAr MjMyMSw2IEBAIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0VORAogICAgIH0pOwogfQog Ci0tIChOU1N0cmluZyAqKXZhbHVlRGVzY3JpcHRpb25Gb3JNZXRlcgotewotICAgIGlmICghc2Vs Zi5heEJhY2tpbmdPYmplY3QpCi0gICAgICAgIHJldHVybiBuaWw7Ci0gICAgCi0gICAgU3RyaW5n IHZhbHVlRGVzY3JpcHRpb24gPSBzZWxmLmF4QmFja2luZ09iamVjdC0+dmFsdWVEZXNjcmlwdGlv bigpOwotI2lmIEVOQUJMRShNRVRFUl9FTEVNRU5UKQotICAgIGlmICghaXM8QWNjZXNzaWJpbGl0 eVByb2dyZXNzSW5kaWNhdG9yPihzZWxmLmF4QmFja2luZ09iamVjdCkpCi0gICAgICAgIHJldHVy biB2YWx1ZURlc2NyaXB0aW9uOwotICAgIGF1dG8gJm1ldGVyID0gZG93bmNhc3Q8QWNjZXNzaWJp bGl0eVByb2dyZXNzSW5kaWNhdG9yPigqc2VsZi5heEJhY2tpbmdPYmplY3QpOwotICAgIFN0cmlu ZyBnYXVnZVJlZ2lvblZhbHVlID0gbWV0ZXIuZ2F1Z2VSZWdpb25WYWx1ZURlc2NyaXB0aW9uKCk7 Ci0gICAgaWYgKCFnYXVnZVJlZ2lvblZhbHVlLmlzRW1wdHkoKSkgewotICAgICAgICBTdHJpbmdC dWlsZGVyIGJ1aWxkZXI7Ci0gICAgICAgIGJ1aWxkZXIuYXBwZW5kKHZhbHVlRGVzY3JpcHRpb24p OwotICAgICAgICBpZiAoYnVpbGRlci5sZW5ndGgoKSkKLSAgICAgICAgICAgIGJ1aWxkZXIuYXBw ZW5kTGl0ZXJhbCgiLCAiKTsKLSAgICAgICAgYnVpbGRlci5hcHBlbmQoZ2F1Z2VSZWdpb25WYWx1 ZSk7Ci0gICAgICAgIHJldHVybiBidWlsZGVyLnRvU3RyaW5nKCk7Ci0gICAgfQotI2VuZGlmCi0g ICAgcmV0dXJuIHZhbHVlRGVzY3JpcHRpb247Ci19Ci0KIC0gKGlkKXdpbmRvd0VsZW1lbnQ6KE5T U3RyaW5nKilhdHRyaWJ1dGVOYW1lCiB7CiAgICAgcmV0dXJuIEFjY2Vzc2liaWxpdHk6OnJldHJp ZXZlQXV0b3JlbGVhc2VkVmFsdWVGcm9tTWFpblRocmVhZDxpZD4oW2F0dHJpYnV0ZU5hbWUsIHBy b3RlY3RlZFNlbGYgPSBSZXRhaW5QdHI8V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXI+KHNl bGYpXSAoKSAtPiBSZXRhaW5QdHI8aWQ+IHsKQEAgLTI5MzksMTEgKzI5MTYsOCBAQCBBTExPV19E RVBSRUNBVEVEX0lNUExFTUVOVEFUSU9OU19FTkQKICAgICAgICAgcmV0dXJuIG5pbDsKICAgICB9 CiAKLSAgICBpZiAoW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJpbGl0 eVZhbHVlRGVzY3JpcHRpb25BdHRyaWJ1dGVdKSB7Ci0gICAgICAgIGlmIChiYWNraW5nT2JqZWN0 LT5pc01ldGVyKCkpCi0gICAgICAgICAgICByZXR1cm4gW3NlbGYgdmFsdWVEZXNjcmlwdGlvbkZv ck1ldGVyXTsKKyAgICBpZiAoW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNz aWJpbGl0eVZhbHVlRGVzY3JpcHRpb25BdHRyaWJ1dGVdKQogICAgICAgICByZXR1cm4gYmFja2lu Z09iamVjdC0+dmFsdWVEZXNjcmlwdGlvbigpOwotICAgIH0KIAogICAgIGlmIChbYXR0cmlidXRl TmFtZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5T3JpZW50YXRpb25BdHRyaWJ1dGVd KSB7CiAgICAgICAgIEFjY2Vzc2liaWxpdHlPcmllbnRhdGlvbiBlbGVtZW50T3JpZW50YXRpb24g PSBiYWNraW5nT2JqZWN0LT5vcmllbnRhdGlvbigpOwo=