227277 2021-06-22 21:37:51 -0700 REGRESSION(r279104): [GPU Process] Canvas layout tests became flaky 2021-06-23 10:36:21 -0700 1 1 1 Unclassified WebKit Canvas WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 227229 https://bugs.webkit.org/show_bug.cgi?id=227229 P2 Normal --- 1 sabouhallawa sabouhallawa dino oldest_to_newest 1771852 0 sabouhallawa 2021-06-22 21:37:51 -0700 The change r279104 tried to fix some issues in RemoteResourceCacheProxy::didFinalizeRenderingUpdate(). It fixed the early return from: if (unusedFontCount < minimumFractionOfUnusedFontCountToTriggerRemoval * totalFontCount && unusedFontCount <= maximumUnusedFontCountToSkipRemoval) return; // which is equivalent to the following code because unusedFontCount and maximumUnusedFontCountToSkipRemoval are both unsigned and maximumUnusedFontCountToSkipRemoval = 0. // if (!unusedFontCount) // return; to: if (unusedFontCount <= minimumFractionOfUnusedFontCountToTriggerRemoval * totalFontCount) { prepareForNextRenderingUpdate(); return; } And it fixed the synchronization of the cached fonts between WebProcess and GPUP: from: // This code removes the font object from GPUP but keeps the font identifier in WebProcess for (auto& item : m_fontIdentifierToLastRenderingUpdateVersionMap) { if (m_currentRenderingUpdateVersion - item.value >= minimumRenderingUpdateCountToKeepFontAlive) m_remoteRenderingBackendProxy.releaseRemoteResource(item.key); } to: m_fontIdentifierToLastRenderingUpdateVersionMap.removeIf([&] (const auto& item) { if (m_currentRenderingUpdateVersion - item.value < minimumRenderingUpdateCountToKeepFontAlive) return false; m_remoteRenderingBackendProxy.releaseRemoteResource(item.key); return true; }); But when I looked closely at the original RemoteResourceCacheProxy::didFinalizeRenderingUpdate() before r279104, I found it was always making an early return and basically it was doing nothing. Here is the explanation. 1. When the fonts are cached for the first RenderingUpdate to a canvas, all the entries in m_fontIdentifierToLastRenderingUpdateVersionMap will have value = 1 since m_currentRenderingUpdateVersion is initialized with 1. 2. m_numberOfFontsUsedInCurrentRenderingUpdate will be equal to the number of fonts cached during the first RenderingUpdate. 3. RemoteResourceCacheProxy::didFinalizeRenderingUpdate(), will find unusedFontCount == 0 because m_numberOfFontsUsedInCurrentRenderingUpdate == m_fontIdentifierToLastRenderingUpdateVersionMap.size(). So it will return without changing m_numberOfFontsUsedInCurrentRenderingUpdate or m_currentRenderingUpdateVersion. 4. If in the next RenderingUpdate a new font is cached, it will inherit m_currentRenderingUpdateVersion which is still 1. And m_numberOfFontsUsedInCurrentRenderingUpdate will be incremented by 1. 5. Caching more fonts will increment m_numberOfFontsUsedInCurrentRenderingUpdate as if all the cached fonts were used for m_currentRenderingUpdateVersion = 1. 6. RemoteResourceCacheProxy::didFinalizeRenderingUpdate() will make an early return again because unusedFontCount is always zero. So the change r279104 exercises a new code path which was never exercised before. Removing the font from the cache in GPUP and recaching it causes RemoteRenderingBackend to wakeUpAndApplyDisplayList() more often if the Font was missing in the GPUP cache. I think the solution is to remove RemoteResourceCacheProxy::didFinalizeRenderingUpdate() since it has been doing nothing since it was written. 1771853 1 432017 sabouhallawa 2021-06-22 21:45:48 -0700 Created attachment 432017 Patch 1771860 2 432019 sabouhallawa 2021-06-22 22:43:11 -0700 Created attachment 432019 Patch 1771861 3 432020 sabouhallawa 2021-06-22 23:04:31 -0700 Created attachment 432020 Patch 1771862 4 432021 sabouhallawa 2021-06-22 23:07:34 -0700 Created attachment 432021 Patch 1771863 5 432022 sabouhallawa 2021-06-22 23:08:10 -0700 Created attachment 432022 Patch 1771994 6 sabouhallawa 2021-06-23 10:36:21 -0700 *** This bug has been marked as a duplicate of bug 227229 *** 432017 2021-06-22 21:45:48 -0700 2021-06-22 21:45:48 -0700 Patch bug-227277-20210622214547.patch text/plain 7420 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MTM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRkZTk3MDI2YTZmMGI1NTk3 MDE3ZWExYmUwNjg2OGUzM2NiYjViMGIuLmU0NDdmYTA5YWM5ZmI0ZGUxMzI2OWZjMGMyNTQ5MThk ODUxZTc1ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDYtMjIgIFNhaWQgQWJv dS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjc5MTA0 KTogW0dQVSBQcm9jZXNzXSBDYW52YXMgbGF5b3V0IHRlc3RzIGJlY2FtZSBmbGFreQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3Mjc3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIFJlbW90ZVJl c291cmNlQ2FjaGVQcm94eTo6ZGlkRmluYWxpemVSZW5kZXJpbmdVcGRhdGUoKSBzaW5jZSBpdCAK KyAgICAgICAgd2FzIGRvaW5nIG5vdGhpbmcgYmVmb3JlIHIyNzkxMDQuIENoYW5naW5nIGl0IGNh dXNlZCBmb250cyB0byBiZSByZW1vdmVkCisgICAgICAgIGZyb20gdGhlIGNhY2hlIGFuZCByZS1j YWNoZWQgd2hpY2ggbmV2ZXIgaGFwcGVuZWQgYmVmb3JlIHIyNzkxMDQuIFRoaXMKKyAgICAgICAg Y2F1c2VkIG1vcmUgcGVuZGluZyB3YWxrLXVwIHRvIGhhcHBlbiBtb3JlIG9mdGVuIGluIFJlbW90 ZVJlbmRlcmluZ0JhY2tlbmQKKyAgICAgICAgYmVjYXVzZSB0aGUgRm9udCBpcyBtaXNzaW5nIGZy b20gdGhlIFJlbW90ZVJlc291cmNlQ2FjaGUuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9n cmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpS ZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OmNhY2hlRm9udCk6CisgICAgICAgIChXZWJLaXQ6OlJl bW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cmVtb3RlUmVzb3VyY2VDYWNoZVdhc0Rlc3Ryb3llZCk6 CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cmVsZWFzZU1lbW9y eSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cHJlcGFyZUZv ck5leHRSZW5kZXJpbmdVcGRhdGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVS ZXNvdXJjZUNhY2hlUHJveHk6OmNsZWFyRm9udE1hcCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJL aXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6ZGlkRmluYWxpemVSZW5kZXJpbmdVcGRhdGUp OiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291 cmNlQ2FjaGVQcm94eS5oOgorICAgICAgICAoKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmZpbmFs aXplUmVuZGVyaW5nVXBkYXRlKToKKwogMjAyMS0wNi0wNyAgSmVyIE5vYmxlICA8amVyLm5vYmxl QGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIFVwc3RyZWFtIEdyb3VwQWN0aXZpdGllc0Nv b3JkaW5hdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBo aWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5jcHAKaW5kZXggMjVmOGU1 NGY4Y2VmZjk5OTA5Y2RiYjRhMWU2ZTZjNTA0NzkzNmU0Ny4uMDY0ZmFmYWViNjI2MzU4MDY4ODAy N2U4ZDQyOGQwOTRjMGU0ZjYyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L0dQVS9ncmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmNw cApAQCAtMTA0LDE3ICsxMDQsMTEgQEAgdm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OmNh Y2hlTmF0aXZlSW1hZ2UoTmF0aXZlSW1hZ2UmIGltYWdlKQogCiB2b2lkIFJlbW90ZVJlc291cmNl Q2FjaGVQcm94eTo6Y2FjaGVGb250KEZvbnQmIGZvbnQpCiB7Ci0gICAgYXV0byByZXN1bHQgPSBt X2ZvbnRJZGVudGlmaWVyVG9MYXN0UmVuZGVyaW5nVXBkYXRlVmVyc2lvbk1hcC5lbnN1cmUoZm9u dC5yZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIoKSwgWyZdIHsKLSAgICAgICAgbV9yZW1vdGVS ZW5kZXJpbmdCYWNrZW5kUHJveHkuY2FjaGVGb250KG1ha2VSZWYoZm9udCkpOwotICAgICAgICAr K21fbnVtYmVyT2ZGb250c1VzZWRJbkN1cnJlbnRSZW5kZXJpbmdVcGRhdGU7Ci0gICAgICAgIHJl dHVybiBtX2N1cnJlbnRSZW5kZXJpbmdVcGRhdGVWZXJzaW9uOwotICAgIH0pOwotCi0gICAgYXV0 byYgbGFzdFZlcnNpb24gPSByZXN1bHQuaXRlcmF0b3ItPnZhbHVlOwotICAgIGlmIChsYXN0VmVy c2lvbiAhPSBtX2N1cnJlbnRSZW5kZXJpbmdVcGRhdGVWZXJzaW9uKSB7Ci0gICAgICAgIGxhc3RW ZXJzaW9uID0gbV9jdXJyZW50UmVuZGVyaW5nVXBkYXRlVmVyc2lvbjsKLSAgICAgICAgKyttX251 bWJlck9mRm9udHNVc2VkSW5DdXJyZW50UmVuZGVyaW5nVXBkYXRlOwotICAgIH0KKyAgICBpZiAo bV9mb250SWRlbnRpZmllcnMuY29udGFpbnMoZm9udC5yZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZp ZXIoKSkpCisgICAgICAgIHJldHVybjsKKworICAgIG1fZm9udElkZW50aWZpZXJzLmFkZChmb250 LnJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcigpKTsKKyAgICBtX3JlbW90ZVJlbmRlcmluZ0Jh Y2tlbmRQcm94eS5jYWNoZUZvbnQobWFrZVJlZihmb250KSk7CiB9CiAKIHZvaWQgUmVtb3RlUmVz b3VyY2VDYWNoZVByb3h5OjpyZWxlYXNlTmF0aXZlSW1hZ2UoUmVuZGVyaW5nUmVzb3VyY2VJZGVu dGlmaWVyIHJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcikKQEAgLTEyNiw0NCArMTIwLDYgQEAg dm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OnJlbGVhc2VOYXRpdmVJbWFnZShSZW5kZXJp bmdSZXNvdXJjZUlkZW50aWZpZXIgcmUKICAgICBtX3JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94 eS5yZWxlYXNlUmVtb3RlUmVzb3VyY2UocmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyKTsKIH0K IAotdm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OnByZXBhcmVGb3JOZXh0UmVuZGVyaW5n VXBkYXRlKCkKLXsKLSAgICArK21fY3VycmVudFJlbmRlcmluZ1VwZGF0ZVZlcnNpb247Ci0gICAg bV9udW1iZXJPZkZvbnRzVXNlZEluQ3VycmVudFJlbmRlcmluZ1VwZGF0ZSA9IDA7Ci19Ci0KLXZv aWQgUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5OjpjbGVhckZvbnRNYXAoKQotewotICAgIG1fZm9u dElkZW50aWZpZXJUb0xhc3RSZW5kZXJpbmdVcGRhdGVWZXJzaW9uTWFwLmNsZWFyKCk7Ci0gICAg bV9udW1iZXJPZkZvbnRzVXNlZEluQ3VycmVudFJlbmRlcmluZ1VwZGF0ZSA9IDA7Ci0gICAgbV9j dXJyZW50UmVuZGVyaW5nVXBkYXRlVmVyc2lvbiA9IDA7Ci19Ci0KLXZvaWQgUmVtb3RlUmVzb3Vy Y2VDYWNoZVByb3h5OjpkaWRGaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpCi17Ci0gICAgc3RhdGlj IGNvbnN0ZXhwciB1bnNpZ25lZCBtaW5pbXVtUmVuZGVyaW5nVXBkYXRlQ291bnRUb0tlZXBGb250 QWxpdmUgPSA0OwotICAgIHN0YXRpYyBjb25zdGV4cHIgZG91YmxlIG1pbmltdW1GcmFjdGlvbk9m VW51c2VkRm9udENvdW50VG9UcmlnZ2VyUmVtb3ZhbCA9IDAuMjU7Ci0KLSAgICB1bnNpZ25lZCB0 b3RhbEZvbnRDb3VudCA9IG1fZm9udElkZW50aWZpZXJUb0xhc3RSZW5kZXJpbmdVcGRhdGVWZXJz aW9uTWFwLnNpemUoKTsKLSAgICBSRUxFQVNFX0FTU0VSVChtX251bWJlck9mRm9udHNVc2VkSW5D dXJyZW50UmVuZGVyaW5nVXBkYXRlIDw9IHRvdGFsRm9udENvdW50KTsKLQotICAgIHVuc2lnbmVk IHVudXNlZEZvbnRDb3VudCA9IHRvdGFsRm9udENvdW50IC0gbV9udW1iZXJPZkZvbnRzVXNlZElu Q3VycmVudFJlbmRlcmluZ1VwZGF0ZTsKLSAgICBpZiAodW51c2VkRm9udENvdW50IDw9IG1pbmlt dW1GcmFjdGlvbk9mVW51c2VkRm9udENvdW50VG9UcmlnZ2VyUmVtb3ZhbCAqIHRvdGFsRm9udENv dW50KSB7Ci0gICAgICAgIHByZXBhcmVGb3JOZXh0UmVuZGVyaW5nVXBkYXRlKCk7Ci0gICAgICAg IHJldHVybjsKLSAgICB9Ci0KLSAgICBtX2ZvbnRJZGVudGlmaWVyVG9MYXN0UmVuZGVyaW5nVXBk YXRlVmVyc2lvbk1hcC5yZW1vdmVJZihbJl0gKGNvbnN0IGF1dG8mIGl0ZW0pIHsKLSAgICAgICAg aWYgKG1fY3VycmVudFJlbmRlcmluZ1VwZGF0ZVZlcnNpb24gLSBpdGVtLnZhbHVlIDwgbWluaW11 bVJlbmRlcmluZ1VwZGF0ZUNvdW50VG9LZWVwRm9udEFsaXZlKQotICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwotCi0gICAgICAgIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LnJlbGVhc2VS ZW1vdGVSZXNvdXJjZShpdGVtLmtleSk7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0pOwot ICAgIAotICAgIHByZXBhcmVGb3JOZXh0UmVuZGVyaW5nVXBkYXRlKCk7Ci19Ci0KIHZvaWQgUmVt b3RlUmVzb3VyY2VDYWNoZVByb3h5OjpyZW1vdGVSZXNvdXJjZUNhY2hlV2FzRGVzdHJveWVkKCkK IHsKICAgICBmb3IgKGF1dG8mIGltYWdlQnVmZmVyIDogbV9pbWFnZUJ1ZmZlcnMudmFsdWVzKCkp IHsKQEAgLTE3MywxMyArMTI5LDEzIEBAIHZvaWQgUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5Ojpy ZW1vdGVSZXNvdXJjZUNhY2hlV2FzRGVzdHJveWVkKCkKICAgICAgICAgaW1hZ2VCdWZmZXItPmNs ZWFyQmFja2VuZCgpOwogICAgIH0KICAgICBtX25hdGl2ZUltYWdlcy5jbGVhcigpOwotICAgIGNs ZWFyRm9udE1hcCgpOworICAgIG1fZm9udElkZW50aWZpZXJzLmNsZWFyKCk7CiB9CiAKIHZvaWQg UmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5OjpyZWxlYXNlTWVtb3J5KCkKIHsKICAgICBtX3JlbW90 ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5kZWxldGVBbGxGb250cygpOwotICAgIGNsZWFyRm9udE1h cCgpOworICAgIG1fZm9udElkZW50aWZpZXJzLmNsZWFyKCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNl IFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGlj cy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9H UFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmgKaW5kZXggZDYwNGFmYWFhYTBh ZjA1NWE5ZWQxMmZlYzIwZjFlYmMzODcyNjQxZS4uMWIwZTkyNWZhOWY5ZGJjNTNiYWI4NjVkYjE5 MmQxYWQxMzdkMzFmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9n cmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5oCkBAIC01Miw3 ICs1Miw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGNhY2hlTmF0aXZlSW1hZ2UoV2ViQ29yZTo6TmF0 aXZlSW1hZ2UmKTsKIAogICAgIHZvaWQgY2FjaGVGb250KFdlYkNvcmU6OkZvbnQmKTsKLSAgICB2 b2lkIGRpZEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKCk7CiAKICAgICB2b2lkIHJlbW90ZVJlc291 cmNlQ2FjaGVXYXNEZXN0cm95ZWQoKTsKICAgICB2b2lkIHJlbGVhc2VNZW1vcnkoKTsKQEAgLTYw LDE3ICs1OSwxMyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHVzaW5nIEltYWdlQnVmZmVySGFz aE1hcCA9IEhhc2hNYXA8V2ViQ29yZTo6UmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyLCBXZWFr UHRyPFdlYkNvcmU6OkltYWdlQnVmZmVyPj47CiAgICAgdXNpbmcgTmF0aXZlSW1hZ2VIYXNoTWFw ID0gSGFzaE1hcDxXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIsIFdlYWtQdHI8 V2ViQ29yZTo6TmF0aXZlSW1hZ2U+PjsKLSAgICAKKyAgICB1c2luZyBGb250SGFzaFNldCA9IEhh c2hTZXQ8V2ViQ29yZTo6UmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyPjsKKwogICAgIHZvaWQg cmVsZWFzZU5hdGl2ZUltYWdlKFdlYkNvcmU6OlJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcikg b3ZlcnJpZGU7Ci0gICAgdm9pZCBwcmVwYXJlRm9yTmV4dFJlbmRlcmluZ1VwZGF0ZSgpOwotICAg IHZvaWQgY2xlYXJGb250TWFwKCk7CiAKICAgICBJbWFnZUJ1ZmZlckhhc2hNYXAgbV9pbWFnZUJ1 ZmZlcnM7CiAgICAgTmF0aXZlSW1hZ2VIYXNoTWFwIG1fbmF0aXZlSW1hZ2VzOwotCi0gICAgSGFz aE1hcDxXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIsIHVpbnQ2NF90PiBtX2Zv bnRJZGVudGlmaWVyVG9MYXN0UmVuZGVyaW5nVXBkYXRlVmVyc2lvbk1hcDsKLSAgICB1bnNpZ25l ZCBtX251bWJlck9mRm9udHNVc2VkSW5DdXJyZW50UmVuZGVyaW5nVXBkYXRlIHsgMCB9OwotICAg IHVpbnQ2NF90IG1fY3VycmVudFJlbmRlcmluZ1VwZGF0ZVZlcnNpb24geyAxIH07CisgICAgRm9u dEhhc2hTZXQgbV9mb250SWRlbnRpZmllcnM7CiAKICAgICBSZW1vdGVSZW5kZXJpbmdCYWNrZW5k UHJveHkmIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OwogfTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMzdiNDNlOWM3YzVmMmQ3YzA5 N2YzOGQwZmQ2MGY5Y2M4YjRlNmQxOC4uNGYyMGEwNGFiODQ2YWUwMWZlMTc1ZjVkZDM0NDEzMDVm NmZmNTYzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHAKQEAgLTQxODMsMTAgKzQxODMsNiBAQCB2b2lkIFdlYlBhZ2U6OmRpZFVwZGF0ZVJlbmRlcmlu ZygpCiB2b2lkIFdlYlBhZ2U6OmZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKE9wdGlvblNldDxGaW5h bGl6ZVJlbmRlcmluZ1VwZGF0ZUZsYWdzPiBmbGFncykKIHsKICAgICBtX3BhZ2UtPmZpbmFsaXpl UmVuZGVyaW5nVXBkYXRlKGZsYWdzKTsKLSNpZiBFTkFCTEUoR1BVX1BST0NFU1MpCi0gICAgaWYg KG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5KQotICAgICAgICBtX3JlbW90ZVJlbmRlcmlu Z0JhY2tlbmRQcm94eS0+cmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5KCkuZGlkRmluYWxpemVSZW5k ZXJpbmdVcGRhdGUoKTsKLSNlbmRpZgogfQogCiB2b2lkIFdlYlBhZ2U6OnJlbGVhc2VNZW1vcnko Q3JpdGljYWwpCg== 432019 2021-06-22 22:43:11 -0700 2021-06-23 01:14:30 -0700 Patch bug-227277-20210622224310.patch text/plain 7420 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MTM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRkZTk3MDI2YTZmMGI1NTk3 MDE3ZWExYmUwNjg2OGUzM2NiYjViMGIuLmU0NDdmYTA5YWM5ZmI0ZGUxMzI2OWZjMGMyNTQ5MThk ODUxZTc1ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDYtMjIgIFNhaWQgQWJv dS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjc5MTA0 KTogW0dQVSBQcm9jZXNzXSBDYW52YXMgbGF5b3V0IHRlc3RzIGJlY2FtZSBmbGFreQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3Mjc3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIFJlbW90ZVJl c291cmNlQ2FjaGVQcm94eTo6ZGlkRmluYWxpemVSZW5kZXJpbmdVcGRhdGUoKSBzaW5jZSBpdCAK KyAgICAgICAgd2FzIGRvaW5nIG5vdGhpbmcgYmVmb3JlIHIyNzkxMDQuIENoYW5naW5nIGl0IGNh dXNlZCBmb250cyB0byBiZSByZW1vdmVkCisgICAgICAgIGZyb20gdGhlIGNhY2hlIGFuZCByZS1j YWNoZWQgd2hpY2ggbmV2ZXIgaGFwcGVuZWQgYmVmb3JlIHIyNzkxMDQuIFRoaXMKKyAgICAgICAg Y2F1c2VkIG1vcmUgcGVuZGluZyB3YWxrLXVwIHRvIGhhcHBlbiBtb3JlIG9mdGVuIGluIFJlbW90 ZVJlbmRlcmluZ0JhY2tlbmQKKyAgICAgICAgYmVjYXVzZSB0aGUgRm9udCBpcyBtaXNzaW5nIGZy b20gdGhlIFJlbW90ZVJlc291cmNlQ2FjaGUuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9n cmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpS ZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OmNhY2hlRm9udCk6CisgICAgICAgIChXZWJLaXQ6OlJl bW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cmVtb3RlUmVzb3VyY2VDYWNoZVdhc0Rlc3Ryb3llZCk6 CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cmVsZWFzZU1lbW9y eSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cHJlcGFyZUZv ck5leHRSZW5kZXJpbmdVcGRhdGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVS ZXNvdXJjZUNhY2hlUHJveHk6OmNsZWFyRm9udE1hcCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJL aXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6ZGlkRmluYWxpemVSZW5kZXJpbmdVcGRhdGUp OiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291 cmNlQ2FjaGVQcm94eS5oOgorICAgICAgICAoKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmZpbmFs aXplUmVuZGVyaW5nVXBkYXRlKToKKwogMjAyMS0wNi0wNyAgSmVyIE5vYmxlICA8amVyLm5vYmxl QGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIFVwc3RyZWFtIEdyb3VwQWN0aXZpdGllc0Nv b3JkaW5hdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBo aWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5jcHAKaW5kZXggMjVmOGU1 NGY4Y2VmZjk5OTA5Y2RiYjRhMWU2ZTZjNTA0NzkzNmU0Ny4uMDY0ZmFmYWViNjI2MzU4MDY4ODAy N2U4ZDQyOGQwOTRjMGU0ZjYyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L0dQVS9ncmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmNw cApAQCAtMTA0LDE3ICsxMDQsMTEgQEAgdm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OmNh Y2hlTmF0aXZlSW1hZ2UoTmF0aXZlSW1hZ2UmIGltYWdlKQogCiB2b2lkIFJlbW90ZVJlc291cmNl Q2FjaGVQcm94eTo6Y2FjaGVGb250KEZvbnQmIGZvbnQpCiB7Ci0gICAgYXV0byByZXN1bHQgPSBt X2ZvbnRJZGVudGlmaWVyVG9MYXN0UmVuZGVyaW5nVXBkYXRlVmVyc2lvbk1hcC5lbnN1cmUoZm9u dC5yZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIoKSwgWyZdIHsKLSAgICAgICAgbV9yZW1vdGVS ZW5kZXJpbmdCYWNrZW5kUHJveHkuY2FjaGVGb250KG1ha2VSZWYoZm9udCkpOwotICAgICAgICAr K21fbnVtYmVyT2ZGb250c1VzZWRJbkN1cnJlbnRSZW5kZXJpbmdVcGRhdGU7Ci0gICAgICAgIHJl dHVybiBtX2N1cnJlbnRSZW5kZXJpbmdVcGRhdGVWZXJzaW9uOwotICAgIH0pOwotCi0gICAgYXV0 byYgbGFzdFZlcnNpb24gPSByZXN1bHQuaXRlcmF0b3ItPnZhbHVlOwotICAgIGlmIChsYXN0VmVy c2lvbiAhPSBtX2N1cnJlbnRSZW5kZXJpbmdVcGRhdGVWZXJzaW9uKSB7Ci0gICAgICAgIGxhc3RW ZXJzaW9uID0gbV9jdXJyZW50UmVuZGVyaW5nVXBkYXRlVmVyc2lvbjsKLSAgICAgICAgKyttX251 bWJlck9mRm9udHNVc2VkSW5DdXJyZW50UmVuZGVyaW5nVXBkYXRlOwotICAgIH0KKyAgICBpZiAo bV9mb250SWRlbnRpZmllcnMuY29udGFpbnMoZm9udC5yZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZp ZXIoKSkpCisgICAgICAgIHJldHVybjsKKworICAgIG1fZm9udElkZW50aWZpZXJzLmFkZChmb250 LnJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcigpKTsKKyAgICBtX3JlbW90ZVJlbmRlcmluZ0Jh Y2tlbmRQcm94eS5jYWNoZUZvbnQobWFrZVJlZihmb250KSk7CiB9CiAKIHZvaWQgUmVtb3RlUmVz b3VyY2VDYWNoZVByb3h5OjpyZWxlYXNlTmF0aXZlSW1hZ2UoUmVuZGVyaW5nUmVzb3VyY2VJZGVu dGlmaWVyIHJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcikKQEAgLTEyNiw0NCArMTIwLDYgQEAg dm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OnJlbGVhc2VOYXRpdmVJbWFnZShSZW5kZXJp bmdSZXNvdXJjZUlkZW50aWZpZXIgcmUKICAgICBtX3JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94 eS5yZWxlYXNlUmVtb3RlUmVzb3VyY2UocmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyKTsKIH0K IAotdm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OnByZXBhcmVGb3JOZXh0UmVuZGVyaW5n VXBkYXRlKCkKLXsKLSAgICArK21fY3VycmVudFJlbmRlcmluZ1VwZGF0ZVZlcnNpb247Ci0gICAg bV9udW1iZXJPZkZvbnRzVXNlZEluQ3VycmVudFJlbmRlcmluZ1VwZGF0ZSA9IDA7Ci19Ci0KLXZv aWQgUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5OjpjbGVhckZvbnRNYXAoKQotewotICAgIG1fZm9u dElkZW50aWZpZXJUb0xhc3RSZW5kZXJpbmdVcGRhdGVWZXJzaW9uTWFwLmNsZWFyKCk7Ci0gICAg bV9udW1iZXJPZkZvbnRzVXNlZEluQ3VycmVudFJlbmRlcmluZ1VwZGF0ZSA9IDA7Ci0gICAgbV9j dXJyZW50UmVuZGVyaW5nVXBkYXRlVmVyc2lvbiA9IDA7Ci19Ci0KLXZvaWQgUmVtb3RlUmVzb3Vy Y2VDYWNoZVByb3h5OjpkaWRGaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpCi17Ci0gICAgc3RhdGlj IGNvbnN0ZXhwciB1bnNpZ25lZCBtaW5pbXVtUmVuZGVyaW5nVXBkYXRlQ291bnRUb0tlZXBGb250 QWxpdmUgPSA0OwotICAgIHN0YXRpYyBjb25zdGV4cHIgZG91YmxlIG1pbmltdW1GcmFjdGlvbk9m VW51c2VkRm9udENvdW50VG9UcmlnZ2VyUmVtb3ZhbCA9IDAuMjU7Ci0KLSAgICB1bnNpZ25lZCB0 b3RhbEZvbnRDb3VudCA9IG1fZm9udElkZW50aWZpZXJUb0xhc3RSZW5kZXJpbmdVcGRhdGVWZXJz aW9uTWFwLnNpemUoKTsKLSAgICBSRUxFQVNFX0FTU0VSVChtX251bWJlck9mRm9udHNVc2VkSW5D dXJyZW50UmVuZGVyaW5nVXBkYXRlIDw9IHRvdGFsRm9udENvdW50KTsKLQotICAgIHVuc2lnbmVk IHVudXNlZEZvbnRDb3VudCA9IHRvdGFsRm9udENvdW50IC0gbV9udW1iZXJPZkZvbnRzVXNlZElu Q3VycmVudFJlbmRlcmluZ1VwZGF0ZTsKLSAgICBpZiAodW51c2VkRm9udENvdW50IDw9IG1pbmlt dW1GcmFjdGlvbk9mVW51c2VkRm9udENvdW50VG9UcmlnZ2VyUmVtb3ZhbCAqIHRvdGFsRm9udENv dW50KSB7Ci0gICAgICAgIHByZXBhcmVGb3JOZXh0UmVuZGVyaW5nVXBkYXRlKCk7Ci0gICAgICAg IHJldHVybjsKLSAgICB9Ci0KLSAgICBtX2ZvbnRJZGVudGlmaWVyVG9MYXN0UmVuZGVyaW5nVXBk YXRlVmVyc2lvbk1hcC5yZW1vdmVJZihbJl0gKGNvbnN0IGF1dG8mIGl0ZW0pIHsKLSAgICAgICAg aWYgKG1fY3VycmVudFJlbmRlcmluZ1VwZGF0ZVZlcnNpb24gLSBpdGVtLnZhbHVlIDwgbWluaW11 bVJlbmRlcmluZ1VwZGF0ZUNvdW50VG9LZWVwRm9udEFsaXZlKQotICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwotCi0gICAgICAgIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LnJlbGVhc2VS ZW1vdGVSZXNvdXJjZShpdGVtLmtleSk7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0pOwot ICAgIAotICAgIHByZXBhcmVGb3JOZXh0UmVuZGVyaW5nVXBkYXRlKCk7Ci19Ci0KIHZvaWQgUmVt b3RlUmVzb3VyY2VDYWNoZVByb3h5OjpyZW1vdGVSZXNvdXJjZUNhY2hlV2FzRGVzdHJveWVkKCkK IHsKICAgICBmb3IgKGF1dG8mIGltYWdlQnVmZmVyIDogbV9pbWFnZUJ1ZmZlcnMudmFsdWVzKCkp IHsKQEAgLTE3MywxMyArMTI5LDEzIEBAIHZvaWQgUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5Ojpy ZW1vdGVSZXNvdXJjZUNhY2hlV2FzRGVzdHJveWVkKCkKICAgICAgICAgaW1hZ2VCdWZmZXItPmNs ZWFyQmFja2VuZCgpOwogICAgIH0KICAgICBtX25hdGl2ZUltYWdlcy5jbGVhcigpOwotICAgIGNs ZWFyRm9udE1hcCgpOworICAgIG1fZm9udElkZW50aWZpZXJzLmNsZWFyKCk7CiB9CiAKIHZvaWQg UmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5OjpyZWxlYXNlTWVtb3J5KCkKIHsKICAgICBtX3JlbW90 ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5kZWxldGVBbGxGb250cygpOwotICAgIGNsZWFyRm9udE1h cCgpOworICAgIG1fZm9udElkZW50aWZpZXJzLmNsZWFyKCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNl IFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGlj cy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9H UFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmgKaW5kZXggZDYwNGFmYWFhYTBh ZjA1NWE5ZWQxMmZlYzIwZjFlYmMzODcyNjQxZS4uMWIwZTkyNWZhOWY5ZGJjNTNiYWI4NjVkYjE5 MmQxYWQxMzdkMzFmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9n cmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5oCkBAIC01Miw3 ICs1Miw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGNhY2hlTmF0aXZlSW1hZ2UoV2ViQ29yZTo6TmF0 aXZlSW1hZ2UmKTsKIAogICAgIHZvaWQgY2FjaGVGb250KFdlYkNvcmU6OkZvbnQmKTsKLSAgICB2 b2lkIGRpZEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKCk7CiAKICAgICB2b2lkIHJlbW90ZVJlc291 cmNlQ2FjaGVXYXNEZXN0cm95ZWQoKTsKICAgICB2b2lkIHJlbGVhc2VNZW1vcnkoKTsKQEAgLTYw LDE3ICs1OSwxMyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHVzaW5nIEltYWdlQnVmZmVySGFz aE1hcCA9IEhhc2hNYXA8V2ViQ29yZTo6UmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyLCBXZWFr UHRyPFdlYkNvcmU6OkltYWdlQnVmZmVyPj47CiAgICAgdXNpbmcgTmF0aXZlSW1hZ2VIYXNoTWFw ID0gSGFzaE1hcDxXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIsIFdlYWtQdHI8 V2ViQ29yZTo6TmF0aXZlSW1hZ2U+PjsKLSAgICAKKyAgICB1c2luZyBGb250SGFzaFNldCA9IEhh c2hTZXQ8V2ViQ29yZTo6UmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyPjsKKwogICAgIHZvaWQg cmVsZWFzZU5hdGl2ZUltYWdlKFdlYkNvcmU6OlJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcikg b3ZlcnJpZGU7Ci0gICAgdm9pZCBwcmVwYXJlRm9yTmV4dFJlbmRlcmluZ1VwZGF0ZSgpOwotICAg IHZvaWQgY2xlYXJGb250TWFwKCk7CiAKICAgICBJbWFnZUJ1ZmZlckhhc2hNYXAgbV9pbWFnZUJ1 ZmZlcnM7CiAgICAgTmF0aXZlSW1hZ2VIYXNoTWFwIG1fbmF0aXZlSW1hZ2VzOwotCi0gICAgSGFz aE1hcDxXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIsIHVpbnQ2NF90PiBtX2Zv bnRJZGVudGlmaWVyVG9MYXN0UmVuZGVyaW5nVXBkYXRlVmVyc2lvbk1hcDsKLSAgICB1bnNpZ25l ZCBtX251bWJlck9mRm9udHNVc2VkSW5DdXJyZW50UmVuZGVyaW5nVXBkYXRlIHsgMCB9OwotICAg IHVpbnQ2NF90IG1fY3VycmVudFJlbmRlcmluZ1VwZGF0ZVZlcnNpb24geyAxIH07CisgICAgRm9u dEhhc2hTZXQgbV9mb250SWRlbnRpZmllcnM7CiAKICAgICBSZW1vdGVSZW5kZXJpbmdCYWNrZW5k UHJveHkmIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OwogfTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMzdiNDNlOWM3YzVmMmQ3YzA5 N2YzOGQwZmQ2MGY5Y2M4YjRlNmQxOC4uNGYyMGEwNGFiODQ2YWUwMWZlMTc1ZjVkZDM0NDEzMDVm NmZmNTYzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHAKQEAgLTQxODMsMTAgKzQxODMsNiBAQCB2b2lkIFdlYlBhZ2U6OmRpZFVwZGF0ZVJlbmRlcmlu ZygpCiB2b2lkIFdlYlBhZ2U6OmZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKE9wdGlvblNldDxGaW5h bGl6ZVJlbmRlcmluZ1VwZGF0ZUZsYWdzPiBmbGFncykKIHsKICAgICBtX3BhZ2UtPmZpbmFsaXpl UmVuZGVyaW5nVXBkYXRlKGZsYWdzKTsKLSNpZiBFTkFCTEUoR1BVX1BST0NFU1MpCi0gICAgaWYg KG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5KQotICAgICAgICBtX3JlbW90ZVJlbmRlcmlu Z0JhY2tlbmRQcm94eS0+cmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5KCkuZGlkRmluYWxpemVSZW5k ZXJpbmdVcGRhdGUoKTsKLSNlbmRpZgogfQogCiB2b2lkIFdlYlBhZ2U6OnJlbGVhc2VNZW1vcnko Q3JpdGljYWwpCg== 432020 2021-06-22 23:04:31 -0700 2021-06-22 23:04:31 -0700 Patch bug-227277-20210622230430.patch text/plain 7420 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MTM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRkZTk3MDI2YTZmMGI1NTk3 MDE3ZWExYmUwNjg2OGUzM2NiYjViMGIuLmU0NDdmYTA5YWM5ZmI0ZGUxMzI2OWZjMGMyNTQ5MThk ODUxZTc1ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDYtMjIgIFNhaWQgQWJv dS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjc5MTA0 KTogW0dQVSBQcm9jZXNzXSBDYW52YXMgbGF5b3V0IHRlc3RzIGJlY2FtZSBmbGFreQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3Mjc3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIFJlbW90ZVJl c291cmNlQ2FjaGVQcm94eTo6ZGlkRmluYWxpemVSZW5kZXJpbmdVcGRhdGUoKSBzaW5jZSBpdCAK KyAgICAgICAgd2FzIGRvaW5nIG5vdGhpbmcgYmVmb3JlIHIyNzkxMDQuIENoYW5naW5nIGl0IGNh dXNlZCBmb250cyB0byBiZSByZW1vdmVkCisgICAgICAgIGZyb20gdGhlIGNhY2hlIGFuZCByZS1j YWNoZWQgd2hpY2ggbmV2ZXIgaGFwcGVuZWQgYmVmb3JlIHIyNzkxMDQuIFRoaXMKKyAgICAgICAg Y2F1c2VkIG1vcmUgcGVuZGluZyB3YWxrLXVwIHRvIGhhcHBlbiBtb3JlIG9mdGVuIGluIFJlbW90 ZVJlbmRlcmluZ0JhY2tlbmQKKyAgICAgICAgYmVjYXVzZSB0aGUgRm9udCBpcyBtaXNzaW5nIGZy b20gdGhlIFJlbW90ZVJlc291cmNlQ2FjaGUuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9n cmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpS ZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OmNhY2hlRm9udCk6CisgICAgICAgIChXZWJLaXQ6OlJl bW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cmVtb3RlUmVzb3VyY2VDYWNoZVdhc0Rlc3Ryb3llZCk6 CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cmVsZWFzZU1lbW9y eSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cHJlcGFyZUZv ck5leHRSZW5kZXJpbmdVcGRhdGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVS ZXNvdXJjZUNhY2hlUHJveHk6OmNsZWFyRm9udE1hcCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJL aXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6ZGlkRmluYWxpemVSZW5kZXJpbmdVcGRhdGUp OiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291 cmNlQ2FjaGVQcm94eS5oOgorICAgICAgICAoKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmZpbmFs aXplUmVuZGVyaW5nVXBkYXRlKToKKwogMjAyMS0wNi0wNyAgSmVyIE5vYmxlICA8amVyLm5vYmxl QGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIFVwc3RyZWFtIEdyb3VwQWN0aXZpdGllc0Nv b3JkaW5hdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBo aWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5jcHAKaW5kZXggMjVmOGU1 NGY4Y2VmZjk5OTA5Y2RiYjRhMWU2ZTZjNTA0NzkzNmU0Ny4uMDY0ZmFmYWViNjI2MzU4MDY4ODAy N2U4ZDQyOGQwOTRjMGU0ZjYyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L0dQVS9ncmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmNw cApAQCAtMTA0LDE3ICsxMDQsMTEgQEAgdm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OmNh Y2hlTmF0aXZlSW1hZ2UoTmF0aXZlSW1hZ2UmIGltYWdlKQogCiB2b2lkIFJlbW90ZVJlc291cmNl Q2FjaGVQcm94eTo6Y2FjaGVGb250KEZvbnQmIGZvbnQpCiB7Ci0gICAgYXV0byByZXN1bHQgPSBt X2ZvbnRJZGVudGlmaWVyVG9MYXN0UmVuZGVyaW5nVXBkYXRlVmVyc2lvbk1hcC5lbnN1cmUoZm9u dC5yZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIoKSwgWyZdIHsKLSAgICAgICAgbV9yZW1vdGVS ZW5kZXJpbmdCYWNrZW5kUHJveHkuY2FjaGVGb250KG1ha2VSZWYoZm9udCkpOwotICAgICAgICAr K21fbnVtYmVyT2ZGb250c1VzZWRJbkN1cnJlbnRSZW5kZXJpbmdVcGRhdGU7Ci0gICAgICAgIHJl dHVybiBtX2N1cnJlbnRSZW5kZXJpbmdVcGRhdGVWZXJzaW9uOwotICAgIH0pOwotCi0gICAgYXV0 byYgbGFzdFZlcnNpb24gPSByZXN1bHQuaXRlcmF0b3ItPnZhbHVlOwotICAgIGlmIChsYXN0VmVy c2lvbiAhPSBtX2N1cnJlbnRSZW5kZXJpbmdVcGRhdGVWZXJzaW9uKSB7Ci0gICAgICAgIGxhc3RW ZXJzaW9uID0gbV9jdXJyZW50UmVuZGVyaW5nVXBkYXRlVmVyc2lvbjsKLSAgICAgICAgKyttX251 bWJlck9mRm9udHNVc2VkSW5DdXJyZW50UmVuZGVyaW5nVXBkYXRlOwotICAgIH0KKyAgICBpZiAo bV9mb250SWRlbnRpZmllcnMuY29udGFpbnMoZm9udC5yZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZp ZXIoKSkpCisgICAgICAgIHJldHVybjsKKworICAgIG1fZm9udElkZW50aWZpZXJzLmFkZChmb250 LnJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcigpKTsKKyAgICBtX3JlbW90ZVJlbmRlcmluZ0Jh Y2tlbmRQcm94eS5jYWNoZUZvbnQobWFrZVJlZihmb250KSk7CiB9CiAKIHZvaWQgUmVtb3RlUmVz b3VyY2VDYWNoZVByb3h5OjpyZWxlYXNlTmF0aXZlSW1hZ2UoUmVuZGVyaW5nUmVzb3VyY2VJZGVu dGlmaWVyIHJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcikKQEAgLTEyNiw0NCArMTIwLDYgQEAg dm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OnJlbGVhc2VOYXRpdmVJbWFnZShSZW5kZXJp bmdSZXNvdXJjZUlkZW50aWZpZXIgcmUKICAgICBtX3JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94 eS5yZWxlYXNlUmVtb3RlUmVzb3VyY2UocmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyKTsKIH0K IAotdm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OnByZXBhcmVGb3JOZXh0UmVuZGVyaW5n VXBkYXRlKCkKLXsKLSAgICArK21fY3VycmVudFJlbmRlcmluZ1VwZGF0ZVZlcnNpb247Ci0gICAg bV9udW1iZXJPZkZvbnRzVXNlZEluQ3VycmVudFJlbmRlcmluZ1VwZGF0ZSA9IDA7Ci19Ci0KLXZv aWQgUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5OjpjbGVhckZvbnRNYXAoKQotewotICAgIG1fZm9u dElkZW50aWZpZXJUb0xhc3RSZW5kZXJpbmdVcGRhdGVWZXJzaW9uTWFwLmNsZWFyKCk7Ci0gICAg bV9udW1iZXJPZkZvbnRzVXNlZEluQ3VycmVudFJlbmRlcmluZ1VwZGF0ZSA9IDA7Ci0gICAgbV9j dXJyZW50UmVuZGVyaW5nVXBkYXRlVmVyc2lvbiA9IDA7Ci19Ci0KLXZvaWQgUmVtb3RlUmVzb3Vy Y2VDYWNoZVByb3h5OjpkaWRGaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpCi17Ci0gICAgc3RhdGlj IGNvbnN0ZXhwciB1bnNpZ25lZCBtaW5pbXVtUmVuZGVyaW5nVXBkYXRlQ291bnRUb0tlZXBGb250 QWxpdmUgPSA0OwotICAgIHN0YXRpYyBjb25zdGV4cHIgZG91YmxlIG1pbmltdW1GcmFjdGlvbk9m VW51c2VkRm9udENvdW50VG9UcmlnZ2VyUmVtb3ZhbCA9IDAuMjU7Ci0KLSAgICB1bnNpZ25lZCB0 b3RhbEZvbnRDb3VudCA9IG1fZm9udElkZW50aWZpZXJUb0xhc3RSZW5kZXJpbmdVcGRhdGVWZXJz aW9uTWFwLnNpemUoKTsKLSAgICBSRUxFQVNFX0FTU0VSVChtX251bWJlck9mRm9udHNVc2VkSW5D dXJyZW50UmVuZGVyaW5nVXBkYXRlIDw9IHRvdGFsRm9udENvdW50KTsKLQotICAgIHVuc2lnbmVk IHVudXNlZEZvbnRDb3VudCA9IHRvdGFsRm9udENvdW50IC0gbV9udW1iZXJPZkZvbnRzVXNlZElu Q3VycmVudFJlbmRlcmluZ1VwZGF0ZTsKLSAgICBpZiAodW51c2VkRm9udENvdW50IDw9IG1pbmlt dW1GcmFjdGlvbk9mVW51c2VkRm9udENvdW50VG9UcmlnZ2VyUmVtb3ZhbCAqIHRvdGFsRm9udENv dW50KSB7Ci0gICAgICAgIHByZXBhcmVGb3JOZXh0UmVuZGVyaW5nVXBkYXRlKCk7Ci0gICAgICAg IHJldHVybjsKLSAgICB9Ci0KLSAgICBtX2ZvbnRJZGVudGlmaWVyVG9MYXN0UmVuZGVyaW5nVXBk YXRlVmVyc2lvbk1hcC5yZW1vdmVJZihbJl0gKGNvbnN0IGF1dG8mIGl0ZW0pIHsKLSAgICAgICAg aWYgKG1fY3VycmVudFJlbmRlcmluZ1VwZGF0ZVZlcnNpb24gLSBpdGVtLnZhbHVlIDwgbWluaW11 bVJlbmRlcmluZ1VwZGF0ZUNvdW50VG9LZWVwRm9udEFsaXZlKQotICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwotCi0gICAgICAgIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LnJlbGVhc2VS ZW1vdGVSZXNvdXJjZShpdGVtLmtleSk7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0pOwot ICAgIAotICAgIHByZXBhcmVGb3JOZXh0UmVuZGVyaW5nVXBkYXRlKCk7Ci19Ci0KIHZvaWQgUmVt b3RlUmVzb3VyY2VDYWNoZVByb3h5OjpyZW1vdGVSZXNvdXJjZUNhY2hlV2FzRGVzdHJveWVkKCkK IHsKICAgICBmb3IgKGF1dG8mIGltYWdlQnVmZmVyIDogbV9pbWFnZUJ1ZmZlcnMudmFsdWVzKCkp IHsKQEAgLTE3MywxMyArMTI5LDEzIEBAIHZvaWQgUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5Ojpy ZW1vdGVSZXNvdXJjZUNhY2hlV2FzRGVzdHJveWVkKCkKICAgICAgICAgaW1hZ2VCdWZmZXItPmNs ZWFyQmFja2VuZCgpOwogICAgIH0KICAgICBtX25hdGl2ZUltYWdlcy5jbGVhcigpOwotICAgIGNs ZWFyRm9udE1hcCgpOworICAgIG1fZm9udElkZW50aWZpZXJzLmNsZWFyKCk7CiB9CiAKIHZvaWQg UmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5OjpyZWxlYXNlTWVtb3J5KCkKIHsKICAgICBtX3JlbW90 ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5kZWxldGVBbGxGb250cygpOwotICAgIGNsZWFyRm9udE1h cCgpOworICAgIG1fZm9udElkZW50aWZpZXJzLmNsZWFyKCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNl IFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGlj cy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9H UFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmgKaW5kZXggZDYwNGFmYWFhYTBh ZjA1NWE5ZWQxMmZlYzIwZjFlYmMzODcyNjQxZS4uMWIwZTkyNWZhOWY5ZGJjNTNiYWI4NjVkYjE5 MmQxYWQxMzdkMzFmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9n cmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5oCkBAIC01Miw3 ICs1Miw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGNhY2hlTmF0aXZlSW1hZ2UoV2ViQ29yZTo6TmF0 aXZlSW1hZ2UmKTsKIAogICAgIHZvaWQgY2FjaGVGb250KFdlYkNvcmU6OkZvbnQmKTsKLSAgICB2 b2lkIGRpZEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKCk7CiAKICAgICB2b2lkIHJlbW90ZVJlc291 cmNlQ2FjaGVXYXNEZXN0cm95ZWQoKTsKICAgICB2b2lkIHJlbGVhc2VNZW1vcnkoKTsKQEAgLTYw LDE3ICs1OSwxMyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHVzaW5nIEltYWdlQnVmZmVySGFz aE1hcCA9IEhhc2hNYXA8V2ViQ29yZTo6UmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyLCBXZWFr UHRyPFdlYkNvcmU6OkltYWdlQnVmZmVyPj47CiAgICAgdXNpbmcgTmF0aXZlSW1hZ2VIYXNoTWFw ID0gSGFzaE1hcDxXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIsIFdlYWtQdHI8 V2ViQ29yZTo6TmF0aXZlSW1hZ2U+PjsKLSAgICAKKyAgICB1c2luZyBGb250SGFzaFNldCA9IEhh c2hTZXQ8V2ViQ29yZTo6UmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyPjsKKwogICAgIHZvaWQg cmVsZWFzZU5hdGl2ZUltYWdlKFdlYkNvcmU6OlJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcikg b3ZlcnJpZGU7Ci0gICAgdm9pZCBwcmVwYXJlRm9yTmV4dFJlbmRlcmluZ1VwZGF0ZSgpOwotICAg IHZvaWQgY2xlYXJGb250TWFwKCk7CiAKICAgICBJbWFnZUJ1ZmZlckhhc2hNYXAgbV9pbWFnZUJ1 ZmZlcnM7CiAgICAgTmF0aXZlSW1hZ2VIYXNoTWFwIG1fbmF0aXZlSW1hZ2VzOwotCi0gICAgSGFz aE1hcDxXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIsIHVpbnQ2NF90PiBtX2Zv bnRJZGVudGlmaWVyVG9MYXN0UmVuZGVyaW5nVXBkYXRlVmVyc2lvbk1hcDsKLSAgICB1bnNpZ25l ZCBtX251bWJlck9mRm9udHNVc2VkSW5DdXJyZW50UmVuZGVyaW5nVXBkYXRlIHsgMCB9OwotICAg IHVpbnQ2NF90IG1fY3VycmVudFJlbmRlcmluZ1VwZGF0ZVZlcnNpb24geyAxIH07CisgICAgRm9u dEhhc2hTZXQgbV9mb250SWRlbnRpZmllcnM7CiAKICAgICBSZW1vdGVSZW5kZXJpbmdCYWNrZW5k UHJveHkmIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OwogfTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMzdiNDNlOWM3YzVmMmQ3YzA5 N2YzOGQwZmQ2MGY5Y2M4YjRlNmQxOC4uNGYyMGEwNGFiODQ2YWUwMWZlMTc1ZjVkZDM0NDEzMDVm NmZmNTYzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHAKQEAgLTQxODMsMTAgKzQxODMsNiBAQCB2b2lkIFdlYlBhZ2U6OmRpZFVwZGF0ZVJlbmRlcmlu ZygpCiB2b2lkIFdlYlBhZ2U6OmZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKE9wdGlvblNldDxGaW5h bGl6ZVJlbmRlcmluZ1VwZGF0ZUZsYWdzPiBmbGFncykKIHsKICAgICBtX3BhZ2UtPmZpbmFsaXpl UmVuZGVyaW5nVXBkYXRlKGZsYWdzKTsKLSNpZiBFTkFCTEUoR1BVX1BST0NFU1MpCi0gICAgaWYg KG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5KQotICAgICAgICBtX3JlbW90ZVJlbmRlcmlu Z0JhY2tlbmRQcm94eS0+cmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5KCkuZGlkRmluYWxpemVSZW5k ZXJpbmdVcGRhdGUoKTsKLSNlbmRpZgogfQogCiB2b2lkIFdlYlBhZ2U6OnJlbGVhc2VNZW1vcnko Q3JpdGljYWwpCg== 432021 2021-06-22 23:07:34 -0700 2021-06-22 23:07:34 -0700 Patch bug-227277-20210622230733.patch text/plain 7420 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MTM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRkZTk3MDI2YTZmMGI1NTk3 MDE3ZWExYmUwNjg2OGUzM2NiYjViMGIuLmU0NDdmYTA5YWM5ZmI0ZGUxMzI2OWZjMGMyNTQ5MThk ODUxZTc1ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDYtMjIgIFNhaWQgQWJv dS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjc5MTA0 KTogW0dQVSBQcm9jZXNzXSBDYW52YXMgbGF5b3V0IHRlc3RzIGJlY2FtZSBmbGFreQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3Mjc3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIFJlbW90ZVJl c291cmNlQ2FjaGVQcm94eTo6ZGlkRmluYWxpemVSZW5kZXJpbmdVcGRhdGUoKSBzaW5jZSBpdCAK KyAgICAgICAgd2FzIGRvaW5nIG5vdGhpbmcgYmVmb3JlIHIyNzkxMDQuIENoYW5naW5nIGl0IGNh dXNlZCBmb250cyB0byBiZSByZW1vdmVkCisgICAgICAgIGZyb20gdGhlIGNhY2hlIGFuZCByZS1j YWNoZWQgd2hpY2ggbmV2ZXIgaGFwcGVuZWQgYmVmb3JlIHIyNzkxMDQuIFRoaXMKKyAgICAgICAg Y2F1c2VkIG1vcmUgcGVuZGluZyB3YWxrLXVwIHRvIGhhcHBlbiBtb3JlIG9mdGVuIGluIFJlbW90 ZVJlbmRlcmluZ0JhY2tlbmQKKyAgICAgICAgYmVjYXVzZSB0aGUgRm9udCBpcyBtaXNzaW5nIGZy b20gdGhlIFJlbW90ZVJlc291cmNlQ2FjaGUuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9n cmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpS ZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OmNhY2hlRm9udCk6CisgICAgICAgIChXZWJLaXQ6OlJl bW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cmVtb3RlUmVzb3VyY2VDYWNoZVdhc0Rlc3Ryb3llZCk6 CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cmVsZWFzZU1lbW9y eSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cHJlcGFyZUZv ck5leHRSZW5kZXJpbmdVcGRhdGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVS ZXNvdXJjZUNhY2hlUHJveHk6OmNsZWFyRm9udE1hcCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJL aXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6ZGlkRmluYWxpemVSZW5kZXJpbmdVcGRhdGUp OiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291 cmNlQ2FjaGVQcm94eS5oOgorICAgICAgICAoKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmZpbmFs aXplUmVuZGVyaW5nVXBkYXRlKToKKwogMjAyMS0wNi0wNyAgSmVyIE5vYmxlICA8amVyLm5vYmxl QGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIFVwc3RyZWFtIEdyb3VwQWN0aXZpdGllc0Nv b3JkaW5hdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBo aWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5jcHAKaW5kZXggMjVmOGU1 NGY4Y2VmZjk5OTA5Y2RiYjRhMWU2ZTZjNTA0NzkzNmU0Ny4uMDY0ZmFmYWViNjI2MzU4MDY4ODAy N2U4ZDQyOGQwOTRjMGU0ZjYyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L0dQVS9ncmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmNw cApAQCAtMTA0LDE3ICsxMDQsMTEgQEAgdm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OmNh Y2hlTmF0aXZlSW1hZ2UoTmF0aXZlSW1hZ2UmIGltYWdlKQogCiB2b2lkIFJlbW90ZVJlc291cmNl Q2FjaGVQcm94eTo6Y2FjaGVGb250KEZvbnQmIGZvbnQpCiB7Ci0gICAgYXV0byByZXN1bHQgPSBt X2ZvbnRJZGVudGlmaWVyVG9MYXN0UmVuZGVyaW5nVXBkYXRlVmVyc2lvbk1hcC5lbnN1cmUoZm9u dC5yZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIoKSwgWyZdIHsKLSAgICAgICAgbV9yZW1vdGVS ZW5kZXJpbmdCYWNrZW5kUHJveHkuY2FjaGVGb250KG1ha2VSZWYoZm9udCkpOwotICAgICAgICAr K21fbnVtYmVyT2ZGb250c1VzZWRJbkN1cnJlbnRSZW5kZXJpbmdVcGRhdGU7Ci0gICAgICAgIHJl dHVybiBtX2N1cnJlbnRSZW5kZXJpbmdVcGRhdGVWZXJzaW9uOwotICAgIH0pOwotCi0gICAgYXV0 byYgbGFzdFZlcnNpb24gPSByZXN1bHQuaXRlcmF0b3ItPnZhbHVlOwotICAgIGlmIChsYXN0VmVy c2lvbiAhPSBtX2N1cnJlbnRSZW5kZXJpbmdVcGRhdGVWZXJzaW9uKSB7Ci0gICAgICAgIGxhc3RW ZXJzaW9uID0gbV9jdXJyZW50UmVuZGVyaW5nVXBkYXRlVmVyc2lvbjsKLSAgICAgICAgKyttX251 bWJlck9mRm9udHNVc2VkSW5DdXJyZW50UmVuZGVyaW5nVXBkYXRlOwotICAgIH0KKyAgICBpZiAo bV9mb250SWRlbnRpZmllcnMuY29udGFpbnMoZm9udC5yZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZp ZXIoKSkpCisgICAgICAgIHJldHVybjsKKworICAgIG1fZm9udElkZW50aWZpZXJzLmFkZChmb250 LnJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcigpKTsKKyAgICBtX3JlbW90ZVJlbmRlcmluZ0Jh Y2tlbmRQcm94eS5jYWNoZUZvbnQobWFrZVJlZihmb250KSk7CiB9CiAKIHZvaWQgUmVtb3RlUmVz b3VyY2VDYWNoZVByb3h5OjpyZWxlYXNlTmF0aXZlSW1hZ2UoUmVuZGVyaW5nUmVzb3VyY2VJZGVu dGlmaWVyIHJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcikKQEAgLTEyNiw0NCArMTIwLDYgQEAg dm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OnJlbGVhc2VOYXRpdmVJbWFnZShSZW5kZXJp bmdSZXNvdXJjZUlkZW50aWZpZXIgcmUKICAgICBtX3JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94 eS5yZWxlYXNlUmVtb3RlUmVzb3VyY2UocmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyKTsKIH0K IAotdm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OnByZXBhcmVGb3JOZXh0UmVuZGVyaW5n VXBkYXRlKCkKLXsKLSAgICArK21fY3VycmVudFJlbmRlcmluZ1VwZGF0ZVZlcnNpb247Ci0gICAg bV9udW1iZXJPZkZvbnRzVXNlZEluQ3VycmVudFJlbmRlcmluZ1VwZGF0ZSA9IDA7Ci19Ci0KLXZv aWQgUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5OjpjbGVhckZvbnRNYXAoKQotewotICAgIG1fZm9u dElkZW50aWZpZXJUb0xhc3RSZW5kZXJpbmdVcGRhdGVWZXJzaW9uTWFwLmNsZWFyKCk7Ci0gICAg bV9udW1iZXJPZkZvbnRzVXNlZEluQ3VycmVudFJlbmRlcmluZ1VwZGF0ZSA9IDA7Ci0gICAgbV9j dXJyZW50UmVuZGVyaW5nVXBkYXRlVmVyc2lvbiA9IDA7Ci19Ci0KLXZvaWQgUmVtb3RlUmVzb3Vy Y2VDYWNoZVByb3h5OjpkaWRGaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpCi17Ci0gICAgc3RhdGlj IGNvbnN0ZXhwciB1bnNpZ25lZCBtaW5pbXVtUmVuZGVyaW5nVXBkYXRlQ291bnRUb0tlZXBGb250 QWxpdmUgPSA0OwotICAgIHN0YXRpYyBjb25zdGV4cHIgZG91YmxlIG1pbmltdW1GcmFjdGlvbk9m VW51c2VkRm9udENvdW50VG9UcmlnZ2VyUmVtb3ZhbCA9IDAuMjU7Ci0KLSAgICB1bnNpZ25lZCB0 b3RhbEZvbnRDb3VudCA9IG1fZm9udElkZW50aWZpZXJUb0xhc3RSZW5kZXJpbmdVcGRhdGVWZXJz aW9uTWFwLnNpemUoKTsKLSAgICBSRUxFQVNFX0FTU0VSVChtX251bWJlck9mRm9udHNVc2VkSW5D dXJyZW50UmVuZGVyaW5nVXBkYXRlIDw9IHRvdGFsRm9udENvdW50KTsKLQotICAgIHVuc2lnbmVk IHVudXNlZEZvbnRDb3VudCA9IHRvdGFsRm9udENvdW50IC0gbV9udW1iZXJPZkZvbnRzVXNlZElu Q3VycmVudFJlbmRlcmluZ1VwZGF0ZTsKLSAgICBpZiAodW51c2VkRm9udENvdW50IDw9IG1pbmlt dW1GcmFjdGlvbk9mVW51c2VkRm9udENvdW50VG9UcmlnZ2VyUmVtb3ZhbCAqIHRvdGFsRm9udENv dW50KSB7Ci0gICAgICAgIHByZXBhcmVGb3JOZXh0UmVuZGVyaW5nVXBkYXRlKCk7Ci0gICAgICAg IHJldHVybjsKLSAgICB9Ci0KLSAgICBtX2ZvbnRJZGVudGlmaWVyVG9MYXN0UmVuZGVyaW5nVXBk YXRlVmVyc2lvbk1hcC5yZW1vdmVJZihbJl0gKGNvbnN0IGF1dG8mIGl0ZW0pIHsKLSAgICAgICAg aWYgKG1fY3VycmVudFJlbmRlcmluZ1VwZGF0ZVZlcnNpb24gLSBpdGVtLnZhbHVlIDwgbWluaW11 bVJlbmRlcmluZ1VwZGF0ZUNvdW50VG9LZWVwRm9udEFsaXZlKQotICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwotCi0gICAgICAgIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LnJlbGVhc2VS ZW1vdGVSZXNvdXJjZShpdGVtLmtleSk7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0pOwot ICAgIAotICAgIHByZXBhcmVGb3JOZXh0UmVuZGVyaW5nVXBkYXRlKCk7Ci19Ci0KIHZvaWQgUmVt b3RlUmVzb3VyY2VDYWNoZVByb3h5OjpyZW1vdGVSZXNvdXJjZUNhY2hlV2FzRGVzdHJveWVkKCkK IHsKICAgICBmb3IgKGF1dG8mIGltYWdlQnVmZmVyIDogbV9pbWFnZUJ1ZmZlcnMudmFsdWVzKCkp IHsKQEAgLTE3MywxMyArMTI5LDEzIEBAIHZvaWQgUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5Ojpy ZW1vdGVSZXNvdXJjZUNhY2hlV2FzRGVzdHJveWVkKCkKICAgICAgICAgaW1hZ2VCdWZmZXItPmNs ZWFyQmFja2VuZCgpOwogICAgIH0KICAgICBtX25hdGl2ZUltYWdlcy5jbGVhcigpOwotICAgIGNs ZWFyRm9udE1hcCgpOworICAgIG1fZm9udElkZW50aWZpZXJzLmNsZWFyKCk7CiB9CiAKIHZvaWQg UmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5OjpyZWxlYXNlTWVtb3J5KCkKIHsKICAgICBtX3JlbW90 ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5kZWxldGVBbGxGb250cygpOwotICAgIGNsZWFyRm9udE1h cCgpOworICAgIG1fZm9udElkZW50aWZpZXJzLmNsZWFyKCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNl IFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGlj cy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9H UFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmgKaW5kZXggZDYwNGFmYWFhYTBh ZjA1NWE5ZWQxMmZlYzIwZjFlYmMzODcyNjQxZS4uMWIwZTkyNWZhOWY5ZGJjNTNiYWI4NjVkYjE5 MmQxYWQxMzdkMzFmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9n cmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5oCkBAIC01Miw3 ICs1Miw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGNhY2hlTmF0aXZlSW1hZ2UoV2ViQ29yZTo6TmF0 aXZlSW1hZ2UmKTsKIAogICAgIHZvaWQgY2FjaGVGb250KFdlYkNvcmU6OkZvbnQmKTsKLSAgICB2 b2lkIGRpZEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKCk7CiAKICAgICB2b2lkIHJlbW90ZVJlc291 cmNlQ2FjaGVXYXNEZXN0cm95ZWQoKTsKICAgICB2b2lkIHJlbGVhc2VNZW1vcnkoKTsKQEAgLTYw LDE3ICs1OSwxMyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHVzaW5nIEltYWdlQnVmZmVySGFz aE1hcCA9IEhhc2hNYXA8V2ViQ29yZTo6UmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyLCBXZWFr UHRyPFdlYkNvcmU6OkltYWdlQnVmZmVyPj47CiAgICAgdXNpbmcgTmF0aXZlSW1hZ2VIYXNoTWFw ID0gSGFzaE1hcDxXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIsIFdlYWtQdHI8 V2ViQ29yZTo6TmF0aXZlSW1hZ2U+PjsKLSAgICAKKyAgICB1c2luZyBGb250SGFzaFNldCA9IEhh c2hTZXQ8V2ViQ29yZTo6UmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyPjsKKwogICAgIHZvaWQg cmVsZWFzZU5hdGl2ZUltYWdlKFdlYkNvcmU6OlJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcikg b3ZlcnJpZGU7Ci0gICAgdm9pZCBwcmVwYXJlRm9yTmV4dFJlbmRlcmluZ1VwZGF0ZSgpOwotICAg IHZvaWQgY2xlYXJGb250TWFwKCk7CiAKICAgICBJbWFnZUJ1ZmZlckhhc2hNYXAgbV9pbWFnZUJ1 ZmZlcnM7CiAgICAgTmF0aXZlSW1hZ2VIYXNoTWFwIG1fbmF0aXZlSW1hZ2VzOwotCi0gICAgSGFz aE1hcDxXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIsIHVpbnQ2NF90PiBtX2Zv bnRJZGVudGlmaWVyVG9MYXN0UmVuZGVyaW5nVXBkYXRlVmVyc2lvbk1hcDsKLSAgICB1bnNpZ25l ZCBtX251bWJlck9mRm9udHNVc2VkSW5DdXJyZW50UmVuZGVyaW5nVXBkYXRlIHsgMCB9OwotICAg IHVpbnQ2NF90IG1fY3VycmVudFJlbmRlcmluZ1VwZGF0ZVZlcnNpb24geyAxIH07CisgICAgRm9u dEhhc2hTZXQgbV9mb250SWRlbnRpZmllcnM7CiAKICAgICBSZW1vdGVSZW5kZXJpbmdCYWNrZW5k UHJveHkmIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OwogfTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMzdiNDNlOWM3YzVmMmQ3YzA5 N2YzOGQwZmQ2MGY5Y2M4YjRlNmQxOC4uNGYyMGEwNGFiODQ2YWUwMWZlMTc1ZjVkZDM0NDEzMDVm NmZmNTYzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHAKQEAgLTQxODMsMTAgKzQxODMsNiBAQCB2b2lkIFdlYlBhZ2U6OmRpZFVwZGF0ZVJlbmRlcmlu ZygpCiB2b2lkIFdlYlBhZ2U6OmZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKE9wdGlvblNldDxGaW5h bGl6ZVJlbmRlcmluZ1VwZGF0ZUZsYWdzPiBmbGFncykKIHsKICAgICBtX3BhZ2UtPmZpbmFsaXpl UmVuZGVyaW5nVXBkYXRlKGZsYWdzKTsKLSNpZiBFTkFCTEUoR1BVX1BST0NFU1MpCi0gICAgaWYg KG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5KQotICAgICAgICBtX3JlbW90ZVJlbmRlcmlu Z0JhY2tlbmRQcm94eS0+cmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5KCkuZGlkRmluYWxpemVSZW5k ZXJpbmdVcGRhdGUoKTsKLSNlbmRpZgogfQogCiB2b2lkIFdlYlBhZ2U6OnJlbGVhc2VNZW1vcnko Q3JpdGljYWwpCg== 432022 2021-06-22 23:08:10 -0700 2021-06-22 23:08:10 -0700 Patch bug-227277-20210622230810.patch text/plain 7420 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjc5MTM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRkZTk3MDI2YTZmMGI1NTk3 MDE3ZWExYmUwNjg2OGUzM2NiYjViMGIuLmU0NDdmYTA5YWM5ZmI0ZGUxMzI2OWZjMGMyNTQ5MThk ODUxZTc1ZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDYtMjIgIFNhaWQgQWJv dS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjc5MTA0 KTogW0dQVSBQcm9jZXNzXSBDYW52YXMgbGF5b3V0IHRlc3RzIGJlY2FtZSBmbGFreQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI3Mjc3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIFJlbW90ZVJl c291cmNlQ2FjaGVQcm94eTo6ZGlkRmluYWxpemVSZW5kZXJpbmdVcGRhdGUoKSBzaW5jZSBpdCAK KyAgICAgICAgd2FzIGRvaW5nIG5vdGhpbmcgYmVmb3JlIHIyNzkxMDQuIENoYW5naW5nIGl0IGNh dXNlZCBmb250cyB0byBiZSByZW1vdmVkCisgICAgICAgIGZyb20gdGhlIGNhY2hlIGFuZCByZS1j YWNoZWQgd2hpY2ggbmV2ZXIgaGFwcGVuZWQgYmVmb3JlIHIyNzkxMDQuIFRoaXMKKyAgICAgICAg Y2F1c2VkIG1vcmUgcGVuZGluZyB3YWxrLXVwIHRvIGhhcHBlbiBtb3JlIG9mdGVuIGluIFJlbW90 ZVJlbmRlcmluZ0JhY2tlbmQKKyAgICAgICAgYmVjYXVzZSB0aGUgRm9udCBpcyBtaXNzaW5nIGZy b20gdGhlIFJlbW90ZVJlc291cmNlQ2FjaGUuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL0dQVS9n cmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpS ZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OmNhY2hlRm9udCk6CisgICAgICAgIChXZWJLaXQ6OlJl bW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cmVtb3RlUmVzb3VyY2VDYWNoZVdhc0Rlc3Ryb3llZCk6 CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cmVsZWFzZU1lbW9y eSk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cHJlcGFyZUZv ck5leHRSZW5kZXJpbmdVcGRhdGUpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVS ZXNvdXJjZUNhY2hlUHJveHk6OmNsZWFyRm9udE1hcCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJL aXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6ZGlkRmluYWxpemVSZW5kZXJpbmdVcGRhdGUp OiBEZWxldGVkLgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291 cmNlQ2FjaGVQcm94eS5oOgorICAgICAgICAoKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmZpbmFs aXplUmVuZGVyaW5nVXBkYXRlKToKKwogMjAyMS0wNi0wNyAgSmVyIE5vYmxlICA8amVyLm5vYmxl QGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIFVwc3RyZWFtIEdyb3VwQWN0aXZpdGllc0Nv b3JkaW5hdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBo aWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5jcHAKaW5kZXggMjVmOGU1 NGY4Y2VmZjk5OTA5Y2RiYjRhMWU2ZTZjNTA0NzkzNmU0Ny4uMDY0ZmFmYWViNjI2MzU4MDY4ODAy N2U4ZDQyOGQwOTRjMGU0ZjYyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L0dQVS9ncmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmNw cApAQCAtMTA0LDE3ICsxMDQsMTEgQEAgdm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OmNh Y2hlTmF0aXZlSW1hZ2UoTmF0aXZlSW1hZ2UmIGltYWdlKQogCiB2b2lkIFJlbW90ZVJlc291cmNl Q2FjaGVQcm94eTo6Y2FjaGVGb250KEZvbnQmIGZvbnQpCiB7Ci0gICAgYXV0byByZXN1bHQgPSBt X2ZvbnRJZGVudGlmaWVyVG9MYXN0UmVuZGVyaW5nVXBkYXRlVmVyc2lvbk1hcC5lbnN1cmUoZm9u dC5yZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIoKSwgWyZdIHsKLSAgICAgICAgbV9yZW1vdGVS ZW5kZXJpbmdCYWNrZW5kUHJveHkuY2FjaGVGb250KG1ha2VSZWYoZm9udCkpOwotICAgICAgICAr K21fbnVtYmVyT2ZGb250c1VzZWRJbkN1cnJlbnRSZW5kZXJpbmdVcGRhdGU7Ci0gICAgICAgIHJl dHVybiBtX2N1cnJlbnRSZW5kZXJpbmdVcGRhdGVWZXJzaW9uOwotICAgIH0pOwotCi0gICAgYXV0 byYgbGFzdFZlcnNpb24gPSByZXN1bHQuaXRlcmF0b3ItPnZhbHVlOwotICAgIGlmIChsYXN0VmVy c2lvbiAhPSBtX2N1cnJlbnRSZW5kZXJpbmdVcGRhdGVWZXJzaW9uKSB7Ci0gICAgICAgIGxhc3RW ZXJzaW9uID0gbV9jdXJyZW50UmVuZGVyaW5nVXBkYXRlVmVyc2lvbjsKLSAgICAgICAgKyttX251 bWJlck9mRm9udHNVc2VkSW5DdXJyZW50UmVuZGVyaW5nVXBkYXRlOwotICAgIH0KKyAgICBpZiAo bV9mb250SWRlbnRpZmllcnMuY29udGFpbnMoZm9udC5yZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZp ZXIoKSkpCisgICAgICAgIHJldHVybjsKKworICAgIG1fZm9udElkZW50aWZpZXJzLmFkZChmb250 LnJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcigpKTsKKyAgICBtX3JlbW90ZVJlbmRlcmluZ0Jh Y2tlbmRQcm94eS5jYWNoZUZvbnQobWFrZVJlZihmb250KSk7CiB9CiAKIHZvaWQgUmVtb3RlUmVz b3VyY2VDYWNoZVByb3h5OjpyZWxlYXNlTmF0aXZlSW1hZ2UoUmVuZGVyaW5nUmVzb3VyY2VJZGVu dGlmaWVyIHJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcikKQEAgLTEyNiw0NCArMTIwLDYgQEAg dm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OnJlbGVhc2VOYXRpdmVJbWFnZShSZW5kZXJp bmdSZXNvdXJjZUlkZW50aWZpZXIgcmUKICAgICBtX3JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94 eS5yZWxlYXNlUmVtb3RlUmVzb3VyY2UocmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyKTsKIH0K IAotdm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OnByZXBhcmVGb3JOZXh0UmVuZGVyaW5n VXBkYXRlKCkKLXsKLSAgICArK21fY3VycmVudFJlbmRlcmluZ1VwZGF0ZVZlcnNpb247Ci0gICAg bV9udW1iZXJPZkZvbnRzVXNlZEluQ3VycmVudFJlbmRlcmluZ1VwZGF0ZSA9IDA7Ci19Ci0KLXZv aWQgUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5OjpjbGVhckZvbnRNYXAoKQotewotICAgIG1fZm9u dElkZW50aWZpZXJUb0xhc3RSZW5kZXJpbmdVcGRhdGVWZXJzaW9uTWFwLmNsZWFyKCk7Ci0gICAg bV9udW1iZXJPZkZvbnRzVXNlZEluQ3VycmVudFJlbmRlcmluZ1VwZGF0ZSA9IDA7Ci0gICAgbV9j dXJyZW50UmVuZGVyaW5nVXBkYXRlVmVyc2lvbiA9IDA7Ci19Ci0KLXZvaWQgUmVtb3RlUmVzb3Vy Y2VDYWNoZVByb3h5OjpkaWRGaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpCi17Ci0gICAgc3RhdGlj IGNvbnN0ZXhwciB1bnNpZ25lZCBtaW5pbXVtUmVuZGVyaW5nVXBkYXRlQ291bnRUb0tlZXBGb250 QWxpdmUgPSA0OwotICAgIHN0YXRpYyBjb25zdGV4cHIgZG91YmxlIG1pbmltdW1GcmFjdGlvbk9m VW51c2VkRm9udENvdW50VG9UcmlnZ2VyUmVtb3ZhbCA9IDAuMjU7Ci0KLSAgICB1bnNpZ25lZCB0 b3RhbEZvbnRDb3VudCA9IG1fZm9udElkZW50aWZpZXJUb0xhc3RSZW5kZXJpbmdVcGRhdGVWZXJz aW9uTWFwLnNpemUoKTsKLSAgICBSRUxFQVNFX0FTU0VSVChtX251bWJlck9mRm9udHNVc2VkSW5D dXJyZW50UmVuZGVyaW5nVXBkYXRlIDw9IHRvdGFsRm9udENvdW50KTsKLQotICAgIHVuc2lnbmVk IHVudXNlZEZvbnRDb3VudCA9IHRvdGFsRm9udENvdW50IC0gbV9udW1iZXJPZkZvbnRzVXNlZElu Q3VycmVudFJlbmRlcmluZ1VwZGF0ZTsKLSAgICBpZiAodW51c2VkRm9udENvdW50IDw9IG1pbmlt dW1GcmFjdGlvbk9mVW51c2VkRm9udENvdW50VG9UcmlnZ2VyUmVtb3ZhbCAqIHRvdGFsRm9udENv dW50KSB7Ci0gICAgICAgIHByZXBhcmVGb3JOZXh0UmVuZGVyaW5nVXBkYXRlKCk7Ci0gICAgICAg IHJldHVybjsKLSAgICB9Ci0KLSAgICBtX2ZvbnRJZGVudGlmaWVyVG9MYXN0UmVuZGVyaW5nVXBk YXRlVmVyc2lvbk1hcC5yZW1vdmVJZihbJl0gKGNvbnN0IGF1dG8mIGl0ZW0pIHsKLSAgICAgICAg aWYgKG1fY3VycmVudFJlbmRlcmluZ1VwZGF0ZVZlcnNpb24gLSBpdGVtLnZhbHVlIDwgbWluaW11 bVJlbmRlcmluZ1VwZGF0ZUNvdW50VG9LZWVwRm9udEFsaXZlKQotICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwotCi0gICAgICAgIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LnJlbGVhc2VS ZW1vdGVSZXNvdXJjZShpdGVtLmtleSk7Ci0gICAgICAgIHJldHVybiB0cnVlOwotICAgIH0pOwot ICAgIAotICAgIHByZXBhcmVGb3JOZXh0UmVuZGVyaW5nVXBkYXRlKCk7Ci19Ci0KIHZvaWQgUmVt b3RlUmVzb3VyY2VDYWNoZVByb3h5OjpyZW1vdGVSZXNvdXJjZUNhY2hlV2FzRGVzdHJveWVkKCkK IHsKICAgICBmb3IgKGF1dG8mIGltYWdlQnVmZmVyIDogbV9pbWFnZUJ1ZmZlcnMudmFsdWVzKCkp IHsKQEAgLTE3MywxMyArMTI5LDEzIEBAIHZvaWQgUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5Ojpy ZW1vdGVSZXNvdXJjZUNhY2hlV2FzRGVzdHJveWVkKCkKICAgICAgICAgaW1hZ2VCdWZmZXItPmNs ZWFyQmFja2VuZCgpOwogICAgIH0KICAgICBtX25hdGl2ZUltYWdlcy5jbGVhcigpOwotICAgIGNs ZWFyRm9udE1hcCgpOworICAgIG1fZm9udElkZW50aWZpZXJzLmNsZWFyKCk7CiB9CiAKIHZvaWQg UmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5OjpyZWxlYXNlTWVtb3J5KCkKIHsKICAgICBtX3JlbW90 ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5kZWxldGVBbGxGb250cygpOwotICAgIGNsZWFyRm9udE1h cCgpOworICAgIG1fZm9udElkZW50aWZpZXJzLmNsZWFyKCk7CiB9CiAKIH0gLy8gbmFtZXNwYWNl IFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGlj cy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9H UFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmgKaW5kZXggZDYwNGFmYWFhYTBh ZjA1NWE5ZWQxMmZlYzIwZjFlYmMzODcyNjQxZS4uMWIwZTkyNWZhOWY5ZGJjNTNiYWI4NjVkYjE5 MmQxYWQxMzdkMzFmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9n cmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5oCkBAIC01Miw3 ICs1Miw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGNhY2hlTmF0aXZlSW1hZ2UoV2ViQ29yZTo6TmF0 aXZlSW1hZ2UmKTsKIAogICAgIHZvaWQgY2FjaGVGb250KFdlYkNvcmU6OkZvbnQmKTsKLSAgICB2 b2lkIGRpZEZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKCk7CiAKICAgICB2b2lkIHJlbW90ZVJlc291 cmNlQ2FjaGVXYXNEZXN0cm95ZWQoKTsKICAgICB2b2lkIHJlbGVhc2VNZW1vcnkoKTsKQEAgLTYw LDE3ICs1OSwxMyBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIHVzaW5nIEltYWdlQnVmZmVySGFz aE1hcCA9IEhhc2hNYXA8V2ViQ29yZTo6UmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyLCBXZWFr UHRyPFdlYkNvcmU6OkltYWdlQnVmZmVyPj47CiAgICAgdXNpbmcgTmF0aXZlSW1hZ2VIYXNoTWFw ID0gSGFzaE1hcDxXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIsIFdlYWtQdHI8 V2ViQ29yZTo6TmF0aXZlSW1hZ2U+PjsKLSAgICAKKyAgICB1c2luZyBGb250SGFzaFNldCA9IEhh c2hTZXQ8V2ViQ29yZTo6UmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyPjsKKwogICAgIHZvaWQg cmVsZWFzZU5hdGl2ZUltYWdlKFdlYkNvcmU6OlJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcikg b3ZlcnJpZGU7Ci0gICAgdm9pZCBwcmVwYXJlRm9yTmV4dFJlbmRlcmluZ1VwZGF0ZSgpOwotICAg IHZvaWQgY2xlYXJGb250TWFwKCk7CiAKICAgICBJbWFnZUJ1ZmZlckhhc2hNYXAgbV9pbWFnZUJ1 ZmZlcnM7CiAgICAgTmF0aXZlSW1hZ2VIYXNoTWFwIG1fbmF0aXZlSW1hZ2VzOwotCi0gICAgSGFz aE1hcDxXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIsIHVpbnQ2NF90PiBtX2Zv bnRJZGVudGlmaWVyVG9MYXN0UmVuZGVyaW5nVXBkYXRlVmVyc2lvbk1hcDsKLSAgICB1bnNpZ25l ZCBtX251bWJlck9mRm9udHNVc2VkSW5DdXJyZW50UmVuZGVyaW5nVXBkYXRlIHsgMCB9OwotICAg IHVpbnQ2NF90IG1fY3VycmVudFJlbmRlcmluZ1VwZGF0ZVZlcnNpb24geyAxIH07CisgICAgRm9u dEhhc2hTZXQgbV9mb250SWRlbnRpZmllcnM7CiAKICAgICBSZW1vdGVSZW5kZXJpbmdCYWNrZW5k UHJveHkmIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5OwogfTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMzdiNDNlOWM3YzVmMmQ3YzA5 N2YzOGQwZmQ2MGY5Y2M4YjRlNmQxOC4uNGYyMGEwNGFiODQ2YWUwMWZlMTc1ZjVkZDM0NDEzMDVm NmZmNTYzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHAKQEAgLTQxODMsMTAgKzQxODMsNiBAQCB2b2lkIFdlYlBhZ2U6OmRpZFVwZGF0ZVJlbmRlcmlu ZygpCiB2b2lkIFdlYlBhZ2U6OmZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKE9wdGlvblNldDxGaW5h bGl6ZVJlbmRlcmluZ1VwZGF0ZUZsYWdzPiBmbGFncykKIHsKICAgICBtX3BhZ2UtPmZpbmFsaXpl UmVuZGVyaW5nVXBkYXRlKGZsYWdzKTsKLSNpZiBFTkFCTEUoR1BVX1BST0NFU1MpCi0gICAgaWYg KG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5KQotICAgICAgICBtX3JlbW90ZVJlbmRlcmlu Z0JhY2tlbmRQcm94eS0+cmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5KCkuZGlkRmluYWxpemVSZW5k ZXJpbmdVcGRhdGUoKTsKLSNlbmRpZgogfQogCiB2b2lkIFdlYlBhZ2U6OnJlbGVhc2VNZW1vcnko Q3JpdGljYWwpCg==