181684 2018-01-16 08:47:16 -0800 Rename applyHorizontalScale/applyVerticalScale in SVG filters, and related cleanup 2018-01-19 14:54:55 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=181836 InRadar P2 Normal --- 1 simon.fraser simon.fraser achristensen commit-queue simon.fraser webkit-bug-importer oldest_to_newest 1389563 0 simon.fraser 2018-01-16 08:47:16 -0800 Rename applyHorizontalScale/applyVerticalScale in SVG filters, and related cleanup 1389564 1 331389 simon.fraser 2018-01-16 08:48:44 -0800 Created attachment 331389 Patch 1389623 2 331389 commit-queue 2018-01-16 10:59:14 -0800 Comment on attachment 331389 Patch Clearing flags on attachment: 331389 Committed r226981: <https://trac.webkit.org/changeset/226981> 1389624 3 commit-queue 2018-01-16 10:59:15 -0800 All reviewed patches have been landed. Closing bug. 1389626 4 webkit-bug-importer 2018-01-16 11:01:19 -0800 <rdar://problem/36550154> 1391206 5 simon.fraser 2018-01-19 14:54:55 -0800 This caused bug 181836. 331389 2018-01-16 08:48:44 -0800 2018-01-16 10:59:14 -0800 Patch bug-181684-20180116084843.patch text/plain 18899 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2Mzg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDAyMTFmNTM3YWY5OTIx NWY4MDBlNDhmOWRlMTMxYTVmMjEyZjMzZi4uMjkzMjhlZWQ1OWNjOTU5ZGM3YWRmYzIzZGQ4YTlm MDM1YzI5NWQxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUyIEBACisyMDE4LTAxLTE2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSBhcHBs eUhvcml6b250YWxTY2FsZS9hcHBseVZlcnRpY2FsU2NhbGUgaW4gU1ZHIGZpbHRlcnMsIGFuZCBy ZWxhdGVkIGNsZWFudXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE4MTY4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFJlbmFtZSB0aGUgY29uZnVzaW5nIGFwcGx5SG9yaXpvbnRhbFNjYWxlL2FwcGx5VmVy dGljYWxTY2FsZSB0byBzY2FsZWRCeUZpbHRlclJlc29sdXRpb24oKSwKKyAgICAgICAgYW5kIGhh dmUgaXQgdGFrZSBhbmQgcmV0dXJuIGEgRmxvYXRTaXplLiBDaGFuZ2UgY2FsbGVycyB0byBkbyBt YXRoIGluIHRlcm1zIG9mIEZsb2F0U2l6ZXMuCisKKyAgICAgICAgQWRkIGluZmxhdGUoc2l6ZSkg dG8gZWFjaCBvZiB0aGUgcmVjdCBjbGFzc2VzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvRmxvYXRSZWN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpGbG9hdFJlY3Q6OmluZmxhdGUpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ludFJlY3QuaDoKKyAgICAgICAgKFdlYkNvcmU6 OkludFJlY3Q6OmluZmxhdGUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0xheW91dFJl Y3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dFJlY3Q6OmluZmxhdGUpOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVEaXNwbGFjZW1lbnRNYXAuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RkVEaXNwbGFjZW1lbnRNYXA6OnBsYXRmb3JtQXBwbHlTb2Z0d2FyZSk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRURyb3BTaGFkb3cuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RkVEcm9wU2hhZG93OjpkZXRlcm1pbmVBYnNvbHV0ZVBhaW50UmVjdCk6 CisgICAgICAgIChXZWJDb3JlOjpGRURyb3BTaGFkb3c6OnBsYXRmb3JtQXBwbHlTb2Z0d2FyZSk6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUdhdXNzaWFuQmx1ci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGRUdhdXNzaWFuQmx1cjo6Y2FsY3VsYXRlVW5zY2FsZWRLZXJu ZWxTaXplKToKKyAgICAgICAgKFdlYkNvcmU6OkZFR2F1c3NpYW5CbHVyOjpjYWxjdWxhdGVLZXJu ZWxTaXplKToKKyAgICAgICAgKFdlYkNvcmU6OkZFR2F1c3NpYW5CbHVyOjpkZXRlcm1pbmVBYnNv bHV0ZVBhaW50UmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpGRUdhdXNzaWFuQmx1cjo6cGxhdGZv cm1BcHBseVNvZnR3YXJlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZF R2F1c3NpYW5CbHVyLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRU1v cnBob2xvZ3kuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RkVNb3JwaG9sb2d5OjpkZXRlcm1pbmVB YnNvbHV0ZVBhaW50UmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpGRU1vcnBob2xvZ3k6OnBsYXRm b3JtQXBwbHlTb2Z0d2FyZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9G RU9mZnNldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGRU9mZnNldDo6ZGV0ZXJtaW5lQWJzb2x1 dGVQYWludFJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6RkVPZmZzZXQ6OnBsYXRmb3JtQXBwbHlT b2Z0d2FyZSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GaWx0ZXIuaDoK KyAgICAgICAgKFdlYkNvcmU6OkZpbHRlcjo6c2V0U291cmNlSW1hZ2UpOgorICAgICAgICAoV2Vi Q29yZTo6RmlsdGVyOjpzY2FsZWRCeUZpbHRlclJlc29sdXRpb24gY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6RmlsdGVyOjphcHBseUhvcml6b250YWxTY2FsZSBjb25zdCk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpGaWx0ZXI6OmFwcGx5VmVydGljYWxTY2FsZSBjb25zdCk6IERlbGV0 ZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GaWx0ZXJPcGVyYXRpb25z LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om91dHNldFNpemVGb3JCbHVyKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvRmlsdGVyRWZmZWN0UmVuZGVyZXIuaDoKKyAgICAgICAgKiBzdmcvZ3JhcGhpY3Mv ZmlsdGVycy9TVkdGaWx0ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRmlsdGVyOjpzY2Fs ZWRCeUZpbHRlclJlc29sdXRpb24gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRmlsdGVy OjphcHBseUhvcml6b250YWxTY2FsZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpTVkdGaWx0ZXI6OmFwcGx5VmVydGljYWxTY2FsZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAg ICogc3ZnL2dyYXBoaWNzL2ZpbHRlcnMvU1ZHRmlsdGVyLmg6CisKIDIwMTgtMDEtMDMgIEphbWVz IENyYWlnICA8amNyYWlnQGFwcGxlLmNvbT4KIAogICAgICAgICBBWDogd2hlbiBpbnZlcnQgY29s b3JzIGlzIG9uLCBkb3VibGUtaW52ZXJ0IGNlcnRhaW4gbWVkaWEgZWxlbWVudHMgaW4gVXNlckFn ZW50U3R5bGVTaGVldApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvRmxvYXRSZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJl Y3QuaAppbmRleCBlNTVmMTdiZmM5ZDc0Yzc0NDFjOTZiMDNmYTVkYTZmN2IzMmNiNzE3Li40ZjM1 NzY2MTBhZmIxM2MwNzE2ZWMzM2FjOWJiZTdjODUyZmFmY2I1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJlY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJlY3QuaApAQCAtMTY0LDYgKzE2NCw4IEBAIHB1Ymxp YzoKICAgICAgICAgbV9zaXplLnNldEhlaWdodChtX3NpemUuaGVpZ2h0KCkgKyBkeSArIGR5KTsK ICAgICB9CiAgICAgdm9pZCBpbmZsYXRlKGZsb2F0IGQpIHsgaW5mbGF0ZVgoZCk7IGluZmxhdGVZ KGQpOyB9CisgICAgdm9pZCBpbmZsYXRlKEZsb2F0U2l6ZSBzaXplKSB7IGluZmxhdGVYKHNpemUu d2lkdGgoKSk7IGluZmxhdGVZKHNpemUuaGVpZ2h0KCkpOyB9CisKICAgICB2b2lkIHNjYWxlKGZs b2F0IHMpIHsgc2NhbGUocywgcyk7IH0KICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNjYWxlKGZs b2F0IHN4LCBmbG9hdCBzeSk7CiAgICAgdm9pZCBzY2FsZShGbG9hdFNpemUgc2l6ZSkgeyBzY2Fs ZShzaXplLndpZHRoKCksIHNpemUuaGVpZ2h0KCkpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbnRSZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9JbnRSZWN0LmgKaW5kZXggNGYxNGIyMWM0ZmRhMDBiN2E1NWZmMzZjMDZjMzc1 MGEwNWIwNmYzMy4uZjUxMjlmMDljNmQ2MjI3YjEzM2UwMDFiOTFkYjhkMzJmNjk1NDNhZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW50UmVjdC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ludFJlY3QuaApAQCAtMTY5LDYgKzE2 OSw3IEBAIHB1YmxpYzoKICAgICAgICAgbV9zaXplLnNldEhlaWdodChtX3NpemUuaGVpZ2h0KCkg KyBkeSArIGR5KTsKICAgICB9CiAgICAgdm9pZCBpbmZsYXRlKGludCBkKSB7IGluZmxhdGVYKGQp OyBpbmZsYXRlWShkKTsgfQorICAgIHZvaWQgaW5mbGF0ZShJbnRTaXplIHNpemUpIHsgaW5mbGF0 ZVgoc2l6ZS53aWR0aCgpKTsgaW5mbGF0ZVkoc2l6ZS5oZWlnaHQoKSk7IH0KICAgICBXRUJDT1JF X0VYUE9SVCB2b2lkIHNjYWxlKGZsb2F0IHMpOwogCiAgICAgSW50U2l6ZSBkaWZmZXJlbmNlVG9Q b2ludChjb25zdCBJbnRQb2ludCYpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvTGF5b3V0UmVjdC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvTGF5b3V0UmVjdC5oCmluZGV4IDhiYmM3MzkwNTU0NTZkOTk1OWFmZGRiNTlkOWI3 NzkyMmEyMThmOWIuLmQ3MjBiNTY0OWZiZWM1NTM0MGNiZmI0NWU4YmEyZjJmOTlhM2NlNzMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0xheW91dFJlY3QuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9MYXlvdXRSZWN0LmgKQEAgLTE2 MCw2ICsxNjAsNyBAQCBwdWJsaWM6CiAgICAgICAgIG1fc2l6ZS5zZXRIZWlnaHQobV9zaXplLmhl aWdodCgpICsgZHkgKyBkeSk7CiAgICAgfQogICAgIHZvaWQgaW5mbGF0ZShMYXlvdXRVbml0IGQp IHsgaW5mbGF0ZVgoZCk7IGluZmxhdGVZKGQpOyB9CisgICAgdm9pZCBpbmZsYXRlKExheW91dFNp emUgc2l6ZSkgeyBpbmZsYXRlWChzaXplLndpZHRoKCkpOyBpbmZsYXRlWShzaXplLmhlaWdodCgp KTsgfQogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2NhbGUoZmxvYXQpOwogICAgIHZvaWQgc2Nh bGUoZmxvYXQgeFNjYWxlLCBmbG9hdCB5U2NhbGUpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFRGlzcGxhY2VtZW50TWFwLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVEaXNwbGFjZW1lbnRNYXAu Y3BwCmluZGV4IDc1YWQ3ODQ3YTNlYThjOGU2MTUxNjE5MWI0N2Q0ZWIzNDc2M2FjZmEuLmRiOGEz MTkxMjU3MTYwZGE3MDczZTA0YWEyZWJlZjI3NjlkNWU0ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVEaXNwbGFjZW1lbnRNYXAuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVEaXNwbGFjZW1l bnRNYXAuY3BwCkBAIC0xMTIsMTIgKzExMiwxMSBAQCB2b2lkIEZFRGlzcGxhY2VtZW50TWFwOjpw bGF0Zm9ybUFwcGx5U29mdHdhcmUoKQogCiAgICAgRmlsdGVyJiBmaWx0ZXIgPSB0aGlzLT5maWx0 ZXIoKTsKICAgICBJbnRTaXplIHBhaW50U2l6ZSA9IGFic29sdXRlUGFpbnRSZWN0KCkuc2l6ZSgp OwotICAgIGZsb2F0IHNjYWxlWCA9IGZpbHRlci5hcHBseUhvcml6b250YWxTY2FsZShtX3NjYWxl KTsKLSAgICBmbG9hdCBzY2FsZVkgPSBmaWx0ZXIuYXBwbHlWZXJ0aWNhbFNjYWxlKG1fc2NhbGUp OwotICAgIGZsb2F0IHNjYWxlRm9yQ29sb3JYID0gc2NhbGVYIC8gMjU1LjA7Ci0gICAgZmxvYXQg c2NhbGVGb3JDb2xvclkgPSBzY2FsZVkgLyAyNTUuMDsKLSAgICBmbG9hdCBzY2FsZWRPZmZzZXRY ID0gMC41IC0gc2NhbGVYICogMC41OwotICAgIGZsb2F0IHNjYWxlZE9mZnNldFkgPSAwLjUgLSBz Y2FsZVkgKiAwLjU7CisgICAgRmxvYXRTaXplIHNjYWxlID0gZmlsdGVyLnNjYWxlZEJ5RmlsdGVy UmVzb2x1dGlvbih7IG1fc2NhbGUsIG1fc2NhbGUgfSk7CisgICAgZmxvYXQgc2NhbGVGb3JDb2xv clggPSBzY2FsZS53aWR0aCgpIC8gMjU1LjA7CisgICAgZmxvYXQgc2NhbGVGb3JDb2xvclkgPSBz Y2FsZS5oZWlnaHQoKSAvIDI1NS4wOworICAgIGZsb2F0IHNjYWxlZE9mZnNldFggPSAwLjUgLSBz Y2FsZS53aWR0aCgpICogMC41OworICAgIGZsb2F0IHNjYWxlZE9mZnNldFkgPSAwLjUgLSBzY2Fs ZS5oZWlnaHQoKSAqIDAuNTsKICAgICAKICAgICBpbnQgZGlzcGxhY2VtZW50Q2hhbm5lbFggPSB4 Q2hhbm5lbEluZGV4KCk7CiAgICAgaW50IGRpc3BsYWNlbWVudENoYW5uZWxZID0geUNoYW5uZWxJ bmRleCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmls dGVycy9GRURyb3BTaGFkb3cuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv ZmlsdGVycy9GRURyb3BTaGFkb3cuY3BwCmluZGV4IDBiMDVmMTcwYmQxMzNmMWE4YzI0NTQ5OTUy OWQwN2NkNTUyZWNlZGQuLjVkNjEyZmY0ZGIyYTM0ODMyOTllZGZlYTk3YjYzY2ZmOGQ0ZjYzNzgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVE cm9wU2hhZG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0 ZXJzL0ZFRHJvcFNoYWRvdy5jcHAKQEAgLTUyLDEwICs1MiwxMCBAQCB2b2lkIEZFRHJvcFNoYWRv dzo6ZGV0ZXJtaW5lQWJzb2x1dGVQYWludFJlY3QoKQogCiAgICAgRmxvYXRSZWN0IGFic29sdXRl UGFpbnRSZWN0ID0gaW5wdXRFZmZlY3QoMCktPmFic29sdXRlUGFpbnRSZWN0KCk7CiAgICAgRmxv YXRSZWN0IGFic29sdXRlT2Zmc2V0UGFpbnRSZWN0KGFic29sdXRlUGFpbnRSZWN0KTsKLSAgICBh YnNvbHV0ZU9mZnNldFBhaW50UmVjdC5tb3ZlKGZpbHRlci5hcHBseUhvcml6b250YWxTY2FsZSht X2R4KSwgZmlsdGVyLmFwcGx5VmVydGljYWxTY2FsZShtX2R5KSk7CisgICAgYWJzb2x1dGVPZmZz ZXRQYWludFJlY3QubW92ZShmaWx0ZXIuc2NhbGVkQnlGaWx0ZXJSZXNvbHV0aW9uKHsgbV9keCwg bV9keSB9KSk7CiAgICAgYWJzb2x1dGVQYWludFJlY3QudW5pdGUoYWJzb2x1dGVPZmZzZXRQYWlu dFJlY3QpOwogCi0gICAgSW50U2l6ZSBrZXJuZWxTaXplID0gRkVHYXVzc2lhbkJsdXI6OmNhbGN1 bGF0ZUtlcm5lbFNpemUoZmlsdGVyLCBGbG9hdFBvaW50KG1fc3RkWCwgbV9zdGRZKSk7CisgICAg SW50U2l6ZSBrZXJuZWxTaXplID0gRkVHYXVzc2lhbkJsdXI6OmNhbGN1bGF0ZUtlcm5lbFNpemUo ZmlsdGVyLCB7IG1fc3RkWCwgbV9zdGRZIH0pOwogCiAgICAgLy8gV2UgdGFrZSB0aGUgaGFsZiBr ZXJuZWwgc2l6ZSBhbmQgbXVsdGlwbHkgaXQgd2l0aCB0aHJlZSwgYmVjYXVzZSB3ZSBydW4gYm94 IGJsdXIgdGhyZWUgdGltZXMuCiAgICAgYWJzb2x1dGVQYWludFJlY3QuaW5mbGF0ZVgoMyAqIGtl cm5lbFNpemUud2lkdGgoKSAqIDAuNWYpOwpAQCAtNzgsOSArNzgsMTAgQEAgdm9pZCBGRURyb3BT aGFkb3c6OnBsYXRmb3JtQXBwbHlTb2Z0d2FyZSgpCiAgICAgICAgIHJldHVybjsKIAogICAgIEZp bHRlciYgZmlsdGVyID0gdGhpcy0+ZmlsdGVyKCk7Ci0gICAgRmxvYXRTaXplIGJsdXJSYWRpdXMo MiAqIGZpbHRlci5hcHBseUhvcml6b250YWxTY2FsZShtX3N0ZFgpLCAyICogZmlsdGVyLmFwcGx5 VmVydGljYWxTY2FsZShtX3N0ZFkpKTsKKyAgICAKKyAgICBGbG9hdFNpemUgYmx1clJhZGl1cyA9 IDIgKiBmaWx0ZXIuc2NhbGVkQnlGaWx0ZXJSZXNvbHV0aW9uKHsgbV9zdGRYLCBtX3N0ZFkgfSk7 CiAgICAgYmx1clJhZGl1cy5zY2FsZShmaWx0ZXIuZmlsdGVyU2NhbGUoKSk7Ci0gICAgRmxvYXRT aXplIG9mZnNldChmaWx0ZXIuYXBwbHlIb3Jpem9udGFsU2NhbGUobV9keCksIGZpbHRlci5hcHBs eVZlcnRpY2FsU2NhbGUobV9keSkpOworICAgIEZsb2F0U2l6ZSBvZmZzZXQgPSBmaWx0ZXIuc2Nh bGVkQnlGaWx0ZXJSZXNvbHV0aW9uKHsgbV9keCwgbV9keSB9KTsKIAogICAgIEZsb2F0UmVjdCBk cmF3aW5nUmVnaW9uID0gZHJhd2luZ1JlZ2lvbk9mSW5wdXRJbWFnZShpbi0+YWJzb2x1dGVQYWlu dFJlY3QoKSk7CiAgICAgRmxvYXRSZWN0IGRyYXdpbmdSZWdpb25XaXRoT2Zmc2V0KGRyYXdpbmdS ZWdpb24pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmls dGVycy9GRUdhdXNzaWFuQmx1ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9maWx0ZXJzL0ZFR2F1c3NpYW5CbHVyLmNwcAppbmRleCAwODk2ZTY2MzdlODY0NmJmMDBhNTk1 YjEwNTMwNTg0NmY2N2E4N2FjLi5jMDRlYmI3N2ExMzFlYjJlNThmYzliNTc2N2E0ZDdiMjAyODk5 NTBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJz L0ZFR2F1c3NpYW5CbHVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9maWx0ZXJzL0ZFR2F1c3NpYW5CbHVyLmNwcApAQCAtNDY4LDI5ICs0NjgsMjggQEAgc3RhdGlj IGludCBjbGFtcGVkVG9LZXJuZWxTaXplKGZsb2F0IHZhbHVlKQogICAgIHJldHVybiBjbGFtcFRv PGludD4oc3RkOjptaW4oc2l6ZSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KGdNYXhLZXJuZWxTaXpl KSkpOwogfQogICAgIAotSW50U2l6ZSBGRUdhdXNzaWFuQmx1cjo6Y2FsY3VsYXRlVW5zY2FsZWRL ZXJuZWxTaXplKGNvbnN0IEZsb2F0UG9pbnQmIHN0ZERldmlhdGlvbikKK0ludFNpemUgRkVHYXVz c2lhbkJsdXI6OmNhbGN1bGF0ZVVuc2NhbGVkS2VybmVsU2l6ZShGbG9hdFNpemUgc3RkRGV2aWF0 aW9uKQogewotICAgIEFTU0VSVChzdGREZXZpYXRpb24ueCgpID49IDAgJiYgc3RkRGV2aWF0aW9u LnkoKSA+PSAwKTsKKyAgICBBU1NFUlQoc3RkRGV2aWF0aW9uLndpZHRoKCkgPj0gMCAmJiBzdGRE ZXZpYXRpb24uaGVpZ2h0KCkgPj0gMCk7CiAgICAgSW50U2l6ZSBrZXJuZWxTaXplOwogCi0gICAg aWYgKHN0ZERldmlhdGlvbi54KCkpCi0gICAgICAgIGtlcm5lbFNpemUuc2V0V2lkdGgoY2xhbXBl ZFRvS2VybmVsU2l6ZShzdGREZXZpYXRpb24ueCgpKSk7CisgICAgaWYgKHN0ZERldmlhdGlvbi53 aWR0aCgpKQorICAgICAgICBrZXJuZWxTaXplLnNldFdpZHRoKGNsYW1wZWRUb0tlcm5lbFNpemUo c3RkRGV2aWF0aW9uLndpZHRoKCkpKTsKIAotICAgIGlmIChzdGREZXZpYXRpb24ueSgpKQotICAg ICAgICBrZXJuZWxTaXplLnNldEhlaWdodChjbGFtcGVkVG9LZXJuZWxTaXplKHN0ZERldmlhdGlv bi55KCkpKTsKKyAgICBpZiAoc3RkRGV2aWF0aW9uLmhlaWdodCgpKQorICAgICAgICBrZXJuZWxT aXplLnNldEhlaWdodChjbGFtcGVkVG9LZXJuZWxTaXplKHN0ZERldmlhdGlvbi5oZWlnaHQoKSkp OwogCiAgICAgcmV0dXJuIGtlcm5lbFNpemU7CiB9CiAKLUludFNpemUgRkVHYXVzc2lhbkJsdXI6 OmNhbGN1bGF0ZUtlcm5lbFNpemUoY29uc3QgRmlsdGVyJiBmaWx0ZXIsIGNvbnN0IEZsb2F0UG9p bnQmIHN0ZERldmlhdGlvbikKK0ludFNpemUgRkVHYXVzc2lhbkJsdXI6OmNhbGN1bGF0ZUtlcm5l bFNpemUoY29uc3QgRmlsdGVyJiBmaWx0ZXIsIEZsb2F0U2l6ZSBzdGREZXZpYXRpb24pCiB7Ci0g ICAgRmxvYXRQb2ludCBzdGRGaWx0ZXJTY2FsZWQoZmlsdGVyLmFwcGx5SG9yaXpvbnRhbFNjYWxl KHN0ZERldmlhdGlvbi54KCkpLCBmaWx0ZXIuYXBwbHlWZXJ0aWNhbFNjYWxlKHN0ZERldmlhdGlv bi55KCkpKTsKLSAgICByZXR1cm4gY2FsY3VsYXRlVW5zY2FsZWRLZXJuZWxTaXplKHN0ZEZpbHRl clNjYWxlZCk7CisgICAgcmV0dXJuIGNhbGN1bGF0ZVVuc2NhbGVkS2VybmVsU2l6ZShmaWx0ZXIu c2NhbGVkQnlGaWx0ZXJSZXNvbHV0aW9uKHN0ZERldmlhdGlvbikpOwogfQogCiB2b2lkIEZFR2F1 c3NpYW5CbHVyOjpkZXRlcm1pbmVBYnNvbHV0ZVBhaW50UmVjdCgpCiB7Ci0gICAgSW50U2l6ZSBr ZXJuZWxTaXplID0gY2FsY3VsYXRlS2VybmVsU2l6ZShmaWx0ZXIoKSwgRmxvYXRQb2ludChtX3N0 ZFgsIG1fc3RkWSkpOworICAgIEludFNpemUga2VybmVsU2l6ZSA9IGNhbGN1bGF0ZUtlcm5lbFNp emUoZmlsdGVyKCksIHsgbV9zdGRYLCBtX3N0ZFkgfSk7CiAKICAgICBGbG9hdFJlY3QgYWJzb2x1 dGVQYWludFJlY3QgPSBpbnB1dEVmZmVjdCgwKS0+YWJzb2x1dGVQYWludFJlY3QoKTsKICAgICAv LyBFZGdlIG1vZGVzIG90aGVyIHRoYW4gJ25vbmUnIGRvIG5vdCBpbmZsYXRlIHRoZSBhZmZlY3Rl ZCBwYWludCByZWN0LgpAQCAtNTI3LDcgKzUyNiw3IEBAIHZvaWQgRkVHYXVzc2lhbkJsdXI6OnBs YXRmb3JtQXBwbHlTb2Z0d2FyZSgpCiAgICAgaWYgKCFtX3N0ZFggJiYgIW1fc3RkWSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgSW50U2l6ZSBrZXJuZWxTaXplID0gY2FsY3VsYXRlS2VybmVsU2l6 ZShmaWx0ZXIoKSwgRmxvYXRQb2ludChtX3N0ZFgsIG1fc3RkWSkpOworICAgIEludFNpemUga2Vy bmVsU2l6ZSA9IGNhbGN1bGF0ZUtlcm5lbFNpemUoZmlsdGVyKCksIHsgbV9zdGRYLCBtX3N0ZFkg fSk7CiAgICAga2VybmVsU2l6ZS5zY2FsZShmaWx0ZXIoKS5maWx0ZXJTY2FsZSgpKTsKIAogICAg IEludFNpemUgcGFpbnRTaXplID0gYWJzb2x1dGVQYWludFJlY3QoKS5zaXplKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFR2F1c3NpYW5C bHVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFR2F1c3Np YW5CbHVyLmgKaW5kZXggZjdjN2MzYmVhODdkNTcxZWIzODU4ZDU2OTg1ZmU3ZTcwMmY1MGJiZS4u MDdlZmM3YTVkY2E1Y2IxYzRlYjVlNThkZTc2YTA2OGU3ZDg2NGU5YSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRUdhdXNzaWFuQmx1ci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVHYXVzc2lhbkJs dXIuaApAQCAtNDAsOCArNDAsOCBAQCBwdWJsaWM6CiAgICAgRWRnZU1vZGVUeXBlIGVkZ2VNb2Rl KCkgY29uc3QgeyByZXR1cm4gbV9lZGdlTW9kZTsgfQogICAgIHZvaWQgc2V0RWRnZU1vZGUoRWRn ZU1vZGVUeXBlKTsKIAotICAgIHN0YXRpYyBJbnRTaXplIGNhbGN1bGF0ZUtlcm5lbFNpemUoY29u c3QgRmlsdGVyJiwgY29uc3QgRmxvYXRQb2ludCYgc3RkRGV2aWF0aW9uKTsKLSAgICBzdGF0aWMg SW50U2l6ZSBjYWxjdWxhdGVVbnNjYWxlZEtlcm5lbFNpemUoY29uc3QgRmxvYXRQb2ludCYgc3Rk RGV2aWF0aW9uKTsKKyAgICBzdGF0aWMgSW50U2l6ZSBjYWxjdWxhdGVLZXJuZWxTaXplKGNvbnN0 IEZpbHRlciYsIEZsb2F0U2l6ZSBzdGREZXZpYXRpb24pOworICAgIHN0YXRpYyBJbnRTaXplIGNh bGN1bGF0ZVVuc2NhbGVkS2VybmVsU2l6ZShGbG9hdFNpemUgc3RkRGV2aWF0aW9uKTsKIAogcHJp dmF0ZToKICAgICBGRUdhdXNzaWFuQmx1cihGaWx0ZXImLCBmbG9hdCwgZmxvYXQsIEVkZ2VNb2Rl VHlwZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0 ZXJzL0ZFTW9ycGhvbG9neS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9m aWx0ZXJzL0ZFTW9ycGhvbG9neS5jcHAKaW5kZXggOGQ5Njc5ODkyNjliMjU5YzU0NzRmMDAxODBi YmVlYWFlNWRhN2VhMy4uOTM4YTc4NjkyZmJjNzY4ZDY0MDg1NDhiOWM4NWUwMDdlYmE1Y2NhNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GRU1v cnBob2xvZ3kuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRl cnMvRkVNb3JwaG9sb2d5LmNwcApAQCAtNzUsOCArNzUsNyBAQCB2b2lkIEZFTW9ycGhvbG9neTo6 ZGV0ZXJtaW5lQWJzb2x1dGVQYWludFJlY3QoKQogewogICAgIEZsb2F0UmVjdCBwYWludFJlY3Qg PSBpbnB1dEVmZmVjdCgwKS0+YWJzb2x1dGVQYWludFJlY3QoKTsKICAgICBGaWx0ZXImIGZpbHRl ciA9IHRoaXMtPmZpbHRlcigpOwotICAgIHBhaW50UmVjdC5pbmZsYXRlWChmaWx0ZXIuYXBwbHlI b3Jpem9udGFsU2NhbGUobV9yYWRpdXNYKSk7Ci0gICAgcGFpbnRSZWN0LmluZmxhdGVZKGZpbHRl ci5hcHBseVZlcnRpY2FsU2NhbGUobV9yYWRpdXNZKSk7CisgICAgcGFpbnRSZWN0LmluZmxhdGUo ZmlsdGVyLnNjYWxlZEJ5RmlsdGVyUmVzb2x1dGlvbih7IG1fcmFkaXVzWCwgbV9yYWRpdXNZIH0p KTsKICAgICBpZiAoY2xpcHNUb0JvdW5kcygpKQogICAgICAgICBwYWludFJlY3QuaW50ZXJzZWN0 KG1heEVmZmVjdFJlY3QoKSk7CiAgICAgZWxzZQpAQCAtMjU0LDEwICsyNTMsOSBAQCB2b2lkIEZF TW9ycGhvbG9neTo6cGxhdGZvcm1BcHBseVNvZnR3YXJlKCkKICAgICBpZiAoIXNyY1BpeGVsQXJy YXkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGludCByYWRpdXNYID0gc3RhdGljX2Nhc3Q8aW50 PihmbG9vcmYoZmlsdGVyLmFwcGx5SG9yaXpvbnRhbFNjYWxlKG1fcmFkaXVzWCkpKTsKLSAgICBp bnQgcmFkaXVzWSA9IHN0YXRpY19jYXN0PGludD4oZmxvb3JmKGZpbHRlci5hcHBseVZlcnRpY2Fs U2NhbGUobV9yYWRpdXNZKSkpOwotICAgIHJhZGl1c1ggPSBzdGQ6Om1pbihlZmZlY3REcmF3aW5n UmVjdC53aWR0aCgpIC0gMSwgcmFkaXVzWCk7Ci0gICAgcmFkaXVzWSA9IHN0ZDo6bWluKGVmZmVj dERyYXdpbmdSZWN0LmhlaWdodCgpIC0gMSwgcmFkaXVzWSk7CisgICAgSW50U2l6ZSByYWRpdXMg PSBmbG9vcmVkSW50U2l6ZShmaWx0ZXIuc2NhbGVkQnlGaWx0ZXJSZXNvbHV0aW9uKHsgbV9yYWRp dXNYLCBtX3JhZGl1c1kgfSkpOworICAgIGludCByYWRpdXNYID0gc3RkOjptaW4oZWZmZWN0RHJh d2luZ1JlY3Qud2lkdGgoKSAtIDEsIHJhZGl1cy53aWR0aCgpKTsKKyAgICBpbnQgcmFkaXVzWSA9 IHN0ZDo6bWluKGVmZmVjdERyYXdpbmdSZWN0LmhlaWdodCgpIC0gMSwgcmFkaXVzLmhlaWdodCgp KTsKIAogICAgIGlmIChwbGF0Zm9ybUFwcGx5RGVnZW5lcmF0ZSgqZHN0UGl4ZWxBcnJheSwgZWZm ZWN0RHJhd2luZ1JlY3QsIHJhZGl1c1gsIHJhZGl1c1kpKQogICAgICAgICByZXR1cm47CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZFT2Zmc2V0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVPZmZzZXQu Y3BwCmluZGV4IDBjZjE1YWZhYzNlMDMzZTI5MGRiZDY2YWEzMDZjM2UxYmExODhmMDYuLjA0ZjA2 ODY1MjVmNTc5YzYyOTIwNDBmNGYyMjRmM2E4ODdmMzhkOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVPZmZzZXQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRkVPZmZzZXQuY3BwCkBAIC01Niw3 ICs1Niw3IEBAIHZvaWQgRkVPZmZzZXQ6OmRldGVybWluZUFic29sdXRlUGFpbnRSZWN0KCkKIHsK ICAgICBGbG9hdFJlY3QgcGFpbnRSZWN0ID0gaW5wdXRFZmZlY3QoMCktPmFic29sdXRlUGFpbnRS ZWN0KCk7CiAgICAgRmlsdGVyJiBmaWx0ZXIgPSB0aGlzLT5maWx0ZXIoKTsKLSAgICBwYWludFJl Y3QubW92ZShmaWx0ZXIuYXBwbHlIb3Jpem9udGFsU2NhbGUobV9keCksIGZpbHRlci5hcHBseVZl cnRpY2FsU2NhbGUobV9keSkpOworICAgIHBhaW50UmVjdC5tb3ZlKGZpbHRlci5zY2FsZWRCeUZp bHRlclJlc29sdXRpb24oeyBtX2R4LCBtX2R5IH0pKTsKICAgICBpZiAoY2xpcHNUb0JvdW5kcygp KQogICAgICAgICBwYWludFJlY3QuaW50ZXJzZWN0KG1heEVmZmVjdFJlY3QoKSk7CiAgICAgZWxz ZQpAQCAtNzcsNyArNzcsNyBAQCB2b2lkIEZFT2Zmc2V0OjpwbGF0Zm9ybUFwcGx5U29mdHdhcmUo KQogCiAgICAgRmxvYXRSZWN0IGRyYXdpbmdSZWdpb24gPSBkcmF3aW5nUmVnaW9uT2ZJbnB1dElt YWdlKGluLT5hYnNvbHV0ZVBhaW50UmVjdCgpKTsKICAgICBGaWx0ZXImIGZpbHRlciA9IHRoaXMt PmZpbHRlcigpOwotICAgIGRyYXdpbmdSZWdpb24ubW92ZShmaWx0ZXIuYXBwbHlIb3Jpem9udGFs U2NhbGUobV9keCksIGZpbHRlci5hcHBseVZlcnRpY2FsU2NhbGUobV9keSkpOworICAgIGRyYXdp bmdSZWdpb24ubW92ZShmaWx0ZXIuc2NhbGVkQnlGaWx0ZXJSZXNvbHV0aW9uKHsgbV9keCwgbV9k eSB9KSk7CiAgICAgcmVzdWx0SW1hZ2UtPmNvbnRleHQoKS5kcmF3SW1hZ2VCdWZmZXIoKmluQnVm ZmVyLCBkcmF3aW5nUmVnaW9uKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GaWx0ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2ZpbHRlcnMvRmlsdGVyLmgKaW5kZXggNTNkNWRmMDFkY2EwNGYwOTRjYTA2ZGE0 Yzc0ZDg5NzYyYTcwMjcyMC4uNTAxYWZkMDdmYTA3ZjZhNzg4NzNhMzczYjc3NDdiYThiODMwYzIx MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9G aWx0ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0Zp bHRlci5oCkBAIC0zMyw3ICszMyw3IEBAIHB1YmxpYzoKICAgICB7IH0KICAgICB2aXJ0dWFsIH5G aWx0ZXIoKSA9IGRlZmF1bHQ7CiAKLSAgICB2b2lkIHNldFNvdXJjZUltYWdlKHN0ZDo6dW5pcXVl X3B0cjxJbWFnZUJ1ZmZlcj4gc291cmNlSW1hZ2UpIHsgbV9zb3VyY2VJbWFnZSA9IFdURk1vdmUo c291cmNlSW1hZ2UpOyB9CisgICAgdm9pZCBzZXRTb3VyY2VJbWFnZShzdGQ6OnVuaXF1ZV9wdHI8 SW1hZ2VCdWZmZXI+JiYgc291cmNlSW1hZ2UpIHsgbV9zb3VyY2VJbWFnZSA9IFdURk1vdmUoc291 cmNlSW1hZ2UpOyB9CiAgICAgSW1hZ2VCdWZmZXIqIHNvdXJjZUltYWdlKCkgeyByZXR1cm4gbV9z b3VyY2VJbWFnZS5nZXQoKTsgfQogCiAgICAgRmxvYXRTaXplIGZpbHRlclJlc29sdXRpb24oKSBj b25zdCB7IHJldHVybiBtX2ZpbHRlclJlc29sdXRpb247IH0KQEAgLTQ5LDggKzQ5LDcgQEAgcHVi bGljOgogCiAgICAgdmlydHVhbCBib29sIGlzU1ZHRmlsdGVyKCkgY29uc3QgeyByZXR1cm4gZmFs c2U7IH0KIAotICAgIHZpcnR1YWwgZmxvYXQgYXBwbHlIb3Jpem9udGFsU2NhbGUoZmxvYXQgdmFs dWUpIGNvbnN0IHsgcmV0dXJuIHZhbHVlICogbV9maWx0ZXJSZXNvbHV0aW9uLndpZHRoKCk7IH0K LSAgICB2aXJ0dWFsIGZsb2F0IGFwcGx5VmVydGljYWxTY2FsZShmbG9hdCB2YWx1ZSkgY29uc3Qg eyByZXR1cm4gdmFsdWUgKiBtX2ZpbHRlclJlc29sdXRpb24uaGVpZ2h0KCk7IH0KKyAgICB2aXJ0 dWFsIEZsb2F0U2l6ZSBzY2FsZWRCeUZpbHRlclJlc29sdXRpb24oRmxvYXRTaXplIHNpemUpIGNv bnN0IHsgcmV0dXJuIHNpemUgKiBtX2ZpbHRlclJlc29sdXRpb247IH0KICAgICAKICAgICB2aXJ0 dWFsIEZsb2F0UmVjdCBzb3VyY2VJbWFnZVJlY3QoKSBjb25zdCA9IDA7CiAgICAgdmlydHVhbCBG bG9hdFJlY3QgZmlsdGVyUmVnaW9uKCkgY29uc3QgPSAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GaWx0ZXJPcGVyYXRpb25zLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZpbHRlcnMvRmlsdGVyT3BlcmF0aW9ucy5j cHAKaW5kZXggOWIzYmFhYzRjZDg2OGUwZjljZDc2OTE1NDkxOGVmYmY3NDQwM2NhMi4uZDI2MWM3 ZDNiOGYwMzkwNzkyMGY2YWNlNDA0MDQ3ZTdlYzJiYzUzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZmlsdGVycy9GaWx0ZXJPcGVyYXRpb25zLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9maWx0ZXJzL0ZpbHRlck9wZXJhdGlv bnMuY3BwCkBAIC0zNSw3ICszNSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RhdGljIGlu bGluZSBJbnRTaXplIG91dHNldFNpemVGb3JCbHVyKGZsb2F0IHN0ZERldmlhdGlvbikKIHsKLSAg ICBhdXRvIGtlcm5lbFNpemUgPSBGRUdhdXNzaWFuQmx1cjo6Y2FsY3VsYXRlVW5zY2FsZWRLZXJu ZWxTaXplKEZsb2F0UG9pbnQoc3RkRGV2aWF0aW9uLCBzdGREZXZpYXRpb24pKTsKKyAgICBhdXRv IGtlcm5lbFNpemUgPSBGRUdhdXNzaWFuQmx1cjo6Y2FsY3VsYXRlVW5zY2FsZWRLZXJuZWxTaXpl KHsgc3RkRGV2aWF0aW9uLCBzdGREZXZpYXRpb24gfSk7CiAKICAgICAvLyBXZSB0YWtlIHRoZSBo YWxmIGtlcm5lbCBzaXplIGFuZCBtdWx0aXBseSBpdCB3aXRoIHRocmVlLCBiZWNhdXNlIHdlIHJ1 biBib3ggYmx1ciB0aHJlZSB0aW1lcy4KICAgICByZXR1cm4gewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL0ZpbHRlckVmZmVjdFJlbmRlcmVyLmggYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvRmlsdGVyRWZmZWN0UmVuZGVyZXIuaAppbmRleCBmOGVhYjhmZjQ2ZDc2MThk YjAyN2U3MzY3ZDAwNjVjYjdlOTIzOTJiLi40YjQ0OTJkNTMwOGQ0Mzc4NjUzZmRmY2RiN2EwZTUz MTVjZGU2YTljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmlsdGVyRWZm ZWN0UmVuZGVyZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvRmlsdGVyRWZmZWN0 UmVuZGVyZXIuaApAQCAtNjcsNiArNjcsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9zdGFydGVk RmlsdGVyRWZmZWN0IHsgZmFsc2UgfTsKIH07CiAKKy8vIFRoaXMgaXMgdXNlZCB0byByZW5kZXIg ZmlsdGVycyBmb3IgdGhlIENTUyBmaWx0ZXI6IHByb3BlcnR5LCBhbmQgdGhlIGZpbHRlcigpIGlt YWdlIGZ1bmN0aW9uLgogY2xhc3MgRmlsdGVyRWZmZWN0UmVuZGVyZXIgZmluYWwgOiBwdWJsaWMg RmlsdGVyIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9ncmFwaGljcy9maWx0ZXJzL1NWR0ZpbHRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9zdmcvZ3JhcGhpY3MvZmlsdGVycy9TVkdGaWx0ZXIuY3BwCmluZGV4IDJk ODVhZTU1MGE1ZmFhYjYyMDNiYTdhNTk4ZDJkYzlmZTFmM2NjMGQuLjlhOTRhNDYwMzU4NzkwOGEz ODRkMTc0MjdiMzcxOTM1OTJiN2JjZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9n cmFwaGljcy9maWx0ZXJzL1NWR0ZpbHRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL2dy YXBoaWNzL2ZpbHRlcnMvU1ZHRmlsdGVyLmNwcApAQCAtMzQsMTggKzM0LDEyIEBAIFNWR0ZpbHRl cjo6U1ZHRmlsdGVyKGNvbnN0IEFmZmluZVRyYW5zZm9ybSYgYWJzb2x1dGVUcmFuc2Zvcm0sIGNv bnN0IEZsb2F0UmVjdCYKICAgICBtX2Fic29sdXRlRmlsdGVyUmVnaW9uID0gYWJzb2x1dGVUcmFu c2Zvcm0ubWFwUmVjdChmaWx0ZXJSZWdpb24pOwogfQogCi1mbG9hdCBTVkdGaWx0ZXI6OmFwcGx5 SG9yaXpvbnRhbFNjYWxlKGZsb2F0IHZhbHVlKSBjb25zdAorRmxvYXRTaXplIFNWR0ZpbHRlcjo6 c2NhbGVkQnlGaWx0ZXJSZXNvbHV0aW9uKEZsb2F0U2l6ZSBzaXplKSBjb25zdAogewogICAgIGlm IChtX2VmZmVjdEJCb3hNb2RlKQotICAgICAgICB2YWx1ZSAqPSBtX3RhcmdldEJvdW5kaW5nQm94 LndpZHRoKCk7Ci0gICAgcmV0dXJuIEZpbHRlcjo6YXBwbHlIb3Jpem9udGFsU2NhbGUodmFsdWUp ICogbV9hYnNvbHV0ZUZpbHRlclJlZ2lvbi53aWR0aCgpIC8gbV9maWx0ZXJSZWdpb24ud2lkdGgo KTsKLX0KKyAgICAgICAgc2l6ZSA9IHNpemUgKiBtX3RhcmdldEJvdW5kaW5nQm94LnNpemUoKTsK IAotZmxvYXQgU1ZHRmlsdGVyOjphcHBseVZlcnRpY2FsU2NhbGUoZmxvYXQgdmFsdWUpIGNvbnN0 Ci17Ci0gICAgaWYgKG1fZWZmZWN0QkJveE1vZGUpCi0gICAgICAgIHZhbHVlICo9IG1fdGFyZ2V0 Qm91bmRpbmdCb3guaGVpZ2h0KCk7Ci0gICAgcmV0dXJuIEZpbHRlcjo6YXBwbHlWZXJ0aWNhbFNj YWxlKHZhbHVlKSAqIG1fYWJzb2x1dGVGaWx0ZXJSZWdpb24uaGVpZ2h0KCkgLyBtX2ZpbHRlclJl Z2lvbi5oZWlnaHQoKTsKKyAgICByZXR1cm4gRmlsdGVyOjpzY2FsZWRCeUZpbHRlclJlc29sdXRp b24oc2l6ZSkgKiBtX2Fic29sdXRlRmlsdGVyUmVnaW9uLnNpemUoKSAvIG1fZmlsdGVyUmVnaW9u LnNpemUoKTsKIH0KIAogUmVmPFNWR0ZpbHRlcj4gU1ZHRmlsdGVyOjpjcmVhdGUoY29uc3QgQWZm aW5lVHJhbnNmb3JtJiBhYnNvbHV0ZVRyYW5zZm9ybSwgY29uc3QgRmxvYXRSZWN0JiBhYnNvbHV0 ZVNvdXJjZURyYXdpbmdSZWdpb24sIGNvbnN0IEZsb2F0UmVjdCYgdGFyZ2V0Qm91bmRpbmdCb3gs IGNvbnN0IEZsb2F0UmVjdCYgZmlsdGVyUmVnaW9uLCBib29sIGVmZmVjdEJCb3hNb2RlKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL2ZpbHRlcnMvU1ZHRmlsdGVyLmgg Yi9Tb3VyY2UvV2ViQ29yZS9zdmcvZ3JhcGhpY3MvZmlsdGVycy9TVkdGaWx0ZXIuaAppbmRleCBi NDBiOThkNTBlNTVhOTE5YmZlNTA4NWNkZTlkMzkzMTFhMDE1MjBhLi5mNzgwZjVlNWQ4ZWY5YzQw OWI3MDM2MjkxYTc1MGU5YjE5N2U5MWIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcv Z3JhcGhpY3MvZmlsdGVycy9TVkdGaWx0ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdmcvZ3Jh cGhpY3MvZmlsdGVycy9TVkdGaWx0ZXIuaApAQCAtMzYsOCArMzYsNyBAQCBwdWJsaWM6CiAgICAg RmxvYXRSZWN0IGZpbHRlclJlZ2lvbkluVXNlclNwYWNlKCkgY29uc3QgeyByZXR1cm4gbV9maWx0 ZXJSZWdpb247IH0KICAgICBGbG9hdFJlY3QgZmlsdGVyUmVnaW9uKCkgY29uc3QgZmluYWwgeyBy ZXR1cm4gbV9hYnNvbHV0ZUZpbHRlclJlZ2lvbjsgfQogCi0gICAgZmxvYXQgYXBwbHlIb3Jpem9u dGFsU2NhbGUoZmxvYXQgdmFsdWUpIGNvbnN0IGZpbmFsOwotICAgIGZsb2F0IGFwcGx5VmVydGlj YWxTY2FsZShmbG9hdCB2YWx1ZSkgY29uc3QgZmluYWw7CisgICAgRmxvYXRTaXplIHNjYWxlZEJ5 RmlsdGVyUmVzb2x1dGlvbihGbG9hdFNpemUpIGNvbnN0IGZpbmFsOwogCiAgICAgRmxvYXRSZWN0 IHNvdXJjZUltYWdlUmVjdCgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuIG1fYWJzb2x1dGVTb3VyY2VE cmF3aW5nUmVnaW9uOyB9CiAgICAgRmxvYXRSZWN0IHRhcmdldEJvdW5kaW5nQm94KCkgY29uc3Qg eyByZXR1cm4gbV90YXJnZXRCb3VuZGluZ0JveDsgfQo=