147964 2015-08-12 18:28:12 -0700 [Cocoa] [CJK-configured device] System font has vertical punctuation 2015-08-13 13:41:25 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mmaxfield mmaxfield commit-queue esprehn+autocc glenn kondapallykalyan webkit-bug-importer oldest_to_newest 1117128 0 mmaxfield 2015-08-12 18:28:12 -0700 [Cocoa] Force the system font to use horizontal glyphs 1117138 1 258869 mmaxfield 2015-08-12 18:43:53 -0700 Created attachment 258869 WIP 1117142 2 258873 mmaxfield 2015-08-12 18:52:15 -0700 Created attachment 258873 Patch 1117144 3 258873 dino 2015-08-12 19:02:25 -0700 Comment on attachment 258873 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258873&action=review > Source/WebCore/platform/graphics/FontPlatformData.h:140 > + bool isForTextCombine() const { return widthVariant() != RegularWidth; } // Keep in sync with callers of FontDescription::setWidthVariant() Nit: missing punctuation. > LayoutTests/ChangeLog:10 > + * fast/text/system-font-punctuation.html: Added. I think you are missing results. 1117179 4 mmaxfield 2015-08-12 22:36:46 -0700 Committed r188377: <http://trac.webkit.org/changeset/188377> 1117180 5 mmaxfield 2015-08-12 22:37:34 -0700 <rdar://problem/22256660> 1117228 6 258873 ap 2015-08-13 08:47:54 -0700 Comment on attachment 258873 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=258873&action=review >> LayoutTests/ChangeLog:10 >> + * fast/text/system-font-punctuation.html: Added. > > I think you are missing results. Still missing results in the landed patch. ChangeLog says that they are there, but Mac results aren't. 1117230 7 ap 2015-08-13 08:54:46 -0700 Looks like the results are the same for all OS X versions; landed in r188383. 1117234 8 mmaxfield 2015-08-13 09:06:51 -0700 Thanks Alexey. 1117362 9 258873 enrica 2015-08-13 13:41:25 -0700 Comment on attachment 258873 Patch The patch sounds very reasonable to me. 258869 2015-08-12 18:43:53 -0700 2015-08-12 18:52:13 -0700 WIP bug-147964-20150812184336.patch text/plain 8065 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4MzYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE2NDY1NDRmOTcyZmEx NzYyNDIxN2VkMTdiZDI3ZWQzZDFjNjZmOC4uODIxOWNmMzljOWIwYWZhMjEyMjg3MGM1NjIyNGMz ZWNmNzk1YmQzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE1LTA4LTEyICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBb Q0pLLWNvbmZpZ3VyZWQgZGV2aWNlXSBTeXN0ZW0gZm9udCBoYXMgdmVydGljYWwgcHVuY3R1YXRp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0Nzk2 NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdseXBo UGFnZTo6ZmlsbCgpIGhhcyBtdWx0aXBsZSBjb2RlIHBhdGhzIHRvIGFjY29tcGxpc2ggaXRzIGdv YWwuIEl0IHVzZXMgdGhlIHNob3VsZFVzZUNvcmVUZXh0KCkgaGVscGVyCisgICAgICAgIGZ1bmN0 aW9uIHRvIGRldGVybWluZSB3aGljaCBvbmUgb2YgdGhlIHBhdGhzIHNob3VsZCBiZSB0YWtlbi4g SG93ZXZlciwgbm90IGFsbCBvZiB0aGUgY29kZSBwYXRocyBpbgorICAgICAgICBHbHlwaFBhZ2U6 OmZpbGwoKSBhcmUgYWJsZSBvZiBoYW5kbGluZyBhbGwgc2l0dWF0aW9ucy4gSW5kZWVkLCB0aGUg Q29yZVRleHQgY29kZSBwYXRocyBpbiBHbHlwaFBhZ2U6OmZpbGwoKQorICAgICAgICBhcmUgb25s eSBhYmxlIHRvIGhhbmRsZSB0aGUgc2l0dWF0aW9ucyB3aGljaCBzaG91bGRVc2VDb3JlVGV4dCgp IHJldHVybnMgdHJ1ZSBmb3IuIFRoaXMgaGFwcGVucyBpbiB0aGUKKyAgICAgICAgZm9sbG93aW5n IGNhc2VzOgorCisgICAgICAgIDEuIElmIHRoZSBmb250IGlzIGEgY29tcG9zaXRlIGZvbnQKKyAg ICAgICAgMi4gSWYgdGhlIGZvbnQgaXMgdXNlZCBmb3IgdGV4dC1jb21iaW5lCisgICAgICAgIDMu IElmIHRoZSBmb250IGhhcyB2ZXJ0aWNhbCBnbHlwaHMKKworICAgICAgICBJbiByMTg3NjkzLCBJ IGFkZGVkIG9uZSBtb3JlIGNhc2UgdG8gdGhpcyBsaXN0OiBJZiB0aGUgZm9udCBpcyB0aGUgc3lz dGVtIGZvbnQuIEhvd2V2ZXIsIEkgZmFpbGVkIHRvIGFkZAorICAgICAgICB0aGUgbmVjZXNzYXJ5 IHN1cHBvcnQgdG8gR2x5cGhQYWdlOjpmaWxsKCkgZm9yIHRoaXMgY2FzZS4gQmVjYXN1ZSBvZiB0 aGlzLCB3ZSBqdXN0IGhhcHBlbmVkIHRvIGZhbGwgaW50bworICAgICAgICB0aGUgY2FzZSBvZiB2 ZXJ0aWNhbCBmb250cyAoanVzdCBieSBjb2luY2lkZW5jZSksIHdoaWNoIGNhdXNlcyB1cyB0byB1 c2UKKyAgICAgICAgQ1RGb250R2V0VmVydGljYWxHbHlwaHNGb3JDaGFyYWN0ZXJzKCkgaW5zdGVh ZCBvZiBDVEZvbnRHZXRHbHlwaHNGb3JDaGFyYWN0ZXJzKCkuCisKKyAgICAgICAgVGhlIHNvbHV0 aW9uIGlzIHRvIGFkb3B0IHRoZSBzYW1lIGJlaGF2aW9yIHdlIHdlcmUgdXNpbmcgYmVmb3JlIHIx ODc2OTMuIEJhY2sgdGhlbiwgd2Ugd2VyZSB1c2luZworICAgICAgICBDR0ZvbnRHZXRHbHlwaHNG b3JVbmljaGFycygpLCB3aGljaCBhbHdheXMgcmV0dXJuZWQgaG9yaXpvbnRhbCBnbHlwaHMuIFdl IHNob3VsZCBzaW1wbHkgYWRvcHQgdGhpcyBzYW1lCisgICAgICAgIGJlaGF2aW9yLCBleGNlcHQg aW4gdGhlIENvcmUgVGV4dCBjYXNlLiBUaGVyZWZvcmUsIHRoaXMgcGF0Y2ggaXMganVzdCBhIHNp bXBsZSBjaGVjayB0byBzZWUgaWYgd2UgYXJlCisgICAgICAgIHVzaW5nIHRoZSBzeXN0ZW0gZm9u dCB3aGVuIGRldGVybWluaW5nIHdoaWNoIENvcmUgVGV4dCBmdW5jdGlvbiB0byB1c2UuCisKKyAg ICAgICAgTm8gbmV3IHRlc3RzIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9Gb250RGVzY3JpcHRpb24uaDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnREZXNjcmlwdGlvbjo6 c2V0V2lkdGhWYXJpYW50KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9Gb250UGxhdGZv cm1EYXRhLmg6CisgICAgICAgIChXZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjppc0ZvclRleHRD b21iaW5lKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvR2x5cGhQYWdlTWFjLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OnNob3VsZFVzZUNvcmVUZXh0KToKKyAgICAgICAgKFdlYkNv cmU6OkdseXBoUGFnZTo6ZmlsbCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckNvbWJpbmVU ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckNvbWJpbmVUZXh0Ojpjb21iaW5lVGV4 dCk6CisKIDIwMTUtMDgtMTIgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAg ICAgICAgIENhY2hlZFJlc291cmNlIGxlYWsgaW4gdmFsaWRhdGlvbiBjb2RlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250RGVzY3JpcHRpb24uaCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnREZXNjcmlwdGlvbi5oCmluZGV4IDU3 NjMyNzlmODc4MGFiYzE1ZTIwZjNmM2VjNzY1ZDdjZTE4ZTMzMTIuLmU4Nzc0ZDQzMmY0OTkzNjQ3 M2IxOGFmMDA5YzY3MWU5MGZmOTRhNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0ZvbnREZXNjcmlwdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0ZvbnREZXNjcmlwdGlvbi5oCkBAIC0xMjQsNyArMTI0LDcgQEAgcHVibGlj OgogICAgIHZvaWQgc2V0SXNTcGVjaWZpZWRGb250KGJvb2wgaXNTcGVjaWZpZWRGb250KSB7IG1f aXNTcGVjaWZpZWRGb250ID0gaXNTcGVjaWZpZWRGb250OyB9CiAgICAgdm9pZCBzZXRPcmllbnRh dGlvbihGb250T3JpZW50YXRpb24gb3JpZW50YXRpb24pIHsgbV9vcmllbnRhdGlvbiA9IG9yaWVu dGF0aW9uOyB9CiAgICAgdm9pZCBzZXROb25DSktHbHlwaE9yaWVudGF0aW9uKE5vbkNKS0dseXBo T3JpZW50YXRpb24gb3JpZW50YXRpb24pIHsgbV9ub25DSktHbHlwaE9yaWVudGF0aW9uID0gb3Jp ZW50YXRpb247IH0KLSAgICB2b2lkIHNldFdpZHRoVmFyaWFudChGb250V2lkdGhWYXJpYW50IHdp ZHRoVmFyaWFudCkgeyBtX3dpZHRoVmFyaWFudCA9IHdpZHRoVmFyaWFudDsgfQorICAgIHZvaWQg c2V0V2lkdGhWYXJpYW50KEZvbnRXaWR0aFZhcmlhbnQgd2lkdGhWYXJpYW50KSB7IG1fd2lkdGhW YXJpYW50ID0gd2lkdGhWYXJpYW50OyB9IC8vIE1ha2Ugc3VyZSBuZXcgY2FsbGVycyBvZiB0aGlz IHN5bmMgd2l0aCBGb250UGxhdGZvcm1EYXRhOjppc0ZvclRleHRDb21iaW5lKCkhCiAgICAgdm9p ZCBzZXRMb2NhbGUoY29uc3QgQXRvbWljU3RyaW5nJik7CiAgICAgdm9pZCBzZXRGZWF0dXJlU2V0 dGluZ3MoUGFzc1JlZlB0cjxGb250RmVhdHVyZVNldHRpbmdzPiBzZXR0aW5ncykgeyBtX2ZlYXR1 cmVTZXR0aW5ncyA9IHNldHRpbmdzOyB9CiAgICAgdm9pZCBzZXRGb250U3ludGhlc2lzKEZvbnRT eW50aGVzaXMgZm9udFN5bnRoZXNpcykgeyBtX2ZvbnRTeW50aGVzaXMgPSBmb250U3ludGhlc2lz OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250UGxh dGZvcm1EYXRhLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250UGxhdGZv cm1EYXRhLmgKaW5kZXggNTg1Mzg4MzUxODUwMmFhMjBmOTUxMDA0YzNlZTkwN2JlZjljYjBiOS4u NDk5ZmYxMmYwMmQ5YzZmZDkyNzE5ZWI4MGFiM2FjZTBkNjU1NTQ3MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udFBsYXRmb3JtRGF0YS5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuaApAQCAtMTM3 LDYgKzEzNyw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzQ29tcG9zaXRlRm9udFJlZmVyZW5jZSgp IGNvbnN0IHsgcmV0dXJuIG1faXNDb21wb3NpdGVGb250UmVmZXJlbmNlOyB9CiAgICAgRm9udE9y aWVudGF0aW9uIG9yaWVudGF0aW9uKCkgY29uc3QgeyByZXR1cm4gbV9vcmllbnRhdGlvbjsgfQog ICAgIEZvbnRXaWR0aFZhcmlhbnQgd2lkdGhWYXJpYW50KCkgY29uc3QgeyByZXR1cm4gbV93aWR0 aFZhcmlhbnQ7IH0KKyAgICBib29sIGlzRm9yVGV4dENvbWJpbmUoKSBjb25zdCB7IHJldHVybiB3 aWR0aFZhcmlhbnQoKSAhPSBSZWd1bGFyV2lkdGg7IH0gLy8gS2VlcCBpbiBzeW5jIHdpdGggY2Fs bGVycyBvZiBGb250RGVzY3JpcHRpb246OnNldFdpZHRoVmFyaWFudCgpCiAKICAgICB2b2lkIHNl dE9yaWVudGF0aW9uKEZvbnRPcmllbnRhdGlvbiBvcmllbnRhdGlvbikgeyBtX29yaWVudGF0aW9u ID0gb3JpZW50YXRpb247IH0KICAgICB2b2lkIHNldFN5bnRoZXRpY09ibGlxdWUoYm9vbCBzeW50 aGV0aWNPYmxpcXVlKSB7IG1fc3ludGhldGljT2JsaXF1ZSA9IHN5bnRoZXRpY09ibGlxdWU7IH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9HbHlwaFBh Z2VNYWMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dseXBoUGFn ZU1hYy5jcHAKaW5kZXggYzcyYTcxZGZmM2UzMGViYTkyMDE2Y2ZjODg2NzNkZWY1ZWE0YmMzYS4u MzRjZGYyOTI1ODk4ZWJmMzA0YTk2ZGYxM2ZjZmVmMWJmMmY4YTc0NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dseXBoUGFnZU1hYy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0dseXBoUGFnZU1hYy5jcHAKQEAg LTQyLDkgKzQyLDEyIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RhdGljIGJvb2wgc2hvdWxk VXNlQ29yZVRleHQoY29uc3QgVUNoYXIqIGJ1ZmZlciwgdW5zaWduZWQgYnVmZmVyTGVuZ3RoLCBj b25zdCBGb250KiBmb250RGF0YSkKIHsKKyAgICAvLyBUaGlzIG5lZWRzIHRvIGJlIGtlcHQgaW4g c3luYyB3aXRoIEdseXBoUGFnZTo6ZmlsbCgpLiBDdXJyZW50bHksIHRoZSBDb3JlVGV4dCBwYXRo cyBhcmUgbm90IGFibGUgdG8gaGFuZGxlCisgICAgLy8gZXZlcnkgc2l0dXRhdGlvbi4gUmV0dXJu aW5nIHRydWUgZnJvbSB0aGlzIGZ1bmN0aW9uIGluIGEgbmV3IHNpdHVhdGlvbiB3aWxsIHJlcXVp cmUgeW91IHRvIGV4cGxpY2l0bHkgYWRkCisgICAgLy8gaGFuZGxpbmcgZm9yIHRoYXQgc2l0dWF0 aW9uIGluIHRoZSBDb3JlVGV4dCBwYXRocyBvZiBHbHlwaFBhZ2U6OmZpbGwoKS4KICAgICBpZiAo Zm9udERhdGEtPnBsYXRmb3JtRGF0YSgpLmlzQ29tcG9zaXRlRm9udFJlZmVyZW5jZSgpIHx8IGZv bnREYXRhLT5pc1N5c3RlbUZvbnQoKSkKICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgaWYgKGZv bnREYXRhLT5wbGF0Zm9ybURhdGEoKS53aWR0aFZhcmlhbnQoKSAhPSBSZWd1bGFyV2lkdGggfHwg Zm9udERhdGEtPmhhc1ZlcnRpY2FsR2x5cGhzKCkpIHsKKyAgICBpZiAoZm9udERhdGEtPnBsYXRm b3JtRGF0YSgpLmlzRm9yVGV4dENvbWJpbmUoKSB8fCBmb250RGF0YS0+aGFzVmVydGljYWxHbHlw aHMoKSkgewogICAgICAgICAvLyBJZGVvZ3JhcGhzIGRvbid0IGhhdmUgYSB2ZXJ0aWNhbCB2YXJp YW50IG9yIHdpZHRoIHZhcmlhbnRzLgogICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwg YnVmZmVyTGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIGlmICghRm9udENhc2NhZGU6OmlzQ0pL SWRlb2dyYXBoKGJ1ZmZlcltpXSkpCkBAIC04OCwxMCArOTEsMTIgQEAgYm9vbCBHbHlwaFBhZ2U6 OmZpbGwodW5zaWduZWQgb2Zmc2V0LCB1bnNpZ25lZCBsZW5ndGgsIFVDaGFyKiBidWZmZXIsIHVu c2lnbmVkIGIKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0gZWxzZSBpZiAoIWZvbnRE YXRhLT5wbGF0Zm9ybURhdGEoKS5pc0NvbXBvc2l0ZUZvbnRSZWZlcmVuY2UoKSkgewotICAgICAg ICBpZiAoZm9udERhdGEtPnBsYXRmb3JtRGF0YSgpLndpZHRoVmFyaWFudCgpID09IFJlZ3VsYXJX aWR0aCkKLSAgICAgICAgICAgIENURm9udEdldFZlcnRpY2FsR2x5cGhzRm9yQ2hhcmFjdGVycyhm b250RGF0YS0+cGxhdGZvcm1EYXRhKCkuY3RGb250KCksIGJ1ZmZlciwgZ2x5cGhzLmRhdGEoKSwg YnVmZmVyTGVuZ3RoKTsKLSAgICAgICAgZWxzZQorICAgICAgICAvLyBCZWNhdXNlIHdlIGtub3cg dGhlIGltcGxlbWVudGF0aW9uIG9mIHNob3VsZFVzZUNvcmVUZXh0KCksIGlmIHRoZSBmb250IGlz bid0IGZvciB0ZXh0IGNvbWJpbmUgYW5kIGl0IGlzbid0IGEgc3lzdGVtIGZvbnQsCisgICAgICAg IC8vIHdlIGtub3cgaXQgbXVzdCBoYXZlIHZlcnRpY2FsIGdseXBocy4KKyAgICAgICAgaWYgKGZv bnREYXRhLT5wbGF0Zm9ybURhdGEoKS5pc0ZvclRleHRDb21iaW5lKCkgfHwgZm9udERhdGEtPmlz U3lzdGVtRm9udCgpKQogICAgICAgICAgICAgQ1RGb250R2V0R2x5cGhzRm9yQ2hhcmFjdGVycyhm b250RGF0YS0+cGxhdGZvcm1EYXRhKCkuY3RGb250KCksIGJ1ZmZlciwgZ2x5cGhzLmRhdGEoKSwg YnVmZmVyTGVuZ3RoKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgQ1RGb250R2V0VmVydGlj YWxHbHlwaHNGb3JDaGFyYWN0ZXJzKGZvbnREYXRhLT5wbGF0Zm9ybURhdGEoKS5jdEZvbnQoKSwg YnVmZmVyLCBnbHlwaHMuZGF0YSgpLCBidWZmZXJMZW5ndGgpOwogICAgICAgICAvLyBXaGVuIGJ1 ZmZlciBjb25zaXN0cyBvZiBzdXJyb2dhdGUgcGFpcnMsIENURm9udEdldFZlcnRpY2FsR2x5cGhz Rm9yQ2hhcmFjdGVycyBhbmQgQ1RGb250R2V0R2x5cGhzRm9yQ2hhcmFjdGVycwogICAgICAgICAv LyBwbGFjZSB0aGUgZ2x5cGhzIGF0IGluZGljZXMgY29ycmVzcG9uZGluZyB0byB0aGUgZmlyc3Qg Y2hhcmFjdGVyIG9mIGVhY2ggcGFpci4KICAgICAgICAgQVNTRVJUKCEoYnVmZmVyTGVuZ3RoICUg bGVuZ3RoKSAmJiAoYnVmZmVyTGVuZ3RoIC8gbGVuZ3RoID09IDEgfHwgYnVmZmVyTGVuZ3RoIC8g bGVuZ3RoID09IDIpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJDb21iaW5lVGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQ29tYmlu ZVRleHQuY3BwCmluZGV4IDA0MDlmOGRmMmYxOTJmZDQzNTA0MTkxN2YyYzBkYTMyNGEzMjIwNjku LmUxOTBlMWNjZGVlZWExYzljNzBmNzkwNmNmZTgwMzkyNmEwMDM1YWEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJDb21iaW5lVGV4dC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckNvbWJpbmVUZXh0LmNwcApAQCAtMTE3LDcgKzExNyw3 IEBAIHZvaWQgUmVuZGVyQ29tYmluZVRleHQ6OmNvbWJpbmVUZXh0KCkKICAgICAgICAgLy8gTmVl ZCB0byB0cnkgY29tcHJlc3NlZCBnbHlwaHMuCiAgICAgICAgIHN0YXRpYyBjb25zdCBGb250V2lk dGhWYXJpYW50IHdpZHRoVmFyaWFudHNbXSA9IHsgSGFsZldpZHRoLCBUaGlyZFdpZHRoLCBRdWFy dGVyV2lkdGggfTsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDAgOyBpIDwgV1RGX0FSUkFZX0xF TkdUSCh3aWR0aFZhcmlhbnRzKSA7ICsraSkgewotICAgICAgICAgICAgZGVzY3JpcHRpb24uc2V0 V2lkdGhWYXJpYW50KHdpZHRoVmFyaWFudHNbaV0pOworICAgICAgICAgICAgZGVzY3JpcHRpb24u c2V0V2lkdGhWYXJpYW50KHdpZHRoVmFyaWFudHNbaV0pOyAvLyBXaGVuIG1vZGlmeWluZyB0aGlz LCBtYWtlIHN1cmUgdG8ga2VlcCBpdCBpbiBzeW5jIHdpdGggRm9udFBsYXRmb3JtRGF0YTo6aXNG b3JUZXh0Q29tYmluZSgpIQogCiAgICAgICAgICAgICBGb250Q2FzY2FkZSBjb21wcmVzc2VkRm9u dChkZXNjcmlwdGlvbiwgc3R5bGUoKS5mb250Q2FzY2FkZSgpLmxldHRlclNwYWNpbmcoKSwgc3R5 bGUoKS5mb250Q2FzY2FkZSgpLndvcmRTcGFjaW5nKCkpOwogICAgICAgICAgICAgY29tcHJlc3Nl ZEZvbnQudXBkYXRlKGZvbnRTZWxlY3Rvcik7Cg== 258873 2015-08-12 18:52:15 -0700 2015-08-12 19:02:25 -0700 Patch bug-147964-20150812185158.patch text/plain 9369 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4MzYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE2NDY1NDRmOTcyZmEx NzYyNDIxN2VkMTdiZDI3ZWQzZDFjNjZmOC4uNThhMTQyOGNiNTVkZmM3ZmFhNzM0ZWY3NzU4NGRh NjY5OWRmZjI0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDE1LTA4LTEyICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBb Q0pLLWNvbmZpZ3VyZWQgZGV2aWNlXSBTeXN0ZW0gZm9udCBoYXMgdmVydGljYWwgcHVuY3R1YXRp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0Nzk2 NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdseXBo UGFnZTo6ZmlsbCgpIGhhcyBtdWx0aXBsZSBjb2RlIHBhdGhzIHRvIGFjY29tcGxpc2ggaXRzIGdv YWwuIEl0IHVzZXMgdGhlIHNob3VsZFVzZUNvcmVUZXh0KCkgaGVscGVyCisgICAgICAgIGZ1bmN0 aW9uIHRvIGRldGVybWluZSB3aGljaCBvbmUgb2YgdGhlIHBhdGhzIHNob3VsZCBiZSB0YWtlbi4g SG93ZXZlciwgbm90IGFsbCBvZiB0aGUgY29kZSBwYXRocyBpbgorICAgICAgICBHbHlwaFBhZ2U6 OmZpbGwoKSBhcmUgYWJsZSBvZiBoYW5kbGluZyBhbGwgc2l0dWF0aW9ucy4gSW5kZWVkLCB0aGUg Q29yZVRleHQgY29kZSBwYXRocyBpbiBHbHlwaFBhZ2U6OmZpbGwoKQorICAgICAgICBhcmUgb25s eSBhYmxlIHRvIGhhbmRsZSB0aGUgc2l0dWF0aW9ucyB3aGljaCBzaG91bGRVc2VDb3JlVGV4dCgp IHJldHVybnMgdHJ1ZSBmb3IuIFRoaXMgaGFwcGVucyBpbiB0aGUKKyAgICAgICAgZm9sbG93aW5n IGNhc2VzOgorCisgICAgICAgIDEuIElmIHRoZSBmb250IGlzIGEgY29tcG9zaXRlIGZvbnQKKyAg ICAgICAgMi4gSWYgdGhlIGZvbnQgaXMgdXNlZCBmb3IgdGV4dC1jb21iaW5lCisgICAgICAgIDMu IElmIHRoZSBmb250IGhhcyB2ZXJ0aWNhbCBnbHlwaHMKKworICAgICAgICBJbiByMTg3NjkzLCBJ IGFkZGVkIG9uZSBtb3JlIGNhc2UgdG8gdGhpcyBsaXN0OiBJZiB0aGUgZm9udCBpcyB0aGUgc3lz dGVtIGZvbnQuIEhvd2V2ZXIsIEkgZmFpbGVkIHRvIGFkZAorICAgICAgICB0aGUgbmVjZXNzYXJ5 IHN1cHBvcnQgdG8gR2x5cGhQYWdlOjpmaWxsKCkgZm9yIHRoaXMgY2FzZS4gQmVjYXN1ZSBvZiB0 aGlzLCB3ZSBqdXN0IGhhcHBlbmVkIHRvIGZhbGwgaW50bworICAgICAgICB0aGUgY2FzZSBvZiB2 ZXJ0aWNhbCBmb250cyAoanVzdCBieSBjb2luY2lkZW5jZSksIHdoaWNoIGNhdXNlcyB1cyB0byB1 c2UKKyAgICAgICAgQ1RGb250R2V0VmVydGljYWxHbHlwaHNGb3JDaGFyYWN0ZXJzKCkgaW5zdGVh ZCBvZiBDVEZvbnRHZXRHbHlwaHNGb3JDaGFyYWN0ZXJzKCkuCisKKyAgICAgICAgVGhlIHNvbHV0 aW9uIGlzIHRvIGFkb3B0IHRoZSBzYW1lIGJlaGF2aW9yIHdlIHdlcmUgdXNpbmcgYmVmb3JlIHIx ODc2OTMuIEJhY2sgdGhlbiwgd2Ugd2VyZSB1c2luZworICAgICAgICBDR0ZvbnRHZXRHbHlwaHNG b3JVbmljaGFycygpLCB3aGljaCBhbHdheXMgcmV0dXJuZWQgaG9yaXpvbnRhbCBnbHlwaHMuIFdl IHNob3VsZCBzaW1wbHkgYWRvcHQgdGhpcyBzYW1lCisgICAgICAgIGJlaGF2aW9yLCBleGNlcHQg aW4gdGhlIENvcmUgVGV4dCBjYXNlLiBUaGVyZWZvcmUsIHRoaXMgcGF0Y2ggaXMganVzdCBhIHNp bXBsZSBjaGVjayB0byBzZWUgaWYgd2UgYXJlCisgICAgICAgIHVzaW5nIHRoZSBzeXN0ZW0gZm9u dCB3aGVuIGRldGVybWluaW5nIHdoaWNoIENvcmUgVGV4dCBmdW5jdGlvbiB0byB1c2UuCisKKyAg ICAgICAgVGVzdDogZmFzdC90ZXh0L3N5c3RlbS1mb250LXB1bmN0dWF0aW9uLmh0bWwKKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnREZXNjcmlwdGlvbi5oOgorICAgICAgICAoV2Vi Q29yZTo6Rm9udERlc2NyaXB0aW9uOjpzZXRXaWR0aFZhcmlhbnQpOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuaDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQ bGF0Zm9ybURhdGE6OmlzRm9yVGV4dENvbWJpbmUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL21hYy9HbHlwaFBhZ2VNYWMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkVXNlQ29y ZVRleHQpOgorICAgICAgICAoV2ViQ29yZTo6R2x5cGhQYWdlOjpmaWxsKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyQ29tYmluZVRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy Q29tYmluZVRleHQ6OmNvbWJpbmVUZXh0KToKKwogMjAxNS0wOC0xMiAgQW50dGkgS29pdmlzdG8g IDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgQ2FjaGVkUmVzb3VyY2UgbGVhayBpbiB2YWxp ZGF0aW9uIGNvZGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0ZvbnREZXNjcmlwdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9u dERlc2NyaXB0aW9uLmgKaW5kZXggNTc2MzI3OWY4NzgwYWJjMTVlMjBmM2YzZWM3NjVkN2NlMThl MzMxMi4uZTg3NzRkNDMyZjQ5OTM2NDczYjE4YWYwMDljNjcxZTkwZmY5NGE2NCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udERlc2NyaXB0aW9uLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udERlc2NyaXB0aW9uLmgKQEAg LTEyNCw3ICsxMjQsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRJc1NwZWNpZmllZEZvbnQoYm9v bCBpc1NwZWNpZmllZEZvbnQpIHsgbV9pc1NwZWNpZmllZEZvbnQgPSBpc1NwZWNpZmllZEZvbnQ7 IH0KICAgICB2b2lkIHNldE9yaWVudGF0aW9uKEZvbnRPcmllbnRhdGlvbiBvcmllbnRhdGlvbikg eyBtX29yaWVudGF0aW9uID0gb3JpZW50YXRpb247IH0KICAgICB2b2lkIHNldE5vbkNKS0dseXBo T3JpZW50YXRpb24oTm9uQ0pLR2x5cGhPcmllbnRhdGlvbiBvcmllbnRhdGlvbikgeyBtX25vbkNK S0dseXBoT3JpZW50YXRpb24gPSBvcmllbnRhdGlvbjsgfQotICAgIHZvaWQgc2V0V2lkdGhWYXJp YW50KEZvbnRXaWR0aFZhcmlhbnQgd2lkdGhWYXJpYW50KSB7IG1fd2lkdGhWYXJpYW50ID0gd2lk dGhWYXJpYW50OyB9CisgICAgdm9pZCBzZXRXaWR0aFZhcmlhbnQoRm9udFdpZHRoVmFyaWFudCB3 aWR0aFZhcmlhbnQpIHsgbV93aWR0aFZhcmlhbnQgPSB3aWR0aFZhcmlhbnQ7IH0gLy8gTWFrZSBz dXJlIG5ldyBjYWxsZXJzIG9mIHRoaXMgc3luYyB3aXRoIEZvbnRQbGF0Zm9ybURhdGE6OmlzRm9y VGV4dENvbWJpbmUoKSEKICAgICB2b2lkIHNldExvY2FsZShjb25zdCBBdG9taWNTdHJpbmcmKTsK ICAgICB2b2lkIHNldEZlYXR1cmVTZXR0aW5ncyhQYXNzUmVmUHRyPEZvbnRGZWF0dXJlU2V0dGlu Z3M+IHNldHRpbmdzKSB7IG1fZmVhdHVyZVNldHRpbmdzID0gc2V0dGluZ3M7IH0KICAgICB2b2lk IHNldEZvbnRTeW50aGVzaXMoRm9udFN5bnRoZXNpcyBmb250U3ludGhlc2lzKSB7IG1fZm9udFN5 bnRoZXNpcyA9IGZvbnRTeW50aGVzaXM7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0ZvbnRQbGF0Zm9ybURhdGEuaAppbmRleCA1ODUzODgzNTE4NTAyYWEyMGY5 NTEwMDRjM2VlOTA3YmVmOWNiMGI5Li40OTlmZjEyZjAyZDljNmZkOTI3MTllYjgwYWIzYWNlMGQ2 NTU1NDcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250 UGxhdGZvcm1EYXRhLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9u dFBsYXRmb3JtRGF0YS5oCkBAIC0xMzcsNiArMTM3LDcgQEAgcHVibGljOgogICAgIGJvb2wgaXND b21wb3NpdGVGb250UmVmZXJlbmNlKCkgY29uc3QgeyByZXR1cm4gbV9pc0NvbXBvc2l0ZUZvbnRS ZWZlcmVuY2U7IH0KICAgICBGb250T3JpZW50YXRpb24gb3JpZW50YXRpb24oKSBjb25zdCB7IHJl dHVybiBtX29yaWVudGF0aW9uOyB9CiAgICAgRm9udFdpZHRoVmFyaWFudCB3aWR0aFZhcmlhbnQo KSBjb25zdCB7IHJldHVybiBtX3dpZHRoVmFyaWFudDsgfQorICAgIGJvb2wgaXNGb3JUZXh0Q29t YmluZSgpIGNvbnN0IHsgcmV0dXJuIHdpZHRoVmFyaWFudCgpICE9IFJlZ3VsYXJXaWR0aDsgfSAv LyBLZWVwIGluIHN5bmMgd2l0aCBjYWxsZXJzIG9mIEZvbnREZXNjcmlwdGlvbjo6c2V0V2lkdGhW YXJpYW50KCkKIAogICAgIHZvaWQgc2V0T3JpZW50YXRpb24oRm9udE9yaWVudGF0aW9uIG9yaWVu dGF0aW9uKSB7IG1fb3JpZW50YXRpb24gPSBvcmllbnRhdGlvbjsgfQogICAgIHZvaWQgc2V0U3lu dGhldGljT2JsaXF1ZShib29sIHN5bnRoZXRpY09ibGlxdWUpIHsgbV9zeW50aGV0aWNPYmxpcXVl ID0gc3ludGhldGljT2JsaXF1ZTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvbWFjL0dseXBoUGFnZU1hYy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9tYWMvR2x5cGhQYWdlTWFjLmNwcAppbmRleCBjNzJhNzFkZmYzZTMwZWJhOTIw MTZjZmM4ODY3M2RlZjVlYTRiYzNhLi4zNGNkZjI5MjU4OThlYmYzMDRhOTZkZjEzZmNmZWYxYmYy ZjhhNzQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMv R2x5cGhQYWdlTWFjLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9t YWMvR2x5cGhQYWdlTWFjLmNwcApAQCAtNDIsOSArNDIsMTIgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogCiBzdGF0aWMgYm9vbCBzaG91bGRVc2VDb3JlVGV4dChjb25zdCBVQ2hhciogYnVmZmVyLCB1 bnNpZ25lZCBidWZmZXJMZW5ndGgsIGNvbnN0IEZvbnQqIGZvbnREYXRhKQogeworICAgIC8vIFRo aXMgbmVlZHMgdG8gYmUga2VwdCBpbiBzeW5jIHdpdGggR2x5cGhQYWdlOjpmaWxsKCkuIEN1cnJl bnRseSwgdGhlIENvcmVUZXh0IHBhdGhzIGFyZSBub3QgYWJsZSB0byBoYW5kbGUKKyAgICAvLyBl dmVyeSBzaXR1dGF0aW9uLiBSZXR1cm5pbmcgdHJ1ZSBmcm9tIHRoaXMgZnVuY3Rpb24gaW4gYSBu ZXcgc2l0dWF0aW9uIHdpbGwgcmVxdWlyZSB5b3UgdG8gZXhwbGljaXRseSBhZGQKKyAgICAvLyBo YW5kbGluZyBmb3IgdGhhdCBzaXR1YXRpb24gaW4gdGhlIENvcmVUZXh0IHBhdGhzIG9mIEdseXBo UGFnZTo6ZmlsbCgpLgogICAgIGlmIChmb250RGF0YS0+cGxhdGZvcm1EYXRhKCkuaXNDb21wb3Np dGVGb250UmVmZXJlbmNlKCkgfHwgZm9udERhdGEtPmlzU3lzdGVtRm9udCgpKQogICAgICAgICBy ZXR1cm4gdHJ1ZTsKLSAgICBpZiAoZm9udERhdGEtPnBsYXRmb3JtRGF0YSgpLndpZHRoVmFyaWFu dCgpICE9IFJlZ3VsYXJXaWR0aCB8fCBmb250RGF0YS0+aGFzVmVydGljYWxHbHlwaHMoKSkgewor ICAgIGlmIChmb250RGF0YS0+cGxhdGZvcm1EYXRhKCkuaXNGb3JUZXh0Q29tYmluZSgpIHx8IGZv bnREYXRhLT5oYXNWZXJ0aWNhbEdseXBocygpKSB7CiAgICAgICAgIC8vIElkZW9ncmFwaHMgZG9u J3QgaGF2ZSBhIHZlcnRpY2FsIHZhcmlhbnQgb3Igd2lkdGggdmFyaWFudHMuCiAgICAgICAgIGZv ciAodW5zaWduZWQgaSA9IDA7IGkgPCBidWZmZXJMZW5ndGg7ICsraSkgewogICAgICAgICAgICAg aWYgKCFGb250Q2FzY2FkZTo6aXNDSktJZGVvZ3JhcGgoYnVmZmVyW2ldKSkKQEAgLTg4LDEwICs5 MSwxMiBAQCBib29sIEdseXBoUGFnZTo6ZmlsbCh1bnNpZ25lZCBvZmZzZXQsIHVuc2lnbmVkIGxl bmd0aCwgVUNoYXIqIGJ1ZmZlciwgdW5zaWduZWQgYgogICAgICAgICAgICAgfQogICAgICAgICB9 CiAgICAgfSBlbHNlIGlmICghZm9udERhdGEtPnBsYXRmb3JtRGF0YSgpLmlzQ29tcG9zaXRlRm9u dFJlZmVyZW5jZSgpKSB7Ci0gICAgICAgIGlmIChmb250RGF0YS0+cGxhdGZvcm1EYXRhKCkud2lk dGhWYXJpYW50KCkgPT0gUmVndWxhcldpZHRoKQotICAgICAgICAgICAgQ1RGb250R2V0VmVydGlj YWxHbHlwaHNGb3JDaGFyYWN0ZXJzKGZvbnREYXRhLT5wbGF0Zm9ybURhdGEoKS5jdEZvbnQoKSwg YnVmZmVyLCBnbHlwaHMuZGF0YSgpLCBidWZmZXJMZW5ndGgpOwotICAgICAgICBlbHNlCisgICAg ICAgIC8vIEJlY2F1c2Ugd2Uga25vdyB0aGUgaW1wbGVtZW50YXRpb24gb2Ygc2hvdWxkVXNlQ29y ZVRleHQoKSwgaWYgdGhlIGZvbnQgaXNuJ3QgZm9yIHRleHQgY29tYmluZSBhbmQgaXQgaXNuJ3Qg YSBzeXN0ZW0gZm9udCwKKyAgICAgICAgLy8gd2Uga25vdyBpdCBtdXN0IGhhdmUgdmVydGljYWwg Z2x5cGhzLgorICAgICAgICBpZiAoZm9udERhdGEtPnBsYXRmb3JtRGF0YSgpLmlzRm9yVGV4dENv bWJpbmUoKSB8fCBmb250RGF0YS0+aXNTeXN0ZW1Gb250KCkpCiAgICAgICAgICAgICBDVEZvbnRH ZXRHbHlwaHNGb3JDaGFyYWN0ZXJzKGZvbnREYXRhLT5wbGF0Zm9ybURhdGEoKS5jdEZvbnQoKSwg YnVmZmVyLCBnbHlwaHMuZGF0YSgpLCBidWZmZXJMZW5ndGgpOworICAgICAgICBlbHNlCisgICAg ICAgICAgICBDVEZvbnRHZXRWZXJ0aWNhbEdseXBoc0ZvckNoYXJhY3RlcnMoZm9udERhdGEtPnBs YXRmb3JtRGF0YSgpLmN0Rm9udCgpLCBidWZmZXIsIGdseXBocy5kYXRhKCksIGJ1ZmZlckxlbmd0 aCk7CiAgICAgICAgIC8vIFdoZW4gYnVmZmVyIGNvbnNpc3RzIG9mIHN1cnJvZ2F0ZSBwYWlycywg Q1RGb250R2V0VmVydGljYWxHbHlwaHNGb3JDaGFyYWN0ZXJzIGFuZCBDVEZvbnRHZXRHbHlwaHNG b3JDaGFyYWN0ZXJzCiAgICAgICAgIC8vIHBsYWNlIHRoZSBnbHlwaHMgYXQgaW5kaWNlcyBjb3Jy ZXNwb25kaW5nIHRvIHRoZSBmaXJzdCBjaGFyYWN0ZXIgb2YgZWFjaCBwYWlyLgogICAgICAgICBB U1NFUlQoIShidWZmZXJMZW5ndGggJSBsZW5ndGgpICYmIChidWZmZXJMZW5ndGggLyBsZW5ndGgg PT0gMSB8fCBidWZmZXJMZW5ndGggLyBsZW5ndGggPT0gMikpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckNvbWJpbmVUZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJDb21iaW5lVGV4dC5jcHAKaW5kZXggMDQwOWY4ZGYyZjE5MmZkNDM1 MDQxOTE3ZjJjMGRhMzI0YTMyMjA2OS4uZTE5MGUxY2NkZWVlYTFjOWM3MGY3OTA2Y2ZlODAzOTI2 YTAwMzVhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckNvbWJp bmVUZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQ29tYmluZVRl eHQuY3BwCkBAIC0xMTcsNyArMTE3LDcgQEAgdm9pZCBSZW5kZXJDb21iaW5lVGV4dDo6Y29tYmlu ZVRleHQoKQogICAgICAgICAvLyBOZWVkIHRvIHRyeSBjb21wcmVzc2VkIGdseXBocy4KICAgICAg ICAgc3RhdGljIGNvbnN0IEZvbnRXaWR0aFZhcmlhbnQgd2lkdGhWYXJpYW50c1tdID0geyBIYWxm V2lkdGgsIFRoaXJkV2lkdGgsIFF1YXJ0ZXJXaWR0aCB9OwogICAgICAgICBmb3IgKHNpemVfdCBp ID0gMCA7IGkgPCBXVEZfQVJSQVlfTEVOR1RIKHdpZHRoVmFyaWFudHMpIDsgKytpKSB7Ci0gICAg ICAgICAgICBkZXNjcmlwdGlvbi5zZXRXaWR0aFZhcmlhbnQod2lkdGhWYXJpYW50c1tpXSk7Cisg ICAgICAgICAgICBkZXNjcmlwdGlvbi5zZXRXaWR0aFZhcmlhbnQod2lkdGhWYXJpYW50c1tpXSk7 IC8vIFdoZW4gbW9kaWZ5aW5nIHRoaXMsIG1ha2Ugc3VyZSB0byBrZWVwIGl0IGluIHN5bmMgd2l0 aCBGb250UGxhdGZvcm1EYXRhOjppc0ZvclRleHRDb21iaW5lKCkhCiAKICAgICAgICAgICAgIEZv bnRDYXNjYWRlIGNvbXByZXNzZWRGb250KGRlc2NyaXB0aW9uLCBzdHlsZSgpLmZvbnRDYXNjYWRl KCkubGV0dGVyU3BhY2luZygpLCBzdHlsZSgpLmZvbnRDYXNjYWRlKCkud29yZFNwYWNpbmcoKSk7 CiAgICAgICAgICAgICBjb21wcmVzc2VkRm9udC51cGRhdGUoZm9udFNlbGVjdG9yKTsKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCA5Y2I2NDExNWNiYmNhMjJkNzk0NjdkYjY2Y2M3YWQ0NDU0ZmEzY2I3Li5lYWQ4MGJkNmE4MDc3 MDdmYjQzYWFlZWEyYTBjZGQ3NDhmNmI1NWUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTUt MDgtMTIgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAg ICBbQ29jb2FdIFtDSkstY29uZmlndXJlZCBkZXZpY2VdIFN5c3RlbSBmb250IGhhcyB2ZXJ0aWNh bCBwdW5jdHVhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQ3OTY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgTWFrZSBzdXJlIHB1bmN0dWF0aW9uIGlzbid0IHZlcnRpY2FsLgorCisgICAgICAgICog ZmFzdC90ZXh0L3N5c3RlbS1mb250LXB1bmN0dWF0aW9uLmh0bWw6IEFkZGVkLgorCiAyMDE1LTA4 LTEyICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBDYWNoZWRS ZXNvdXJjZSBsZWFrIGluIHZhbGlkYXRpb24gY29kZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC90ZXh0L3N5c3RlbS1mb250LXB1bmN0dWF0aW9uLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0 L3RleHQvc3lzdGVtLWZvbnQtcHVuY3R1YXRpb24uaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43ODlkMTk2NGFh MmU0ZDI5YmY0YjVmZTk4YzY0ZjI3ZWY2YWVhNDYxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC90ZXh0L3N5c3RlbS1mb250LXB1bmN0dWF0aW9uLmh0bWwKQEAgLTAsMCArMSw3 IEBACis8IURPQ1RZUEU+Cis8aHRtbD4KKzxib2R5PgorVGhpcyB0ZXN0IG1ha2VzIHN1cmUgcHVu Y3R1YXRpb24gbGFpZCBvdXQgd2l0aCB0aGUgc3lzdGVtIGZvbnQgZG9lcyBub3QgdXNlIHZlcnRp Y2FsIGdseXBocy4gVGhlIHRlc3QgcGFzc2VzIGlmIHRoZSBzZW1pY29sb24gYmVsb3cgbG9va3Mg bGlrZSBhIHJlZ3VsYXIgaG9yaXpvbnRhbCBzZW1pY29sb24gKDspIGFuZCBpcyBub3Qgc2lkZXdh eXMuCis8ZGl2IHN0eWxlPSJmb250OiA1MHB4IFVJQ1RGb250VGV4dFN0eWxlQm9keTsiPjs8L2Rp dj4KKzwvYm9keT4KKzwvaHRtbD4K