154843 2016-02-29 17:43:24 -0800 Remove the experimental feature of antialiased font dilation 2016-03-01 20:50:13 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser commit-queue mmaxfield ryanhaddad simon.fraser zalan oldest_to_newest 1169328 0 simon.fraser 2016-02-29 17:43:24 -0800 Remove the experimental feature of antialiased font dilation 1169329 1 272534 simon.fraser 2016-02-29 17:44:33 -0800 Created attachment 272534 Patch 1169331 2 272534 zalan 2016-02-29 18:02:54 -0800 Comment on attachment 272534 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=272534&action=review > Source/WebCore/platform/graphics/GraphicsContext.h:-145 > - AntialiasedFontDilationEnabledChange = 1 << 19, 18 -> 20 1169476 3 ryanhaddad 2016-03-01 10:09:55 -0800 These two tests have been failing since this change was committed in r197382 displaylists/extent-includes-shadow.html displaylists/extent-includes-transforms.html <https://build.webkit.org/results/Apple%20Yosemite%20Release%20WK1%20(Tests)/r197400%20(12499)/results.html> 1169709 4 simon.fraser 2016-03-01 20:50:13 -0800 http://trac.webkit.org/changeset/197382 272534 2016-02-29 17:44:33 -0800 2016-02-29 18:02:54 -0800 Patch bug-154843-20160229174418.patch text/plain 31403 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTk3MzUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2QwZjEwOGI4NjRjMzZh ZGI3YTQ3NGZlNmJiY2I0ODA3YTgyNTc4NS4uNzc5MzFiNmJlMDQzOGIwZjgxYTc3NTkyZTI2NzA1 OWZhMWRmNzhhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDE2LTAyLTI5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSB0aGUg ZXhwZXJpbWVudGFsIGZlYXR1cmUgb2YgYW50aWFsaWFzZWQgZm9udCBkaWxhdGlvbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0ODQzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAorICAgICAgICBSZW1vdmUg dGhlICJhbnRpYWxpYXNlZCBmb250IGRpbGF0aW9uIiBjb2RlIHBhdGgsIGFuZCByZWxhdGVkIHBy ZWZzLgorCisgICAgICAgICogcGFnZS9TZXR0aW5ncy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT ZXR0aW5nczo6U2V0dGluZ3MpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6 OnNldEFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZCk6IERlbGV0ZWQuCisgICAgICAgICog cGFnZS9TZXR0aW5ncy5oOgorICAgICAgICAoV2ViQ29yZTo6U2V0dGluZ3M6OmFudGlhbGlhc2Vk Rm9udERpbGF0aW9uRW5hYmxlZCk6IERlbGV0ZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhp Y3MvRm9udENhc2NhZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhc2NhZGU6OnNldEFu dGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3Jl OjpGb250Q2FzY2FkZTo6YW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFibGVkKTogRGVsZXRlZC4K KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5oOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpH cmFwaGljc0NvbnRleHRTdGF0ZUNoYW5nZTo6Y2hhbmdlc0Zyb21TdGF0ZSk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHRTdGF0ZUNoYW5nZTo6YWNjdW11bGF0ZSk6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHRTdGF0ZUNoYW5nZTo6 YXBwbHkpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0U3RhdGVD aGFuZ2U6OmR1bXApOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0 OjpzZXRBbnRpYWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQpOiBEZWxldGVkLgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oOgorICAgICAgICAoV2ViQ29yZTo6 R3JhcGhpY3NDb250ZXh0U3RhdGU6OkdyYXBoaWNzQ29udGV4dFN0YXRlKTogRGVsZXRlZC4KKyAg ICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6YW50aWFsaWFzZWRGb250RGlsYXRpb25F bmFibGVkKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9jb2NvYS9Q bGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbToKKyAgICAgICAgKFBsYXRmb3JtQ0FMYXllcjo6ZHJhd0xh eWVyQ29udGVudHMpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NvY29h L0ZvbnRDYXNjYWRlQ29jb2EubW06CisgICAgICAgIChXZWJDb3JlOjpkaWxhdGlvblNpemVGb3JU ZXh0Q29sb3IpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhc2NhZGU6OmRyYXdH bHlwaHMpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0 cy9EaXNwbGF5TGlzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5TGlzdDo6RGlzcGxh eUxpc3Q6OnNob3VsZER1bXBGb3JGbGFncyk6IERlbGV0ZWQuCisKIDIwMTYtMDItMjkgIFlvdWVu biBGYWJsZXQgIDx5b3Vlbm4uZmFibGV0QGNyZi5jYW5vbi5mcj4KIAogICAgICAgICBSZWZhY3Rv ciBGZXRjaEJvZHkgY29uc3RydWN0b3JzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKaW5kZXggMDQ5MGRjNWQ1ZTY1 MDRlMDcwN2E1NmMxOGQyNTEyMzczNjBiYmZmYi4uYzYwYTU1Nzg3NGEwOGRiNTZjZTllZmRjNzlj YmY0MzZhNTQwOTAwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE2LTAy LTI5ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJl bW92ZSB0aGUgZXhwZXJpbWVudGFsIGZlYXR1cmUgb2YgYW50aWFsaWFzZWQgZm9udCBkaWxhdGlv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0ODQz CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3Zl IHRoZSAiYW50aWFsaWFzZWQgZm9udCBkaWxhdGlvbiIgY29kZSBwYXRoLCBhbmQgcmVsYXRlZCBw cmVmcy4KKworICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmg6Cisg ICAgICAgICogV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbToKKyAgICAgICAgKCtbV2ViUHJlZmVy ZW5jZXMgaW5pdGlhbGl6ZV0pOiBEZWxldGVkLgorICAgICAgICAoLVtXZWJQcmVmZXJlbmNlcyBz ZXRBbnRpYWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQ6XSk6IERlbGV0ZWQuCisgICAgICAgICgt W1dlYlByZWZlcmVuY2VzIGFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZF0pOiBEZWxldGVk LgorICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmg6CisgICAgICAgICog V2ViVmlldy9XZWJWaWV3Lm1tOgorICAgICAgICAoLVtXZWJWaWV3IF9wcmVmZXJlbmNlc0NoYW5n ZWQ6XSk6IERlbGV0ZWQuCisKIDIwMTYtMDItMjYgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxl LmNvbT4KIAogICAgICAgICBCdWlsZCBmaXggZm9yIHdoZW4gV0tfT1ZFUlJJREVfRlJBTUVXT1JL U19ESVIgY29udGFpbnMgc3BhY2VzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGNmM2RhY2I0MDRjNmRhOGQ2OTc3 MWZmOGRmN2ZkZTBjZTM1OTk0YzkuLjZkMjk3ODA5MTI3NDIyODAyZTYxNGM1M2MxZDNhNTk2Zjhh NmE2NTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxNi0wMi0yOSAgU2ltb24gRnJh c2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgdGhlIGV4cGVy aW1lbnRhbCBmZWF0dXJlIG9mIGFudGlhbGlhc2VkIGZvbnQgZGlsYXRpb24KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NDg0MworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB0aGUgImFudGlhbGlh c2VkIGZvbnQgZGlsYXRpb24iIGNvZGUgcGF0aCwgYW5kIHJlbGF0ZWQgcHJlZnMuCisKKyAgICAg ICAgKiBTaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZpbml0aW9ucy5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcDoKKyAgICAgICAgKFdLUHJlZmVyZW5jZXNTZXRB bnRpYWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQpOgorICAgICAgICAoV0tQcmVmZXJlbmNlc0dl dEFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9DL1dLUHJlZmVyZW5jZXNSZWZQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1ByZWZlcmVuY2VzLm1tOgorICAgICAgICAoLVtXS1ByZWZlcmVuY2VzIF9hbnRpYWxp YXNlZEZvbnREaWxhdGlvbkVuYWJsZWRdKTogRGVsZXRlZC4KKyAgICAgICAgKC1bV0tQcmVmZXJl bmNlcyBfc2V0QW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFibGVkOl0pOiBEZWxldGVkLgorICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcmVmZXJlbmNlc1ByaXZhdGUuaDoKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2U6OnVwZGF0ZVByZWZlcmVuY2VzKTogRGVsZXRlZC4KKwogMjAxNi0wMi0yOSAgS29uc3Rh bnRpbiBUb2thcmV2ICA8YW5udWxlbkB5YW5kZXgucnU+CiAKICAgICAgICAgRml4ZWQgY29tcGls YXRpb24gd2l0aCAhRU5BQkxFKERBVEFCQVNFX1BST0NFU1MpLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdz LmNwcAppbmRleCA2NzYyNzg2OTVhZmJiNjhmM2QzYjM2MDU1MGU1NjRlMzk5YTNhM2Y4Li42OTU5 OWJjYWM0ZmJlMjA3ZDVmMmU0NDYxZTU3NDUzNmI5NDRjNDk3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRp bmdzLmNwcApAQCAtMTk5LDcgKzE5OSw2IEBAIFNldHRpbmdzOjpTZXR0aW5ncyhQYWdlKiBwYWdl KQogICAgICwgbV9uZWVkc0Fkb2JlRnJhbWVSZWxvYWRpbmdRdWlyayhmYWxzZSkKICAgICAsIG1f dXNlc1BhZ2VDYWNoZShmYWxzZSkKICAgICAsIG1fZm9udFJlbmRlcmluZ01vZGUoMCkKLSAgICAs IG1fYW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFibGVkKGZhbHNlKQogICAgICwgbV9zaG93VGls ZWRTY3JvbGxpbmdJbmRpY2F0b3IoZmFsc2UpCiAgICAgLCBtX2JhY2tncm91bmRTaG91bGRFeHRl bmRCZXlvbmRQYWdlKGZhbHNlKQogICAgICwgbV9kbnNQcmVmZXRjaGluZ0VuYWJsZWQoZmFsc2Up CkBAIC0zNjAsMTIgKzM1OSw2IEBAIHZvaWQgU2V0dGluZ3M6OnNldFRleHRBdXRvc2l6aW5nRm9u dFNjYWxlRmFjdG9yKGZsb2F0IGZvbnRTY2FsZUZhY3RvcikKIAogI2VuZGlmCiAKLXZvaWQgU2V0 dGluZ3M6OnNldEFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZChib29sIGVuYWJsZWQpCi17 Ci0gICAgLy8gRklYTUU6IEl0J3Mgd3JvbmcgZm9yIGEgc2V0dGluZyB0byB0b2dnbGUgYSBnbG9i YWwsIGJ1dCB0aGlzIGNvZGUgaXMgdGVtcG9yYXJ5LgotICAgIEZvbnRDYXNjYWRlOjpzZXRBbnRp YWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQoZW5hYmxlZCk7Ci19Ci0KIHZvaWQgU2V0dGluZ3M6 OnNldE1lZGlhVHlwZU92ZXJyaWRlKGNvbnN0IFN0cmluZyYgbWVkaWFUeXBlT3ZlcnJpZGUpCiB7 CiAgICAgaWYgKG1fbWVkaWFUeXBlT3ZlcnJpZGUgPT0gbWVkaWFUeXBlT3ZlcnJpZGUpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmggYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL1NldHRpbmdzLmgKaW5kZXggNjU1ZTVmNjA1ODE0NmNkZWFlZjRlMjc1NzEyMTkzMDFiMmUw MTc2OS4uZjEyZWYyNGUyMDcxYTE0MTFiYWNjN2RhMTdjNjQ3NTI2NzE1M2IwYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvU2V0dGluZ3MuaApAQCAtMTEzLDkgKzExMyw2IEBAIHB1YmxpYzoKICAgICBjb25zdCBJbnRT aXplJiB0ZXh0QXV0b3NpemluZ1dpbmRvd1NpemVPdmVycmlkZSgpIGNvbnN0IHsgcmV0dXJuIG1f dGV4dEF1dG9zaXppbmdXaW5kb3dTaXplT3ZlcnJpZGU7IH0KICNlbmRpZgogCi0gICAgV0VCQ09S RV9FWFBPUlQgdm9pZCBzZXRBbnRpYWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQoYm9vbCk7Ci0g ICAgYm9vbCBhbnRpYWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQoKSBjb25zdCB7IHJldHVybiBt X2FudGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZDsgfQotCiAgICAgLy8gT25seSBzZXQgYnkg TGF5b3V0IFRlc3RzLgogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0TWVkaWFUeXBlT3ZlcnJp ZGUoY29uc3QgU3RyaW5nJik7CiAgICAgY29uc3QgU3RyaW5nJiBtZWRpYVR5cGVPdmVycmlkZSgp IGNvbnN0IHsgcmV0dXJuIG1fbWVkaWFUeXBlT3ZlcnJpZGU7IH0KQEAgLTMyMiw3ICszMTksNiBA QCBwcml2YXRlOgogICAgIGJvb2wgbV9uZWVkc0Fkb2JlRnJhbWVSZWxvYWRpbmdRdWlyayA6IDE7 CiAgICAgYm9vbCBtX3VzZXNQYWdlQ2FjaGUgOiAxOwogICAgIHVuc2lnbmVkIG1fZm9udFJlbmRl cmluZ01vZGUgOiAxOwotICAgIGJvb2wgbV9hbnRpYWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQg OiAxOwogICAgIGJvb2wgbV9zaG93VGlsZWRTY3JvbGxpbmdJbmRpY2F0b3IgOiAxOwogICAgIGJv b2wgbV9iYWNrZ3JvdW5kU2hvdWxkRXh0ZW5kQmV5b25kUGFnZSA6IDE7CiAgICAgYm9vbCBtX2Ru c1ByZWZldGNoaW5nRW5hYmxlZCA6IDE7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9Gb250Q2FzY2FkZS5jcHAKaW5kZXggMWY1MWRlMGExNTcxOTAwNDMwZjdjZDMyYWNj MmZlZjMwNzUyOTBmZi4uMzNkYzRjY2MyOGFjYTA4ZTI0M2JmN2I3MmE1NDVjNjBhZDE3MmIzOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNw cApAQCAtNTY3LDE4ICs1NjcsNiBAQCBib29sIEZvbnRDYXNjYWRlOjpzaG91bGRVc2VTbW9vdGhp bmcoKQogICAgIHJldHVybiBzaG91bGRVc2VGb250U21vb3RoaW5nOwogfQogCi1zdGF0aWMgYm9v bCBhbnRpYWxpYXNlZEZvbnREaWxhdGlvbklzRW5hYmxlZCA9IGZhbHNlOwotCi12b2lkIEZvbnRD YXNjYWRlOjpzZXRBbnRpYWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQoYm9vbCBlbmFibGVkKQot ewotICAgIGFudGlhbGlhc2VkRm9udERpbGF0aW9uSXNFbmFibGVkID0gZW5hYmxlZDsKLX0KLQot Ym9vbCBGb250Q2FzY2FkZTo6YW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFibGVkKCkKLXsKLSAg ICByZXR1cm4gYW50aWFsaWFzZWRGb250RGlsYXRpb25Jc0VuYWJsZWQ7Ci19Ci0KIHZvaWQgRm9u dENhc2NhZGU6OnNldENvZGVQYXRoKENvZGVQYXRoIHApCiB7CiAgICAgc19jb2RlUGF0aCA9IHA7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2Fk ZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuaAppbmRl eCA1MTFkZjBhMWI2OTVjNzZlODAxNGVhZjVlNWRkMzQyMTU0YzFhZTUwLi5kZWMxZmM1MGY0NzQz YzQ1YTBkOWEyMzE3NGQ5NDk5NDMxNTc4M2MxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9Gb250Q2FzY2FkZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmgKQEAgLTIwNCw5ICsyMDQsNiBAQCBwdWJsaWM6CiAg ICAgc3RhdGljIGJvb2wgbGVhZGluZ0V4cGFuc2lvbk9wcG9ydHVuaXR5KGNvbnN0IFN0cmluZ1Zp ZXcmLCBUZXh0RGlyZWN0aW9uKTsKICAgICBzdGF0aWMgYm9vbCB0cmFpbGluZ0V4cGFuc2lvbk9w cG9ydHVuaXR5KGNvbnN0IFN0cmluZ1ZpZXcmLCBUZXh0RGlyZWN0aW9uKTsKIAotICAgIFdFQkNP UkVfRVhQT1JUIHN0YXRpYyB2b2lkIHNldEFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZChi b29sKTsKLSAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgYm9vbCBhbnRpYWxpYXNlZEZvbnREaWxh dGlvbkVuYWJsZWQoKTsKLQogICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyB2b2lkIHNldFNob3Vs ZFVzZVNtb290aGluZyhib29sKTsKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgYm9vbCBzaG91 bGRVc2VTbW9vdGhpbmcoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvR3JhcGhpY3NDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAKaW5kZXggOTY1NTAzYzU0MzU4ZTI1YWI5NjJhYjdh YWMzYmIyZTA1OGRiY2RmOS4uZmJlYThkNzUzZGYzNDVkNDFhN2I2YmQ2ZGJiYzI0OWM4MDhlYjEy MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvR3JhcGhpY3ND b250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGlj c0NvbnRleHQuY3BwCkBAIC0xMTAsNyArMTEwLDYgQEAgR3JhcGhpY3NDb250ZXh0U3RhdGU6OlN0 YXRlQ2hhbmdlRmxhZ3MgR3JhcGhpY3NDb250ZXh0U3RhdGVDaGFuZ2U6OmNoYW5nZXNGcm9tU3QK IAogICAgIENIRUNLX0ZPUl9DSEFOR0VEX1BST1BFUlRZKFNob3VsZEFudGlhbGlhc0NoYW5nZSwg c2hvdWxkQW50aWFsaWFzKTsKICAgICBDSEVDS19GT1JfQ0hBTkdFRF9QUk9QRVJUWShTaG91bGRT bW9vdGhGb250c0NoYW5nZSwgc2hvdWxkU21vb3RoRm9udHMpOwotICAgIENIRUNLX0ZPUl9DSEFO R0VEX1BST1BFUlRZKEFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZENoYW5nZSwgYW50aWFs aWFzZWRGb250RGlsYXRpb25FbmFibGVkKTsKICAgICBDSEVDS19GT1JfQ0hBTkdFRF9QUk9QRVJU WShTaG91bGRTdWJwaXhlbFF1YW50aXplRm9udHNDaGFuZ2UsIHNob3VsZFN1YnBpeGVsUXVhbnRp emVGb250cyk7CiAgICAgQ0hFQ0tfRk9SX0NIQU5HRURfUFJPUEVSVFkoU2hhZG93c0lnbm9yZVRy YW5zZm9ybXNDaGFuZ2UsIHNoYWRvd3NJZ25vcmVUcmFuc2Zvcm1zKTsKICAgICBDSEVDS19GT1Jf Q0hBTkdFRF9QUk9QRVJUWShEcmF3THVtaW5hbmNlTWFza0NoYW5nZSwgZHJhd0x1bWluYW5jZU1h c2spOwpAQCAtMTczLDkgKzE3Miw2IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0U3RhdGVDaGFuZ2U6 OmFjY3VtdWxhdGUoY29uc3QgR3JhcGhpY3NDb250ZXh0U3RhdGUmIHN0YXRlLCBHCiAgICAgaWYg KGZsYWdzICYgR3JhcGhpY3NDb250ZXh0U3RhdGU6OlNob3VsZFNtb290aEZvbnRzQ2hhbmdlKQog ICAgICAgICBtX3N0YXRlLnNob3VsZFNtb290aEZvbnRzID0gc3RhdGUuc2hvdWxkU21vb3RoRm9u dHM7CiAKLSAgICBpZiAoZmxhZ3MgJiBHcmFwaGljc0NvbnRleHRTdGF0ZTo6QW50aWFsaWFzZWRG b250RGlsYXRpb25FbmFibGVkQ2hhbmdlKQotICAgICAgICBtX3N0YXRlLmFudGlhbGlhc2VkRm9u dERpbGF0aW9uRW5hYmxlZCA9IHN0YXRlLmFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZDsK LQogICAgIGlmIChmbGFncyAmIEdyYXBoaWNzQ29udGV4dFN0YXRlOjpTaG91bGRTdWJwaXhlbFF1 YW50aXplRm9udHNDaGFuZ2UpCiAgICAgICAgIG1fc3RhdGUuc2hvdWxkU3VicGl4ZWxRdWFudGl6 ZUZvbnRzID0gc3RhdGUuc2hvdWxkU3VicGl4ZWxRdWFudGl6ZUZvbnRzOwogCkBAIC0yNDQsOSAr MjQwLDYgQEAgdm9pZCBHcmFwaGljc0NvbnRleHRTdGF0ZUNoYW5nZTo6YXBwbHkoR3JhcGhpY3ND b250ZXh0JiBjb250ZXh0KSBjb25zdAogICAgIGlmIChtX2NoYW5nZUZsYWdzICYgR3JhcGhpY3ND b250ZXh0U3RhdGU6OlNob3VsZFNtb290aEZvbnRzQ2hhbmdlKQogICAgICAgICBjb250ZXh0LnNl dFNob3VsZFNtb290aEZvbnRzKG1fc3RhdGUuc2hvdWxkU21vb3RoRm9udHMpOwogCi0gICAgaWYg KG1fY2hhbmdlRmxhZ3MgJiBHcmFwaGljc0NvbnRleHRTdGF0ZTo6QW50aWFsaWFzZWRGb250RGls YXRpb25FbmFibGVkQ2hhbmdlKQotICAgICAgICBjb250ZXh0LnNldEFudGlhbGlhc2VkRm9udERp bGF0aW9uRW5hYmxlZChtX3N0YXRlLmFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZCk7Ci0K ICAgICBpZiAobV9jaGFuZ2VGbGFncyAmIEdyYXBoaWNzQ29udGV4dFN0YXRlOjpTaG91bGRTdWJw aXhlbFF1YW50aXplRm9udHNDaGFuZ2UpCiAgICAgICAgIGNvbnRleHQuc2V0U2hvdWxkU3VicGl4 ZWxRdWFudGl6ZUZvbnRzKG1fc3RhdGUuc2hvdWxkU3VicGl4ZWxRdWFudGl6ZUZvbnRzKTsKIApA QCAtMzE3LDkgKzMxMCw2IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0U3RhdGVDaGFuZ2U6OmR1bXAo VGV4dFN0cmVhbSYgdHMpIGNvbnN0CiAgICAgaWYgKG1fY2hhbmdlRmxhZ3MgJiBHcmFwaGljc0Nv bnRleHRTdGF0ZTo6U2hvdWxkU21vb3RoRm9udHNDaGFuZ2UpCiAgICAgICAgIHRzLmR1bXBQcm9w ZXJ0eSgic2hvdWxkLXNtb290aC1mb250cyIsIG1fc3RhdGUuc2hvdWxkU21vb3RoRm9udHMpOwog Ci0gICAgaWYgKG1fY2hhbmdlRmxhZ3MgJiBHcmFwaGljc0NvbnRleHRTdGF0ZTo6QW50aWFsaWFz ZWRGb250RGlsYXRpb25FbmFibGVkQ2hhbmdlKQotICAgICAgICB0cy5kdW1wUHJvcGVydHkoImFu dGlhbGlhc2VkLWZvbnQtZGlsYXRpb24tZW5hYmxlZCIsIG1fc3RhdGUuYW50aWFsaWFzZWRGb250 RGlsYXRpb25FbmFibGVkKTsKLQogICAgIGlmIChtX2NoYW5nZUZsYWdzICYgR3JhcGhpY3NDb250 ZXh0U3RhdGU6OlNob3VsZFN1YnBpeGVsUXVhbnRpemVGb250c0NoYW5nZSkKICAgICAgICAgdHMu ZHVtcFByb3BlcnR5KCJzaG91bGQtc3VicGl4ZWwtcXVhbnRpemUtZm9udHMiLCBtX3N0YXRlLnNo b3VsZFN1YnBpeGVsUXVhbnRpemVGb250cyk7CiAKQEAgLTU4NiwxMyArNTc2LDYgQEAgdm9pZCBH cmFwaGljc0NvbnRleHQ6OnNldEltYWdlSW50ZXJwb2xhdGlvblF1YWxpdHkoSW50ZXJwb2xhdGlv blF1YWxpdHkgaW1hZ2VJbnQKICAgICBzZXRQbGF0Zm9ybUltYWdlSW50ZXJwb2xhdGlvblF1YWxp dHkoaW1hZ2VJbnRlcnBvbGF0aW9uUXVhbGl0eSk7CiB9CiAKLXZvaWQgR3JhcGhpY3NDb250ZXh0 OjpzZXRBbnRpYWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQoYm9vbCBhbnRpYWxpYXNlZEZvbnRE aWxhdGlvbkVuYWJsZWQpCi17Ci0gICAgbV9zdGF0ZS5hbnRpYWxpYXNlZEZvbnREaWxhdGlvbkVu YWJsZWQgPSBhbnRpYWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQ7Ci0gICAgaWYgKGlzUmVjb3Jk aW5nKCkpCi0gICAgICAgIG1fZGlzcGxheUxpc3RSZWNvcmRlci0+dXBkYXRlU3RhdGUobV9zdGF0 ZSwgR3JhcGhpY3NDb250ZXh0U3RhdGU6OkFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZENo YW5nZSk7Ci19Ci0KIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpzZXRTdHJva2VQYXR0ZXJuKFJlZjxQ YXR0ZXJuPiYmIHBhdHRlcm4pCiB7CiAgICAgbV9zdGF0ZS5zdHJva2VHcmFkaWVudCA9IG51bGxw dHI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGlj c0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29u dGV4dC5oCmluZGV4IDA3ZjU1MjA0YWUzZmViYmM3NThkMGM5ZGVkY2YwMzc3MjJkMmU1NTcuLjAy OTQ4NjM1NmIxZWMxNjliYTQwZjQzOTcxYTc4MTdhNjg4MzE0MzEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5oCkBAIC0xMTAsNyAr MTEwLDYgQEAgc3RydWN0IEdyYXBoaWNzQ29udGV4dFN0YXRlIHsKICAgICBHcmFwaGljc0NvbnRl eHRTdGF0ZSgpCiAgICAgICAgIDogc2hvdWxkQW50aWFsaWFzKHRydWUpCiAgICAgICAgICwgc2hv dWxkU21vb3RoRm9udHModHJ1ZSkKLSAgICAgICAgLCBhbnRpYWxpYXNlZEZvbnREaWxhdGlvbkVu YWJsZWQodHJ1ZSkKICAgICAgICAgLCBzaG91bGRTdWJwaXhlbFF1YW50aXplRm9udHModHJ1ZSkK ICAgICAgICAgLCBzaGFkb3dzSWdub3JlVHJhbnNmb3JtcyhmYWxzZSkKICNpZiBVU0UoQ0cpCkBA IC0xNDIsNyArMTQxLDYgQEAgc3RydWN0IEdyYXBoaWNzQ29udGV4dFN0YXRlIHsKICAgICAgICAg VGV4dERyYXdpbmdNb2RlQ2hhbmdlICAgICAgICAgICAgICAgICAgID0gMSA8PCAxNiwKICAgICAg ICAgU2hvdWxkQW50aWFsaWFzQ2hhbmdlICAgICAgICAgICAgICAgICAgID0gMSA8PCAxNywKICAg ICAgICAgU2hvdWxkU21vb3RoRm9udHNDaGFuZ2UgICAgICAgICAgICAgICAgID0gMSA8PCAxOCwK LSAgICAgICAgQW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFibGVkQ2hhbmdlICAgID0gMSA8PCAx OSwKICAgICAgICAgU2hvdWxkU3VicGl4ZWxRdWFudGl6ZUZvbnRzQ2hhbmdlICAgICAgID0gMSA8 PCAyMCwKICAgICAgICAgRHJhd0x1bWluYW5jZU1hc2tDaGFuZ2UgICAgICAgICAgICAgICAgID0g MSA8PCAyMSwKICAgICAgICAgSW1hZ2VJbnRlcnBvbGF0aW9uUXVhbGl0eUNoYW5nZSAgICAgICAg ID0gMSA8PCAyMiwKQEAgLTE3Niw3ICsxNzQsNiBAQCBzdHJ1Y3QgR3JhcGhpY3NDb250ZXh0U3Rh dGUgewogCiAgICAgYm9vbCBzaG91bGRBbnRpYWxpYXMgOiAxOwogICAgIGJvb2wgc2hvdWxkU21v b3RoRm9udHMgOiAxOwotICAgIGJvb2wgYW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFibGVkIDog MTsKICAgICBib29sIHNob3VsZFN1YnBpeGVsUXVhbnRpemVGb250cyA6IDE7CiAgICAgYm9vbCBz aGFkb3dzSWdub3JlVHJhbnNmb3JtcyA6IDE7CiAjaWYgVVNFKENHKQpAQCAtMjk0LDkgKzI5MSw2 IEBAIHB1YmxpYzoKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFNob3VsZEFudGlhbGlhcyhi b29sKTsKICAgICBib29sIHNob3VsZEFudGlhbGlhcygpIGNvbnN0IHsgcmV0dXJuIG1fc3RhdGUu c2hvdWxkQW50aWFsaWFzOyB9CiAKLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldEFudGlhbGlh c2VkRm9udERpbGF0aW9uRW5hYmxlZChib29sKTsKLSAgICBib29sIGFudGlhbGlhc2VkRm9udERp bGF0aW9uRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fc3RhdGUuYW50aWFsaWFzZWRGb250RGls YXRpb25FbmFibGVkOyB9Ci0KICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFNob3VsZFNtb290 aEZvbnRzKGJvb2wpOwogICAgIGJvb2wgc2hvdWxkU21vb3RoRm9udHMoKSBjb25zdCB7IHJldHVy biBtX3N0YXRlLnNob3VsZFNtb290aEZvbnRzOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL2NvY29hL1BsYXRmb3JtQ0FMYXllckNvY29hLm1tIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvY29jb2EvUGxhdGZvcm1DQUxheWVy Q29jb2EubW0KaW5kZXggMjExMGI1MzU3NDA5ODRjZWRlZjgxMTJkMzcwOTczNzZjOThiNWQ5Mi4u MzVmNTU1NGY4ZWQxOTk1NDJkNDcxNmVjNzUwZjkwNTJkOGI4YjlhYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvY29jb2EvUGxhdGZvcm1DQUxheWVyQ29j b2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvY29jb2EvUGxh dGZvcm1DQUxheWVyQ29jb2EubW0KQEAgLTEwNTksNyArMTA1OSw2IEBAIHZvaWQgUGxhdGZvcm1D QUxheWVyOjpkcmF3TGF5ZXJDb250ZW50cyhDR0NvbnRleHRSZWYgY29udGV4dCwgV2ViQ29yZTo6 UGxhdGZvcm1DCiAgICAgaWYgKCFsYXllckNvbnRlbnRzLT5wbGF0Zm9ybUNBTGF5ZXJDb250ZW50 c09wYXF1ZSgpKSB7CiAgICAgICAgIC8vIFR1cm4gb2ZmIGZvbnQgc21vb3RoaW5nIHRvIGltcHJv dmUgdGhlIGFwcGVhcmFuY2Ugb2YgdGV4dCByZW5kZXJlZCBvbnRvIGEgdHJhbnNwYXJlbnQgYmFj a2dyb3VuZC4KICAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldFNob3VsZFNtb290aEZvbnRzKGZh bHNlKTsKLSAgICAgICAgZ3JhcGhpY3NDb250ZXh0LnNldEFudGlhbGlhc2VkRm9udERpbGF0aW9u RW5hYmxlZCh0cnVlKTsKICAgICB9CiAgICAgCiAjaWYgUExBVEZPUk0oTUFDKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhc2NhZGVDb2Nv YS5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0ZvbnRDYXNjYWRl Q29jb2EubW0KaW5kZXggMGIyN2ViNTY1ODAzNzNmMjI3ZTZmMGMwZjE2ZTg5Y2M4NTU4YWFmMy4u YmNlOGUzZmY5ZDQ5NTE1Y2JiNjA0OWI4OGU1Mzc4MTVlYzg4MDczMiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvRm9udENhc2NhZGVDb2NvYS5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9Gb250Q2FzY2FkZUNv Y29hLm1tCkBAIC0yMjAsMjYgKzIyMCw2IEBAIHN0YXRpYyB2b2lkIHNldENHRm9udFJlbmRlcmlu Z01vZGUoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0KQogICAgIENHQ29udGV4dFNldFNob3VsZFN1 YnBpeGVsUXVhbnRpemVGb250cyhjZ0NvbnRleHQsIGRvU3VicGl4ZWxRdWFudGl6YXRpb24pOwog fQogCi0jaWYgUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVE ID49IDEwMTEwMAotc3RhdGljIENHU2l6ZSBkaWxhdGlvblNpemVGb3JUZXh0Q29sb3IoY29uc3Qg Q29sb3ImIGNvbG9yKQotewotICAgIGRvdWJsZSBodWU7Ci0gICAgZG91YmxlIHNhdHVyYXRpb247 Ci0gICAgZG91YmxlIGxpZ2h0bmVzczsKLSAgICBjb2xvci5nZXRIU0woaHVlLCBzYXR1cmF0aW9u LCBsaWdodG5lc3MpOwotICAgIAotICAgIC8vIFRoZXNlIHZhbHVlcyB3ZXJlIGRlcml2ZWQgZW1w aXJpY2FsbHksIGFuZCBhcmUgb25seSBleHBlcmltZW50YWwuCi0gICAgaWYgKGxpZ2h0bmVzcyA8 IDAuMzMzMykgLy8gRGFyawotICAgICAgICByZXR1cm4gQ0dTaXplTWFrZSgwLjAwNywgMC4wMTkp OwotCi0gICAgaWYgKGxpZ2h0bmVzcyA8IDAuNjY2NykgLy8gTWVkaXVtCi0gICAgICAgIHJldHVy biBDR1NpemVNYWtlKDAuMDMyLCAwLjAzMik7Ci0KLSAgICAvLyBMaWdodAotICAgIHJldHVybiBD R1NpemVNYWtlKDAuMDQ3NSwgMC4wMzkpOwotfQotI2VuZGlmCi0KIHZvaWQgRm9udENhc2NhZGU6 OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBGb250JiBmb250LCBj b25zdCBHbHlwaEJ1ZmZlciYgZ2x5cGhCdWZmZXIsIGludCBmcm9tLCBpbnQgbnVtR2x5cGhzLCBj b25zdCBGbG9hdFBvaW50JiBhbmNob3JQb2ludCwgRm9udFNtb290aGluZ01vZGUgc21vb3RoaW5n TW9kZSkKIHsKICAgICBjb25zdCBGb250UGxhdGZvcm1EYXRhJiBwbGF0Zm9ybURhdGEgPSBmb250 LnBsYXRmb3JtRGF0YSgpOwpAQCAtMjUwLDM0ICsyMzAsMjkgQEAgdm9pZCBGb250Q2FzY2FkZTo6 ZHJhd0dseXBocyhHcmFwaGljc0NvbnRleHQmIGNvbnRleHQsIGNvbnN0IEZvbnQmIGZvbnQsIGNv bnN0IEcKIAogICAgIGJvb2wgc2hvdWxkU21vb3RoRm9udHM7CiAgICAgYm9vbCBjaGFuZ2VGb250 U21vb3RoaW5nOwotICAgIGJvb2wgbWF0Y2hBbnRpYWxpYXNlZEFuZFNtb290aGVkRm9udHMgPSBj b250ZXh0LmFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZCgpOwogICAgIAogICAgIHN3aXRj aCAoc21vb3RoaW5nTW9kZSkgewogICAgIGNhc2UgQW50aWFsaWFzZWQ6IHsKICAgICAgICAgY29u dGV4dC5zZXRTaG91bGRBbnRpYWxpYXModHJ1ZSk7CiAgICAgICAgIHNob3VsZFNtb290aEZvbnRz ID0gZmFsc2U7CiAgICAgICAgIGNoYW5nZUZvbnRTbW9vdGhpbmcgPSB0cnVlOwotICAgICAgICBt YXRjaEFudGlhbGlhc2VkQW5kU21vb3RoZWRGb250cyA9IGZhbHNlOyAvLyBDU1MgaGFzIG9wdGVk IGludG8gc3RyaWN0bHkgYW50aWFsaWFzZWQgZm9udHMuCiAgICAgICAgIGJyZWFrOwogICAgIH0K ICAgICBjYXNlIFN1YnBpeGVsQW50aWFsaWFzZWQ6IHsKICAgICAgICAgY29udGV4dC5zZXRTaG91 bGRBbnRpYWxpYXModHJ1ZSk7CiAgICAgICAgIHNob3VsZFNtb290aEZvbnRzID0gdHJ1ZTsKICAg ICAgICAgY2hhbmdlRm9udFNtb290aGluZyA9IHRydWU7Ci0gICAgICAgIG1hdGNoQW50aWFsaWFz ZWRBbmRTbW9vdGhlZEZvbnRzID0gdHJ1ZTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIGNh c2UgTm9TbW9vdGhpbmc6IHsKICAgICAgICAgY29udGV4dC5zZXRTaG91bGRBbnRpYWxpYXMoZmFs c2UpOwogICAgICAgICBzaG91bGRTbW9vdGhGb250cyA9IGZhbHNlOwogICAgICAgICBjaGFuZ2VG b250U21vb3RoaW5nID0gdHJ1ZTsKLSAgICAgICAgbWF0Y2hBbnRpYWxpYXNlZEFuZFNtb290aGVk Rm9udHMgPSBmYWxzZTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogICAgIGNhc2UgQXV0b1Ntb290 aGluZzogewogICAgICAgICBzaG91bGRTbW9vdGhGb250cyA9IHRydWU7CiAgICAgICAgIGNoYW5n ZUZvbnRTbW9vdGhpbmcgPSBmYWxzZTsKLSAgICAgICAgbWF0Y2hBbnRpYWxpYXNlZEFuZFNtb290 aGVkRm9udHMgPSB0cnVlOwogICAgICAgICBicmVhazsKICAgICB9CiAgICAgfQpAQCAtMjg1LDcg KzI2MCw2IEBAIHZvaWQgRm9udENhc2NhZGU6OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0JiBj b250ZXh0LCBjb25zdCBGb250JiBmb250LCBjb25zdCBHCiAgICAgaWYgKCFzaG91bGRVc2VTbW9v dGhpbmcoKSkgewogICAgICAgICBzaG91bGRTbW9vdGhGb250cyA9IGZhbHNlOwogICAgICAgICBj aGFuZ2VGb250U21vb3RoaW5nID0gdHJ1ZTsKLSAgICAgICAgbWF0Y2hBbnRpYWxpYXNlZEFuZFNt b290aGVkRm9udHMgPSB0cnVlOwogICAgIH0KIAogI2lmICFQTEFURk9STShJT1MpCkBAIC0yOTQs MTcgKzI2OCw2IEBAIHZvaWQgRm9udENhc2NhZGU6OmRyYXdHbHlwaHMoR3JhcGhpY3NDb250ZXh0 JiBjb250ZXh0LCBjb25zdCBGb250JiBmb250LCBjb25zdCBHCiAgICAgICAgIG9yaWdpbmFsU2hv dWxkVXNlRm9udFNtb290aGluZyA9IENHQ29udGV4dEdldFNob3VsZFNtb290aEZvbnRzKGNnQ29u dGV4dCk7CiAgICAgICAgIENHQ29udGV4dFNldFNob3VsZFNtb290aEZvbnRzKGNnQ29udGV4dCwg c2hvdWxkU21vb3RoRm9udHMpOwogICAgIH0KLSAgICAKLSNpZiBfX01BQ19PU19YX1ZFUlNJT05f TUlOX1JFUVVJUkVEID49IDEwMTEwMAotICAgIENHRm9udEFudGlhbGlhc2luZ1N0eWxlIG9sZEFu dGlhbGlhc2luZ1N0eWxlOwotICAgIGJvb2wgcmVzZXRBbnRpYWxpYXNpbmdTdHlsZSA9IGZhbHNl OwotICAgIGlmIChhbnRpYWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQoKSAmJiAhQ0dDb250ZXh0 R2V0U2hvdWxkU21vb3RoRm9udHMoY2dDb250ZXh0KSAmJiBtYXRjaEFudGlhbGlhc2VkQW5kU21v b3RoZWRGb250cykgewotICAgICAgICByZXNldEFudGlhbGlhc2luZ1N0eWxlID0gdHJ1ZTsKLSAg ICAgICAgb2xkQW50aWFsaWFzaW5nU3R5bGUgPSBDR0NvbnRleHRHZXRGb250QW50aWFsaWFzaW5n U3R5bGUoY2dDb250ZXh0KTsKLSAgICAgICAgQ0dDb250ZXh0U2V0Rm9udEFudGlhbGlhc2luZ1N0 eWxlKGNnQ29udGV4dCwga0NHRm9udEFudGlhbGlhc2luZ1N0eWxlVW5maWx0ZXJlZEN1c3RvbURp bGF0aW9uKTsKLSAgICAgICAgQ0dDb250ZXh0U2V0Rm9udERpbGF0aW9uKGNnQ29udGV4dCwgZGls YXRpb25TaXplRm9yVGV4dENvbG9yKGNvbnRleHQuZmlsbENvbG9yKCkpKTsKLSAgICB9Ci0jZW5k aWYKICNlbmRpZgogCiAgICAgQ0dDb250ZXh0U2V0Rm9udChjZ0NvbnRleHQsIHBsYXRmb3JtRGF0 YS5jZ0ZvbnQoKSk7CkBAIC0zNzEsMTEgKzMzNCw2IEBAIHZvaWQgRm9udENhc2NhZGU6OmRyYXdH bHlwaHMoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBGb250JiBmb250LCBjb25zdCBH CiAgICAgICAgIGNvbnRleHQuc2V0U2hhZG93KHNoYWRvd09mZnNldCwgc2hhZG93Qmx1ciwgc2hh ZG93Q29sb3IpOwogCiAjaWYgIVBMQVRGT1JNKElPUykKLSNpZiBfX01BQ19PU19YX1ZFUlNJT05f TUlOX1JFUVVJUkVEID49IDEwMTEwMAotICAgIGlmIChyZXNldEFudGlhbGlhc2luZ1N0eWxlKQot ICAgICAgICBDR0NvbnRleHRTZXRGb250QW50aWFsaWFzaW5nU3R5bGUoY2dDb250ZXh0LCBvbGRB bnRpYWxpYXNpbmdTdHlsZSk7Ci0jZW5kaWYKLSAgICAKICAgICBpZiAoY2hhbmdlRm9udFNtb290 aGluZykKICAgICAgICAgQ0dDb250ZXh0U2V0U2hvdWxkU21vb3RoRm9udHMoY2dDb250ZXh0LCBv cmlnaW5hbFNob3VsZFVzZUZvbnRTbW9vdGhpbmcpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3QuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZGlzcGxheWxpc3RzL0Rpc3BsYXlM aXN0LmNwcAppbmRleCA2YjNkMjEwNTdlZDY5NTczZTI0ZTM5NWFjNzU2YWQ3OGUzMGU2MGVmLi42 NTA4NjU2OTA5MWJiMjkxZDUxZDZkOTI2YzU3M2RjNGRkYzBiNWI2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9kaXNwbGF5bGlzdHMvRGlzcGxheUxpc3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Rpc3BsYXlsaXN0cy9EaXNw bGF5TGlzdC5jcHAKQEAgLTY4LDkgKzY4LDYgQEAgYm9vbCBEaXNwbGF5TGlzdDo6c2hvdWxkRHVt cEZvckZsYWdzKEFzVGV4dEZsYWdzIGZsYWdzLCBjb25zdCBJdGVtJiBpdGVtKQogICAgICAgICAg ICAgaWYgKHN0YXRlSXRlbS5zdGF0ZSgpLm1fY2hhbmdlRmxhZ3MgPT0gR3JhcGhpY3NDb250ZXh0 U3RhdGU6OlNob3VsZFN1YnBpeGVsUXVhbnRpemVGb250c0NoYW5nZSkKICAgICAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CiAKLSAgICAgICAgICAgIGlmIChzdGF0ZUl0ZW0uc3RhdGUoKS5tX2No YW5nZUZsYWdzID09IEdyYXBoaWNzQ29udGV4dFN0YXRlOjpBbnRpYWxpYXNlZEZvbnREaWxhdGlv bkVuYWJsZWRDaGFuZ2UpCi0gICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCiAgICAgICAg ICAgICBpZiAoc3RhdGVJdGVtLnN0YXRlKCkubV9jaGFuZ2VGbGFncyA9PSBHcmFwaGljc0NvbnRl eHRTdGF0ZTo6U2hvdWxkU3VicGl4ZWxRdWFudGl6ZUZvbnRzQ2hhbmdlKQogICAgICAgICAgICAg ICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvbWFj L1dlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmgKaW5kZXggMWI0ZGY2ZDhlMzY3ZWJh OWNlYmY3OTI4ZmM3MjBjYmEwYTRhOGY0ZC4uMzk4MzdlYzZjNDI4NGM1MGMzNDY4NDkwMDMyNjFl ZGMxZTI3YTVhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVm ZXJlbmNlS2V5c1ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlBy ZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCkBAIC0xNzgsNyArMTc4LDYgQEAKICNkZWZpbmUgV2ViS2l0 V2FudHNCYWxhbmNlZFNldERlZmVyc0xvYWRpbmdCZWhhdmlvcktleSBAIldlYktpdFdhbnRzQmFs YW5jZWRTZXREZWZlcnNMb2FkaW5nQmVoYXZpb3IiCiAjZGVmaW5lIFdlYktpdERlYnVnRnVsbFBh Z2Vab29tUHJlZmVyZW5jZUtleSBAIldlYktpdERlYnVnRnVsbFBhZ2Vab29tUHJlZmVyZW5jZUtl eSIKICNkZWZpbmUgV2ViS2l0TWluaW11bVpvb21Gb250U2l6ZVByZWZlcmVuY2VLZXkgQCJXZWJL aXRNaW5pbXVtWm9vbUZvbnRTaXplUHJlZmVyZW5jZUtleSIKLSNkZWZpbmUgV2ViS2l0QW50aWFs aWFzZWRGb250RGlsYXRpb25FbmFibGVkS2V5IEAiQW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFi bGVkIgogI2RlZmluZSBXZWJLaXRIVFRQRXF1aXZFbmFibGVkUHJlZmVyZW5jZUtleSBAIldlYktp dEhUVFBFcXVpdkVuYWJsZWQiCiAKICNpZiBUQVJHRVRfT1NfSVBIT05FCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tIGIvU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQppbmRleCA5OWI3ODVhY2RmMjAwZmRiNDU4 YWI0YTQ2N2RiYzUwZTg2NmMxMjYyLi41M2NkYjcxY2U2Y2IzOGFkZDBkNWZkZGM0MmNmMjM0NTdi NGQ5NjE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVu Y2VzLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0K QEAgLTQxOCw3ICs0MTgsNiBAQCArICh2b2lkKWluaXRpYWxpemUKICAgICAgICAgQCIwIiwgICAg ICAgICAgICAgICAgICAgICAgICAgICBXZWJLaXRNaW5pbXVtRm9udFNpemVQcmVmZXJlbmNlS2V5 LAogICAgICAgICBAIjkiLCAgICAgICAgICAgICAgICAgICAgICAgICAgIFdlYktpdE1pbmltdW1M b2dpY2FsRm9udFNpemVQcmVmZXJlbmNlS2V5LCAKICAgICAgICAgQCIxNiIsICAgICAgICAgICAg ICAgICAgICAgICAgICBXZWJLaXREZWZhdWx0Rm9udFNpemVQcmVmZXJlbmNlS2V5LAotICAgICAg ICBAKE5PKSwgICAgICAgICAgICAgICAgICAgICAgICAgIFdlYktpdEFudGlhbGlhc2VkRm9udERp bGF0aW9uRW5hYmxlZEtleSwKICAgICAgICAgQCIxMyIsICAgICAgICAgICAgICAgICAgICAgICAg ICBXZWJLaXREZWZhdWx0Rml4ZWRGb250U2l6ZVByZWZlcmVuY2VLZXksCiAgICAgICAgIEAiSVNP LTg4NTktMSIsICAgICAgICAgICAgICAgICAgV2ViS2l0RGVmYXVsdFRleHRFbmNvZGluZ05hbWVQ cmVmZXJlbmNlS2V5LAogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6Tk9dLCAgIFdl YktpdFVzZXNFbmNvZGluZ0RldGVjdG9yUHJlZmVyZW5jZUtleSwKQEAgLTI1OTAsMTYgKzI1ODks NiBAQCAtICh2b2lkKXNldE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3Rvcnk6KE5TU3RyaW5nICopZGly ZWN0b3J5CiAgICAgW3NlbGYgX3NldFN0cmluZ1ZhbHVlOmRpcmVjdG9yeSBmb3JLZXk6V2ViS2l0 TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeUtleV07CiB9CiAKLS0gKHZvaWQpc2V0QW50aWFsaWFz ZWRGb250RGlsYXRpb25FbmFibGVkOihCT09MKWVuYWJsZWQKLXsKLSAgICBbc2VsZiBfc2V0Qm9v bFZhbHVlOmVuYWJsZWQgZm9yS2V5OldlYktpdEFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxl ZEtleV07Ci19Ci0KLS0gKEJPT0wpYW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFibGVkCi17Ci0g ICAgcmV0dXJuIFtzZWxmIF9ib29sVmFsdWVGb3JLZXk6V2ViS2l0QW50aWFsaWFzZWRGb250RGls YXRpb25FbmFibGVkS2V5XTsKLX0KLQogLSAodm9pZClzZXRNZXRhUmVmcmVzaEVuYWJsZWQ6KEJP T0wpZW5hYmxlZAogewogICAgIFtzZWxmIHNldEhUVFBFcXVpdkVuYWJsZWQ6ZW5hYmxlZF07CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0 ZS5oIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaApp bmRleCAwYjc0N2QyNjZjY2E4N2RiNGNiOWE0OWI1ZDU3NmI2MzE3ZWM4NTlmLi43NWE1NWM4MGVh YTc3ZjYxYzQ0MjMzNWI5ZTc0YzljOThlMDE4Y2E3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQv bWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmgKQEAgLTQ1OCw5ICs0NTgsNiBAQCBl eHRlcm4gTlNTdHJpbmcgKldlYlByZWZlcmVuY2VzQ2FjaGVNb2RlbENoYW5nZWRJbnRlcm5hbE5v dGlmaWNhdGlvbjsKIC0gKHZvaWQpc2V0TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeTooTlNTdHJp bmcgKilkaXJlY3Rvcnk7CiAtIChOU1N0cmluZyAqKW1lZGlhS2V5c1N0b3JhZ2VEaXJlY3Rvcnk7 CiAKLS0gKHZvaWQpc2V0QW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFibGVkOihCT09MKWZsYWc7 Ci0tIChCT09MKWFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZDsKLQogLSAodm9pZClzZXRN ZXRhUmVmcmVzaEVuYWJsZWQ6KEJPT0wpZmxhZzsKIC0gKEJPT0wpbWV0YVJlZnJlc2hFbmFibGVk OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0gYi9T b3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KaW5kZXggNmJlOTI1NTU3YTM2MGE5 N2I2YzA1YTM0NWFlNjJmODIzYTYzNGFlZC4uMWYxMWJlZmVjODg4MDJhYjE4MjI2ZTYwM2ZhYzFh M2M3MTc1MjZhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3 Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQpAQCAtMjI1Nyw3 ICsyMjU3LDYgQEAgLSAodm9pZClfcHJlZmVyZW5jZXNDaGFuZ2VkOihXZWJQcmVmZXJlbmNlcyAq KXByZWZlcmVuY2VzCiAgICAgc2V0dGluZ3Muc2V0VXNlc0VuY29kaW5nRGV0ZWN0b3IoW3ByZWZl cmVuY2VzIHVzZXNFbmNvZGluZ0RldGVjdG9yXSk7CiAgICAgc2V0dGluZ3Muc2V0RmFudGFzeUZv bnRGYW1pbHkoW3ByZWZlcmVuY2VzIGZhbnRhc3lGb250RmFtaWx5XSk7CiAgICAgc2V0dGluZ3Mu c2V0Rml4ZWRGb250RmFtaWx5KFtwcmVmZXJlbmNlcyBmaXhlZEZvbnRGYW1pbHldKTsKLSAgICBz ZXR0aW5ncy5zZXRBbnRpYWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQoW3ByZWZlcmVuY2VzIGFu dGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZF0pOwogICAgIHNldHRpbmdzLnNldEZvcmNlRlRQ RGlyZWN0b3J5TGlzdGluZ3MoW3ByZWZlcmVuY2VzIF9mb3JjZUZUUERpcmVjdG9yeUxpc3Rpbmdz XSk7CiAgICAgc2V0dGluZ3Muc2V0RlRQRGlyZWN0b3J5VGVtcGxhdGVQYXRoKFtwcmVmZXJlbmNl cyBfZnRwRGlyZWN0b3J5VGVtcGxhdGVQYXRoXSk7CiAgICAgc2V0dGluZ3Muc2V0TG9jYWxTdG9y YWdlRGF0YWJhc2VQYXRoKFtwcmVmZXJlbmNlcyBfbG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoXSk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZpbml0 aW9ucy5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVmaW5pdGlvbnMu aAppbmRleCA3YmU5NmQyNDYzMTcwMGM1ZDAwZmIzNTQ5NDVlY2IyOGRmNTVlY2EwLi41MTJjYWIw YmMyZWI1MWU5MDZjNDA2NzI5NDcwOGRkNDEyMmQwOTlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZpbml0aW9ucy5oCisrKyBiL1NvdXJjZS9XZWJL aXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmluaXRpb25zLmgKQEAgLTIyMiw3ICsyMjIsNiBA QAogICAgIG1hY3JvKFNlcnZpY2VDb250cm9sc0VuYWJsZWQsIHNlcnZpY2VDb250cm9sc0VuYWJs ZWQsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCiAgICAgbWFjcm8oR2FtZXBhZHNFbmFibGVkLCBnYW1l cGFkc0VuYWJsZWQsIEJvb2wsIGJvb2wsIGZhbHNlKSBcCiAgICAgbWFjcm8oTmV3QmxvY2tJbnNp ZGVJbmxpbmVNb2RlbEVuYWJsZWQsIG5ld0Jsb2NrSW5zaWRlSW5saW5lTW9kZWxFbmFibGVkLCBC b29sLCBib29sLCBmYWxzZSkgXAotICAgIG1hY3JvKEFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5h YmxlZCwgYW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFibGVkLCBCb29sLCBib29sLCBmYWxzZSkg XAogICAgIG1hY3JvKEhUVFBFcXVpdkVuYWJsZWQsIGh0dHBFcXVpdkVuYWJsZWQsIEJvb2wsIGJv b2wsIHRydWUpIFwKICAgICBtYWNybyhNb2NrQ2FwdHVyZURldmljZXNFbmFibGVkLCBtb2NrQ2Fw dHVyZURldmljZXNFbmFibGVkLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIEZPUl9FQUNIX0FE RElUSU9OQUxfV0VCS0lUX0JPT0xfUFJFRkVSRU5DRShtYWNybykgXApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVyZW5jZXMuY3BwCmluZGV4IDllYmM4OGY2OTc5 YjQ1ZWRkZmM4ZTRmODY0NDBiNDE1ZWZjMDczODcuLjQ1NDFkY2MwOGE4MGMwNjQ1MjcxMzVmMzVk Y2E0M2RlMTI5YTc3N2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Qy9XS1ByZWZlcmVuY2VzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Mv V0tQcmVmZXJlbmNlcy5jcHAKQEAgLTEzODcsMTQgKzEzODcsMTQgQEAgZG91YmxlIFdLUHJlZmVy ZW5jZXNHZXRNaW5pbXVtWm9vbUZvbnRTaXplKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNS ZWYpCiAgICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPm1pbmltdW1ab29tRm9udFNp emUoKTsKIH0KIAotdm9pZCBXS1ByZWZlcmVuY2VzU2V0QW50aWFsaWFzZWRGb250RGlsYXRpb25F bmFibGVkKFdLUHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZW5hYmxlZCkKK3Zv aWQgV0tQcmVmZXJlbmNlc1NldEFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZChXS1ByZWZl cmVuY2VzUmVmLCBib29sKQogewotICAgIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPnNldEFudGlh bGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZChlbmFibGVkKTsKKyAgICAvLyBGZWF0dXJlIHJlbW92 ZWQuCiB9CiAKLWJvb2wgV0tQcmVmZXJlbmNlc0dldEFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5h YmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmKQorYm9vbCBXS1ByZWZlcmVuY2Vz R2V0QW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpCiB7Ci0g ICAgcmV0dXJuIHRvSW1wbChwcmVmZXJlbmNlc1JlZiktPmFudGlhbGlhc2VkRm9udERpbGF0aW9u RW5hYmxlZCgpOworICAgIHJldHVybiBmYWxzZTsgLy8gRmVhdHVyZSByZW1vdmVkLgogfQogCiB2 b2lkIFdLUHJlZmVyZW5jZXNTZXRWaXNpYmxlRGVidWdPdmVybGF5UmVnaW9ucyhXS1ByZWZlcmVu Y2VzUmVmIHByZWZlcmVuY2VzUmVmLCBXS0RlYnVnT3ZlcmxheVJlZ2lvbnMgdmlzaWJsZVJlZ2lv bnMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJl bmNlc1JlZlByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZl cmVuY2VzUmVmUHJpdmF0ZS5oCmluZGV4IDNhODA4ODMyNWE4ODRhM2MxZjVjNGUzM2Y3YjljNzc3 MGI4OThkOTMuLjA2YmE0NjE0MTRjNjViMDM3NDFiYzhiZTc3MTZjY2E3OTE5OWQ2NzYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzUmVmUHJp dmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2Vz UmVmUHJpdmF0ZS5oCkBAIC0zNzksNyArMzc5LDcgQEAgV0tfRVhQT1JUIGRvdWJsZSBXS1ByZWZl cmVuY2VzR2V0TWluaW11bVpvb21Gb250U2l6ZShXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2UK IFdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRTY3JlZW5Gb250U3Vic3RpdHV0aW9uRW5h YmxlZChXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzLCBib29sIGVuYWJsZWQpOwogV0tfRVhQ T1JUIGJvb2wgV0tQcmVmZXJlbmNlc0dldFNjcmVlbkZvbnRTdWJzdGl0dXRpb25FbmFibGVkKFdL UHJlZmVyZW5jZXNSZWYgcHJlZmVyZW5jZXMpOwogCi0vLyBEZWZhdWx0cyB0byBmYWxzZS4KKy8v IE5vdCBpbXBsZW1lbnRlZCwgc2hvdWxkIGJlIGRlbGV0ZWQgb25jZSBTYWZhcmkgbm8gbG9uZ2Vy IHVzZXMgdGhpcyBmdW5jdGlvbi4KIFdLX0VYUE9SVCB2b2lkIFdLUHJlZmVyZW5jZXNTZXRBbnRp YWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlcywg Ym9vbCBlbmFibGVkKTsKIFdLX0VYUE9SVCBib29sIFdLUHJlZmVyZW5jZXNHZXRBbnRpYWxpYXNl ZEZvbnREaWxhdGlvbkVuYWJsZWQoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlcyk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcmVmZXJlbmNl cy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcmVmZXJlbmNlcy5t bQppbmRleCAxNDZhMTdhZTZmODUwMTE3NGUwZDRhZWE5MDIyOTljMjQ3NzlhOGZhLi4zMjgxODc2 NTkyMGQ0MTA4MTJhN2EwMzRmY2I4MmY2ZDNiZTRlYWRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJlZmVyZW5jZXMubW0KKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1ByZWZlcmVuY2VzLm1tCkBAIC0zODksMTYgKzM4 OSw2IEBAIC0gKHZvaWQpX3NldERpYWdub3N0aWNMb2dnaW5nRW5hYmxlZDooQk9PTClkaWFnbm9z dGljTG9nZ2luZ0VuYWJsZWQKICAgICBfcHJlZmVyZW5jZXMtPnNldERpYWdub3N0aWNMb2dnaW5n RW5hYmxlZChkaWFnbm9zdGljTG9nZ2luZ0VuYWJsZWQpOwogfQogCi0tIChCT09MKV9hbnRpYWxp YXNlZEZvbnREaWxhdGlvbkVuYWJsZWQKLXsKLSAgICByZXR1cm4gX3ByZWZlcmVuY2VzLT5hbnRp YWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQoKTsKLX0KLQotLSAodm9pZClfc2V0QW50aWFsaWFz ZWRGb250RGlsYXRpb25FbmFibGVkOihCT09MKWFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxl ZAotewotICAgIF9wcmVmZXJlbmNlcy0+c2V0QW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFibGVk KGFudGlhbGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZCk7Ci19Ci0KIC0gKE5TVUludGVnZXIpX2Rl ZmF1bHRGb250U2l6ZQogewogICAgIHJldHVybiBfcHJlZmVyZW5jZXMtPmRlZmF1bHRGb250U2l6 ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1By ZWZlcmVuY2VzUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1ByZWZlcmVuY2VzUHJpdmF0ZS5oCmluZGV4IDhkMGE4NzZjYWY1ZmZjMzE5YzliYTVhM2RlZWJk ZGIxZDQ3ZjljN2IuLjA5Y2VkNWE0NTQxMzBlNDhhYmU3Mjk1YjQzN2VkYzY4YzBkYTgzMGYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcmVmZXJlbmNl c1ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJl ZmVyZW5jZXNQcml2YXRlLmgKQEAgLTc2LDggKzc2LDYgQEAgdHlwZWRlZiBOU19PUFRJT05TKE5T VUludGVnZXIsIF9XS0phdmFTY3JpcHRSdW50aW1lRmxhZ3MpIHsKIAogQHByb3BlcnR5IChub25h dG9taWMsIHNldHRlcj1fc2V0RGlhZ25vc3RpY0xvZ2dpbmdFbmFibGVkOikgQk9PTCBfZGlhZ25v c3RpY0xvZ2dpbmdFbmFibGVkIFdLX0FWQUlMQUJMRSgxMF8xMSwgOV8wKTsKIAotQHByb3BlcnR5 IChub25hdG9taWMsIHNldHRlcj1fc2V0QW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFibGVkOikg Qk9PTCBfYW50aWFsaWFzZWRGb250RGlsYXRpb25FbmFibGVkIFdLX0FWQUlMQUJMRShXS19NQUNf VEJBLCBXS19JT1NfVEJBKTsKLQogQHByb3BlcnR5IChub25hdG9taWMsIHNldHRlcj1fc2V0RGVm YXVsdEZvbnRTaXplOikgTlNVSW50ZWdlciBfZGVmYXVsdEZvbnRTaXplIFdLX0FWQUlMQUJMRShX S19NQUNfVEJBLCBXS19JT1NfVEJBKTsKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBzZXR0ZXI9X3Nl dERlZmF1bHRGaXhlZFBpdGNoRm9udFNpemU6KSBOU1VJbnRlZ2VyIF9kZWZhdWx0Rml4ZWRQaXRj aEZvbnRTaXplIFdLX0FWQUlMQUJMRShXS19NQUNfVEJBLCBXS19JT1NfVEJBKTsKIEBwcm9wZXJ0 eSAobm9uYXRvbWljLCBjb3B5LCBzZXR0ZXI9X3NldEZpeGVkUGl0Y2hGb250RmFtaWx5OikgTlNT dHJpbmcgKl9maXhlZFBpdGNoRm9udEZhbWlseSBXS19BVkFJTEFCTEUoV0tfTUFDX1RCQSwgV0tf SU9TX1RCQSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHAKaW5kZXggNDEwNjQzNDU1YTM3MTI0NzdiZjc5NGZhNTRlN2Y0NmQ5YmZkYzZkNC4uZTVhNmQx OGYzODk4MDA5MGM1M2NiNzU0YzQ1NzFkZjRjOWEwNmMwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMjk4Nyw3ICsyOTg3LDYgQEAgdm9p ZCBXZWJQYWdlOjp1cGRhdGVQcmVmZXJlbmNlcyhjb25zdCBXZWJQcmVmZXJlbmNlc1N0b3JlJiBz dG9yZSkKICAgICBzZXR0aW5ncy5zZXRTaW1wbGVMaW5lTGF5b3V0RGVidWdCb3JkZXJzRW5hYmxl ZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OnNpbXBsZUxpbmVM YXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkS2V5KCkpKTsKICAgICAKICAgICBzZXR0aW5ncy5zZXRO ZXdCbG9ja0luc2lkZUlubGluZU1vZGVsRW5hYmxlZChzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXko V2ViUHJlZmVyZW5jZXNLZXk6Om5ld0Jsb2NrSW5zaWRlSW5saW5lTW9kZWxFbmFibGVkS2V5KCkp KTsKLSAgICBzZXR0aW5ncy5zZXRBbnRpYWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQoc3RvcmUu Z2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjphbnRpYWxpYXNlZEZvbnREaWxh dGlvbkVuYWJsZWRLZXkoKSkpOwogICAgIAogICAgIHNldHRpbmdzLnNldFN1YnBpeGVsQ1NTT01F bGVtZW50TWV0cmljc0VuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVu Y2VzS2V5OjpzdWJwaXhlbENTU09NRWxlbWVudE1ldHJpY3NFbmFibGVkS2V5KCkpKTsKIApkaWZm IC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGQzOTRiMzli NzQyYTVjNWQyMGE0ZjA0M2NhNWU3MTBmNzJhNWVlODAuLmNjNTA4NDgyOGFmMjg4ZDkwNzg1NzJj ODNlNzdhMDFkMDY3NWE2MDAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29s cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxNi0wMi0yOSAgU2ltb24gRnJhc2VyICA8 c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgdGhlIGV4cGVyaW1lbnRh bCBmZWF0dXJlIG9mIGFudGlhbGlhc2VkIGZvbnQgZGlsYXRpb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NDg0MworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbW92ZSB0aGUgImFudGlhbGlhc2VkIGZv bnQgZGlsYXRpb24iIGNvZGUgcGF0aCwgYW5kIHJlbGF0ZWQgcHJlZnMuCisKKyAgICAgICAgKiBE dW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW06CisgICAgICAgIChyZXNldFdlYlBy ZWZlcmVuY2VzVG9Db25zaXN0ZW50VmFsdWVzKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJLaXRU ZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xs ZXI6OnJlc2V0UHJlZmVyZW5jZXNUb0NvbnNpc3RlbnRWYWx1ZXMpOiBEZWxldGVkLgorCiAyMDE2 LTAyLTI4ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVpbXBsZW1l bnQgV0tQYWdlR3JvdXAgaW4gdGVybXMgb2YgV0tVc2VyQ29udGVudENvbnRyb2xsZXIKZGlmZiAt LWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbSBiL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQppbmRleCBlYTc2ZDdhYjE5Mjdh ZTQxMTU1NWQ3NzM0Yjc1NzI0NjFkNWY3OTE3Li5kYmQwNzU1ZTlhNjM0YmU2M2MzN2IwZjhmYmMw ZmM5N2E5MDkyNDYzIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJl bmRlclRyZWUubW0KKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVl Lm1tCkBAIC04OTksNyArODk5LDYgQEAgc3RhdGljIHZvaWQgcmVzZXRXZWJQcmVmZXJlbmNlc1Rv Q29uc2lzdGVudFZhbHVlcygpCiAgICAgW3ByZWZlcmVuY2VzIHNldFBpY3RvZ3JhcGhGb250RmFt aWx5OkAiQXBwbGUgQ29sb3IgRW1vamkiXTsKICAgICBbcHJlZmVyZW5jZXMgc2V0RGVmYXVsdEZv bnRTaXplOjE2XTsKICAgICBbcHJlZmVyZW5jZXMgc2V0RGVmYXVsdEZpeGVkRm9udFNpemU6MTNd OwotICAgIFtwcmVmZXJlbmNlcyBzZXRBbnRpYWxpYXNlZEZvbnREaWxhdGlvbkVuYWJsZWQ6Tk9d OwogICAgIFtwcmVmZXJlbmNlcyBzZXRNaW5pbXVtRm9udFNpemU6MF07CiAgICAgW3ByZWZlcmVu Y2VzIHNldERlZmF1bHRUZXh0RW5jb2RpbmdOYW1lOkAiSVNPLTg4NTktMSJdOwogICAgIFtwcmVm ZXJlbmNlcyBzZXRKYXZhRW5hYmxlZDpOT107CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENv bnRyb2xsZXIuY3BwCmluZGV4IDRjMTQ3NDgzNWU1NmFiYjhlZDc4MzhiZDdiODAwZmFlYThmOTc1 YzUuLjM3NjFkMGNlYWE0OGFmNzcwMGIyNjUzZWM5NTc0ZTgzMGY4YzViNWEgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCisrKyBiL1Rvb2xzL1dl YktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCkBAIC02MzAsNyArNjMwLDYgQEAgdm9p ZCBUZXN0Q29udHJvbGxlcjo6cmVzZXRQcmVmZXJlbmNlc1RvQ29uc2lzdGVudFZhbHVlcygpCiAg ICAgV0tQcmVmZXJlbmNlc1NldFBhZ2VWaXNpYmlsaXR5QmFzZWRQcm9jZXNzU3VwcHJlc3Npb25F bmFibGVkKHByZWZlcmVuY2VzLCBmYWxzZSk7CiAgICAgV0tQcmVmZXJlbmNlc1NldE9mZmxpbmVX ZWJBcHBsaWNhdGlvbkNhY2hlRW5hYmxlZChwcmVmZXJlbmNlcywgdHJ1ZSk7CiAgICAgV0tQcmVm ZXJlbmNlc1NldEZvbnRTbW9vdGhpbmdMZXZlbChwcmVmZXJlbmNlcywga1dLRm9udFNtb290aGlu Z0xldmVsTm9TdWJwaXhlbEFudGlBbGlhc2luZyk7Ci0gICAgV0tQcmVmZXJlbmNlc1NldEFudGlh bGlhc2VkRm9udERpbGF0aW9uRW5hYmxlZChwcmVmZXJlbmNlcywgZmFsc2UpOwogICAgIFdLUHJl ZmVyZW5jZXNTZXRYU1NBdWRpdG9yRW5hYmxlZChwcmVmZXJlbmNlcywgZmFsc2UpOwogICAgIFdL UHJlZmVyZW5jZXNTZXRXZWJBdWRpb0VuYWJsZWQocHJlZmVyZW5jZXMsIHRydWUpOwogICAgIFdL UHJlZmVyZW5jZXNTZXRNZWRpYVN0cmVhbUVuYWJsZWQocHJlZmVyZW5jZXMsIHRydWUpOwo=