6400 2006-01-06 14:03:01 -0800 CSS 2.1 tests are too dependent on machine fonts 2010-06-10 15:30:52 -0700 1 1 1 Unclassified WebKit Tools / Tests 420+ Mac OS X 10.4 NEW P2 Normal --- 6530 6524 1 ap webkit-unassigned bdakin cryo ian mitz oldest_to_newest 27869 0 ap 2006-01-06 14:03:01 -0800 Some CSS 2.1 tests use fancy characters that aren't present in Times font. Depending on which fonts are installed on the machine, different results are generated. Unless it's possible to somehow control font fallback in DRT, we may need to replace the characters with something less fancy. Hixie said: "if you can make an exact list of which tests suffer from this problem, and if you can provide a list of cute glyphs that don't suffer from this problem, then mail the public-css-test@w3.org list". Tests currently known to be affected: css2.1/t0905-c414-flt-00-d.html css2.1/t0805-c5519-brdr-r-01-e.html css2.1/t0905-c5525-fltblck-00-d-ag.html 27989 1 ap 2006-01-08 09:01:20 -0800 WebTextRenderer uses SPIs to find substitute fonts (WKGetFontInLanguageForRange(), WKGetFontInLanguageForCharacter()). ATSUI has an explicit way to control font fallback <http:// developer.apple.com/documentation/Carbon/Conceptual/ATSUI_Concepts/atsui_chap6/ chapter_6_section_2.html>; don't know about AppKit SPIs. There appear to be several possible solutions: 1) Just modify the tests, so that font fallback isn't needed. 2) Find an appropriate AppKit SPI or rewrite WKGetFontInLanguageFor...() using ATSUI, giving a predefined list of allowed fallback fonts when running in DRT. 3) Make findSubstituteFont() try common Apple fonts after the CSS family fallback list, but before the system-provided fallback when running in DRT. 28044 2 ap 2006-01-09 05:03:43 -0800 fast/parser/entities-in-xhtml.xhtml also has this issue 28069 3 5574 ap 2006-01-09 12:47:54 -0800 Created attachment 5574 proposed fix Apparently, it's not possible to match AppKit font fallback with a simple list, but only a few results changed with such an implementation, so it might actually be OK: fast/block/positioning/047.html - results changed inconsequentially fast/xsl/xslt-text.xml - results changed inconsequentially css2.1/t0905-c5525-fltblck-00-d-ag.html - results were incorrect (taken with Arial Unicode MS; correct results didn't change) css2.1/t0805-c5519-brdr-r-01-e.html - results were incorrect (taken with Arial Unicode MS; correct results didn't change) svg/W3C-SVG-1.1/text-fonts-01-t.svg - results were and still are machine-dependent (because CSS styles have fonts that are not present on all machines) svg/W3C-SVG-1.1/text-intro-01-t.svg - ditto svg/W3C-SVG-1.1/text-intro-02-b.svg - ditto svg/W3C-SVG-1.1/text-intro-03-b.svg - ditto svg/W3C-SVG-1.1/text-intro-04-t.svg - ditto There is a rather strange problem with WebTextRendererFactory - it wouldn't see that Monaco is a fixed pitch font. Furthermore, a similar problem apparently exists for Osaka-Mono, but I couldn't understand how (and if) the workaround for it works, so I had to add some slightly different code. 28391 4 5574 darin 2006-01-13 22:56:39 -0800 Comment on attachment 5574 proposed fix I like the idea of altering the fallback behavior to behave in a fixed way during the layout tests. But this does prevent us from doing any testing of the font substitution machinery in layout tests, so I'm a bit ambivalent about it. I'd really like to see us have a consistent rule about fallback even outside layout tests. I think the Monaco fix should be handled separately. 28395 5 5574 ap 2006-01-14 01:02:35 -0800 Comment on attachment 5574 proposed fix Removing the review flag to factor out the Monaco fix, and to consider fixing bug 6524 along these lines. 40317 6 ap 2006-04-24 02:19:33 -0700 *** Bug 8559 has been marked as a duplicate of this bug. *** 40319 7 ap 2006-04-24 02:22:20 -0700 *** Bug 8560 has been marked as a duplicate of this bug. *** 71601 8 mitz 2008-02-23 09:49:54 -0800 This has been addressed for Windows using a per-directory prologue, a persistent user style sheet in DumpRenderTree and @font-face rules with unicode-range. <http://trac.webkit.org/projects/webkit/changeset/29822> 5574 2006-01-09 12:47:54 -0800 2010-06-10 15:30:52 -0700 proposed fix 6400r1.txt text/plain 11476 ap SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L0NoYW5nZUxvZwko cmV2aXNpb24gMTE5NTcpCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMzAgQEAKKzIwMDYtMDEtWFggIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBueXBvcC5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTKS4KKworICAgICAgICAtIEZp eCBodHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hvd19idWcuY2dpP2lkPTY0MDAKKyAg ICAgICAgQ1NTIDIuMSB0ZXN0cyBhcmUgdG9vIGRlcGVuZGVudCBvbiBtYWNoaW5lIGZvbnRzCisK KyAgICAgICAgSW50cm9kdWNlcyBhIG5ldyBwcml2YXRlIHByZWZlcmVuY2UsIHdoaWNoIGhvbGRz IGEgbGlzdCBvZiBmb250cyB0byBiZSB1c2VkIGZvciBmYWxsYmFjayAoaWYgbm9uLWVtcHR5KS4K KworICAgICAgICAqIFdlYlZpZXcuc3VicHJvai9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaDogCisg ICAgICAgIEFkZGVkIGZvbnRGYWxsYmFja0xpc3QgYW5kIHNldEZvbnRGYWxsYmFja0xpc3Q6Lgor CisgICAgICAgICogV2ViVmlldy5zdWJwcm9qL1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oOgor ICAgICAgICBBZGRlZCBXZWJLaXRGb250RmFsbGJhY2tMaXN0UHJlZmVyZW5jZUtleS4KKworICAg ICAgICAqIFdlYlZpZXcuc3VicHJvai9XZWJQcmVmZXJlbmNlcy5tOgorICAgICAgICAoLVtXZWJQ cmVmZXJlbmNlcyBpbml0aWFsaXplXSk6IEluaXRpYWxpemUgV2ViS2l0Rm9udEZhbGxiYWNrTGlz dFByZWZlcmVuY2VLZXkuCisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIF9zZXRPYmplY3RWYWx1 ZTpmb3JLZXk6XSk6IE5ldyBtZXRob2QuCisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIGZvbnRG YWxsYmFja0xpc3RdKTogRGl0dG8uCisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIHNldEZvbnRG YWxsYmFja0xpc3Q6XSk6IERpdHRvLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQuc3VicHJv ai9XZWJUZXh0UmVuZGVyZXIubTogZmluZFN1YnN0aXR1dGVGb250KCk6CisgICAgICAgIEF0dGVt cHQgdG8gdXNlIHNwZWNpZmllZCBmYWxsYmFjayBmb250cyBpcyB0aGUgbGlzdCBpcyBub24tZW1w dHk7IG90aGVyd2lzZSwgdXNlIGEgc3lzdGVtLXByb3ZpZGVkIGZhbGxiYWNrLgorCisgICAgICAg ICogV2ViQ29yZVN1cHBvcnQuc3VicHJvai9XZWJUZXh0UmVuZGVyZXJGYWN0b3J5Lm06ICgtW1dl YlRleHRSZW5kZXJlckZhY3RvcnkgIGZvbnRXaXRoRmFtaWx5OnRyYWl0czpzaXplOl0pOgorICAg ICAgICBUcmVhdCBNb25hY28gYXMgZml4ZWQgcGl0Y2guCisKIDIwMDYtMDEtMDkgIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBueXBvcC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFjaWVq LgpJbmRleDogV2ViS2l0L1dlYlZpZXcuc3VicHJvai9XZWJQcmVmZXJlbmNlc1ByaXZhdGUuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQvV2ViVmlldy5zdWJwcm9qL1dlYlByZWZlcmVuY2VzUHJpdmF0 ZS5oCShyZXZpc2lvbiAxMTk1NykKKysrIFdlYktpdC9XZWJWaWV3LnN1YnByb2ovV2ViUHJlZmVy ZW5jZXNQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTYxLDYgKzYxLDkgQEAKIC0gKGZsb2F0 KVBERlNjYWxlRmFjdG9yOwogLSAodm9pZClzZXRQREZTY2FsZUZhY3RvcjooZmxvYXQpc2NhbGU7 CiAKKy0gKE5TQXJyYXkgKilmb250RmFsbGJhY2tMaXN0OworLSAodm9pZClzZXRGb250RmFsbGJh Y2tMaXN0OihOU0FycmF5ICopZm9udE5hbWVzOworCiAvLyBPdGhlciBwcml2YXRlIG1ldGhvZHMK IC0gKHNpemVfdClfcGFnZUNhY2hlU2l6ZTsKIC0gKHNpemVfdClfb2JqZWN0Q2FjaGVTaXplOwpJ bmRleDogV2ViS2l0L1dlYlZpZXcuc3VicHJvai9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQvV2ViVmlldy5zdWJwcm9qL1dlYlByZWZlcmVuY2VLZXlzUHJp dmF0ZS5oCShyZXZpc2lvbiAxMTk1NykKKysrIFdlYktpdC9XZWJWaWV3LnN1YnByb2ovV2ViUHJl ZmVyZW5jZUtleXNQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTY0LDMgKzY0LDQgQEAKICNk ZWZpbmUgV2ViS2l0U2hvd3NVUkxzSW5Ub29sVGlwc1ByZWZlcmVuY2VLZXkgQCJXZWJLaXRTaG93 c1VSTHNJblRvb2xUaXBzIgogI2RlZmluZSBXZWJLaXRQREZEaXNwbGF5TW9kZVByZWZlcmVuY2VL ZXkgQCJXZWJLaXRQREZEaXNwbGF5TW9kZSIKICNkZWZpbmUgV2ViS2l0UERGU2NhbGVGYWN0b3JQ cmVmZXJlbmNlS2V5IEAiV2ViS2l0UERGU2NhbGVGYWN0b3IiCisjZGVmaW5lIFdlYktpdEZvbnRG YWxsYmFja0xpc3RQcmVmZXJlbmNlS2V5IEAiV2ViS2l0Rm9udEZhbGxiYWNrTGlzdCIKSW5kZXg6 IFdlYktpdC9XZWJWaWV3LnN1YnByb2ovV2ViUHJlZmVyZW5jZXMubQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvV2ViVmlldy5zdWJwcm9qL1dlYlByZWZlcmVuY2VzLm0JKHJldmlzaW9uIDExOTU3KQor KysgV2ViS2l0L1dlYlZpZXcuc3VicHJvai9XZWJQcmVmZXJlbmNlcy5tCSh3b3JraW5nIGNvcHkp CkBAIC03MSw2ICs3MSw4IEBAIGVudW0geyBXZWJQcmVmZXJlbmNlc1ZlcnNpb24gPSAxIH07CiBA aW50ZXJmYWNlIFdlYlByZWZlcmVuY2VzIChXZWJGb3J3YXJkRGVjbGFyYXRpb25zKQogLy8gVGhp cyBwc2V1ZG8tY2F0ZWdvcnkgaXMgbmVlZGVkIHNvIHRoZXNlIG1ldGhvZHMgY2FuIGJlIHVzZWQg ZnJvbSB3aXRoaW4gb3RoZXIgY2F0ZWdvcnkgaW1wbGVtZW50YXRpb25zCiAvLyB3aXRob3V0IGJl aW5nIGluIHRoZSBwdWJsaWMgaGVhZGVyIGZpbGUuCistIChpZClfdmFsdWVGb3JLZXk6KE5TU3Ry aW5nICopa2V5OworLSAodm9pZClfc2V0T2JqZWN0VmFsdWU6KGlkKXZhbHVlIGZvcktleTooTlNT dHJpbmcgKilrZXk7CiAtIChCT09MKV9ib29sVmFsdWVGb3JLZXk6KE5TU3RyaW5nICopa2V5Owog LSAodm9pZClfc2V0Qm9vbFZhbHVlOihCT09MKXZhbHVlIGZvcktleTooTlNTdHJpbmcgKilrZXk7 CiAtIChpbnQpX2ludGVnZXJWYWx1ZUZvcktleTooTlNTdHJpbmcgKilrZXk7CkBAIC0yMzIsNiAr MjM0LDcgQEAgTlNfRU5ESEFORExFUgogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6 Tk9dLCAgIFdlYktpdFNob3dzVVJMc0luVG9vbFRpcHNQcmVmZXJlbmNlS2V5LAogICAgICAgICBA IjEiLCAgICAgICAgICAgICAgICAgICAgICAgICAgIFdlYktpdFBERkRpc3BsYXlNb2RlUHJlZmVy ZW5jZUtleSwKICAgICAgICAgQCIxLjAiLCAgICAgICAgICAgICAgICAgICAgICAgICBXZWJLaXRQ REZTY2FsZUZhY3RvclByZWZlcmVuY2VLZXksCisgICAgICAgIFtOU0FycmF5IGFycmF5XSwgICAg ICAgICAgICAgICAgV2ViS2l0Rm9udEZhbGxiYWNrTGlzdFByZWZlcmVuY2VLZXksCiAgICAgICAg IG5pbF07CiAKICAgICAvLyBUaGlzIHZhbHVlIHNob3VsZG4ndCBldmVyIGNoYW5nZSwgd2hpY2gg aXMgYXNzdW1lZCBpbiB0aGUgaW5pdGlhbGl6YXRpb24gb2YgV2ViS2l0UERGRGlzcGxheU1vZGVQ cmVmZXJlbmNlS2V5IGFib3ZlCkBAIC0yNjIsNiArMjY1LDE1IEBAIE5TX0VOREhBTkRMRVIKICAg ICByZXR1cm4gbzsKIH0KIAorLSAodm9pZClfc2V0T2JqZWN0VmFsdWU6KGlkKXZhbHVlIGZvcktl eTooTlNTdHJpbmcgKilrZXkKK3sKKyAgICBOU1N0cmluZyAqX2tleSA9IEtFWShrZXkpOworICAg IFtfcHJpdmF0ZS0+dmFsdWVzIHNldE9iamVjdDp2YWx1ZSBmb3JLZXk6X2tleV07CisgICAgaWYg KF9wcml2YXRlLT5hdXRvc2F2ZXMpCisgICAgICAgIFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRV c2VyRGVmYXVsdHNdIHNldE9iamVjdDp2YWx1ZSBmb3JLZXk6X2tleV07CisgICAgW3NlbGYgX3Bv c3RQcmVmZXJlbmNlc0NoYW5nZXNOb3RpZmljYXRpb25dOworfQorCiAtIChOU1N0cmluZyAqKV9z dHJpbmdWYWx1ZUZvcktleTooTlNTdHJpbmcgKilrZXkKIHsKICAgICBpZCBzID0gW3NlbGYgX3Zh bHVlRm9yS2V5OmtleV07CkBAIC02NTgsNiArNjcwLDE5IEBAIE5TX0VOREhBTkRMRVIKICAgICBb c2VsZiBfc2V0SW50ZWdlclZhbHVlOm1vZGUgZm9yS2V5OldlYktpdFBERkRpc3BsYXlNb2RlUHJl ZmVyZW5jZUtleV07CiB9CiAKKy0gKE5TQXJyYXkgKilmb250RmFsbGJhY2tMaXN0Cit7CisgICAg aWQgdmFsdWUgPSBbc2VsZiBfdmFsdWVGb3JLZXk6V2ViS2l0Rm9udEZhbGxiYWNrTGlzdFByZWZl cmVuY2VLZXldOworICAgIGlmIChbdmFsdWUgaXNLaW5kT2ZDbGFzczpbTlNBcnJheSBjbGFzc11d KQorICAgICAgICByZXR1cm4gKE5TQXJyYXkgKil2YWx1ZTsKKyAgICByZXR1cm4gbmlsOworfQor CistICh2b2lkKXNldEZvbnRGYWxsYmFja0xpc3Q6KE5TQXJyYXkgKilmb250TmFtZXMKK3sKKyAg ICBbc2VsZiBfc2V0T2JqZWN0VmFsdWU6Zm9udE5hbWVzIGZvcktleTpXZWJLaXRGb250RmFsbGJh Y2tMaXN0UHJlZmVyZW5jZUtleV07Cit9CisKIHN0YXRpYyBOU011dGFibGVEaWN0aW9uYXJ5ICp3 ZWJQcmVmZXJlbmNlc0luc3RhbmNlcyA9IG5pbDsKIAogKyAoV2ViUHJlZmVyZW5jZXMgKilfZ2V0 SW5zdGFuY2VGb3JJZGVudGlmaWVyOihOU1N0cmluZyAqKWlkZW50CkluZGV4OiBXZWJLaXQvV2Vi Q29yZVN1cHBvcnQuc3VicHJvai9XZWJUZXh0UmVuZGVyZXJGYWN0b3J5Lm0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViS2l0L1dlYkNvcmVTdXBwb3J0LnN1YnByb2ovV2ViVGV4dFJlbmRlcmVyRmFjdG9yeS5t CShyZXZpc2lvbiAxMTk1NykKKysrIFdlYktpdC9XZWJDb3JlU3VwcG9ydC5zdWJwcm9qL1dlYlRl eHRSZW5kZXJlckZhY3RvcnkubQkod29ya2luZyBjb3B5KQpAQCAtNDMzLDYgKzQzMywxMCBAQCBz dGF0aWMgQk9PTCBiZXR0ZXJDaG9pY2UoTlNGb250VHJhaXRNYXNrCiAgICAgICAgICAgICAgICAg cmV0dXJuIG5hbWVNYXRjaGVkRm9udDsKICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgaWYg KFtkZXNpcmVkRmFtaWx5IGNhc2VJbnNlbnNpdGl2ZUNvbXBhcmU6QCJNb25hY28iXSA9PSBOU09y ZGVyZWRTYW1lICYmIGRlc2lyZWRUcmFpdHMgPT0gKFtmb250TWFuYWdlciB0cmFpdHNPZkZvbnQ6 bmFtZU1hdGNoZWRGb250XSB8IE5TRml4ZWRQaXRjaEZvbnRNYXNrKSkgeworICAgICAgICAgICAg ICAgIExPRyAoRm9udFNlbGVjdGlvbiwgImZvdW5kIGV4YWN0IG1hdGNoIGZvciBNb25hY29cbiIp OworICAgICAgICAgICAgICAgIHJldHVybiBuYW1lTWF0Y2hlZEZvbnQ7CisgICAgICAgICAgICB9 CiAgICAgICAgICAgICBOU0ZvbnRUcmFpdE1hc2sgdHJhaXRzID0gW2ZvbnRNYW5hZ2VyIHRyYWl0 c09mRm9udDpuYW1lTWF0Y2hlZEZvbnRdOwogICAgICAgICAgICAgCiAgICAgICAgICAgICBpZiAo KHRyYWl0cyAmIGRlc2lyZWRUcmFpdHMpID09IGRlc2lyZWRUcmFpdHMpewpJbmRleDogV2ViS2l0 L1dlYkNvcmVTdXBwb3J0LnN1YnByb2ovV2ViVGV4dFJlbmRlcmVyLm0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0L1dlYkNvcmVTdXBwb3J0LnN1YnByb2ovV2ViVGV4dFJlbmRlcmVyLm0JKHJldmlzaW9u IDExOTU3KQorKysgV2ViS2l0L1dlYkNvcmVTdXBwb3J0LnN1YnByb2ovV2ViVGV4dFJlbmRlcmVy Lm0JKHdvcmtpbmcgY29weSkKQEAgLTM3LDYgKzM3LDcgQEAKICNpbXBvcnQgPFdlYktpdC9XZWJO U09iamVjdEV4dHJhcy5oPgogI2ltcG9ydCA8V2ViS2l0L1dlYlRleHRSZW5kZXJlckZhY3Rvcnku aD4KICNpbXBvcnQgPFdlYktpdC9XZWJWaWV3UHJpdmF0ZS5oPgorI2ltcG9ydCA8V2ViS2l0L1dl YlByZWZlcmVuY2VzUHJpdmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0U3lzdGVtSW50ZXJmYWNlLmg+ CiAKICNpbXBvcnQgPGZsb2F0Lmg+CkBAIC03MjEsMTQgKzcyMiwzMSBAQCBzdGF0aWMgTlNGb250 ICpmaW5kU3Vic3RpdHV0ZUZvbnQoV2ViVGV4CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg fQogICAgIH0KLSAgICAKLSAgICAvLyBOb3cgZG8gc3RyaW5nIGJhc2VkIGxvb2t1cC4KLSAgICBp ZiAoc3Vic3RpdHV0ZUZvbnQgPT0gbmlsKQotICAgICAgICBzdWJzdGl0dXRlRm9udCA9IFdLR2V0 Rm9udEluTGFuZ3VhZ2VGb3JSYW5nZShyZW5kZXJlci0+Zm9udC5mb250LCBzdHJpbmcsIE5TTWFr ZVJhbmdlKDAsIFtzdHJpbmcgbGVuZ3RoXSkpOwotCi0gICAgLy8gTm93IGRvIGNoYXJhY3RlciBi YXNlZCBsb29rdXAuCi0gICAgaWYgKHN1YnN0aXR1dGVGb250ID09IG5pbCAmJiBbc3RyaW5nIGxl bmd0aF0gPT0gMSkKLSAgICAgICAgc3Vic3RpdHV0ZUZvbnQgPSBXS0dldEZvbnRJbkxhbmd1YWdl Rm9yQ2hhcmFjdGVyKHJlbmRlcmVyLT5mb250LmZvbnQsIFtzdHJpbmcgY2hhcmFjdGVyQXRJbmRl eDowXSk7CisKKyAgICBOU0FycmF5ICpmb250RmFsbGJhY2tMaXN0ID0gW1tXZWJQcmVmZXJlbmNl cyBzdGFuZGFyZFByZWZlcmVuY2VzXSBmb250RmFsbGJhY2tMaXN0XTsKKyAgICB1bnNpZ25lZCBm b250RmFsbGJhY2tGb250c0NvdW50ID0gW2ZvbnRGYWxsYmFja0xpc3QgY291bnRdOworICAgIGlm IChmb250RmFsbGJhY2tGb250c0NvdW50ICE9IDApIHsKKyAgICAgICAgLy8gYSBjdXN0b20gZm9u dCBmYWxsYmFjayBsaXN0IGhhcyBiZWVuIHByb3ZpZGVkIChtb3N0IGxpa2VseSwgZnJvbSBEdW1w UmVuZGVyVHJlZSksIHNvIHdlIGRvbid0IHVzZSBzeXN0ZW0gZmFsbGJhY2sKKyAgICAgICAgaWYg KHN1YnN0aXR1dGVGb250ID09IG5pbCkgeworICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0g MDsgaSA8IGZvbnRGYWxsYmFja0ZvbnRzQ291bnQ7ICsraSkgeworICAgICAgICAgICAgICAgIE5T Rm9udCAqZiA9IFtbV2ViVGV4dFJlbmRlcmVyRmFjdG9yeSBzaGFyZWRGYWN0b3J5XSBjYWNoZWRG b250RnJvbUZhbWlseTpbZm9udEZhbGxiYWNrTGlzdCBvYmplY3RBdEluZGV4OmldCisgICAgICAg ICAgICAgICAgICAgIHRyYWl0czpbW05TRm9udE1hbmFnZXIgc2hhcmVkRm9udE1hbmFnZXJdIHRy YWl0c09mRm9udDpyZW5kZXJlci0+Zm9udC5mb250XQorICAgICAgICAgICAgICAgICAgICBzaXpl OltyZW5kZXJlci0+Zm9udC5mb250IHBvaW50U2l6ZV1dOworICAgICAgICAgICAgICAgIGlmIChm ICYmIGZvbnRDb250YWluc1N0cmluZyhmLCBzdHJpbmcpKSB7CisgICAgICAgICAgICAgICAgICAg IHN1YnN0aXR1dGVGb250ID0gZjsgCisgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAg ICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0gZWxzZSB7CisgICAg ICAgIC8vIE5vdyBkbyBzdHJpbmcgYmFzZWQgbG9va3VwLgorICAgICAgICBpZiAoc3Vic3RpdHV0 ZUZvbnQgPT0gbmlsKQorICAgICAgICAgICAgc3Vic3RpdHV0ZUZvbnQgPSBXS0dldEZvbnRJbkxh bmd1YWdlRm9yUmFuZ2UocmVuZGVyZXItPmZvbnQuZm9udCwgc3RyaW5nLCBOU01ha2VSYW5nZSgw LCBbc3RyaW5nIGxlbmd0aF0pKTsKKworICAgICAgICAvLyBOb3cgZG8gY2hhcmFjdGVyIGJhc2Vk IGxvb2t1cC4KKyAgICAgICAgaWYgKHN1YnN0aXR1dGVGb250ID09IG5pbCAmJiBbc3RyaW5nIGxl bmd0aF0gPT0gMSkKKyAgICAgICAgICAgIHN1YnN0aXR1dGVGb250ID0gV0tHZXRGb250SW5MYW5n dWFnZUZvckNoYXJhY3RlcihyZW5kZXJlci0+Zm9udC5mb250LCBbc3RyaW5nIGNoYXJhY3RlckF0 SW5kZXg6MF0pOworICAgIH0KIAogICAgIC8vIENoZWNrIHRvIG1ha2Ugc3VyZSB0aGlzIGlzIGEg ZGlzdGluY3QgZm9udC4KICAgICBpZiAoc3Vic3RpdHV0ZUZvbnQgJiYgW1tzdWJzdGl0dXRlRm9u dCBzY3JlZW5Gb250XSBpc0VxdWFsOltyZW5kZXJlci0+Zm9udC5mb250IHNjcmVlbkZvbnRdXSkK SW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLm0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUubQkocmV2 aXNpb24gMTE5NTcpCisrKyBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJl ZS5tCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw3ICszMiw3IEBACiAjaW1wb3J0IDxXZWJLaXQvV2Vi RGF0YVNvdXJjZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dlYkVkaXRpbmdEZWxlZ2F0ZS5oPgogI2lt cG9ydCA8V2ViS2l0L1dlYkZyYW1lVmlldy5oPgotI2ltcG9ydCA8V2ViS2l0L1dlYlByZWZlcmVu Y2VzLmg+CisjaW1wb3J0IDxXZWJLaXQvV2ViUHJlZmVyZW5jZXNQcml2YXRlLmg+CiAjaW1wb3J0 IDxXZWJLaXQvV2ViVmlldy5oPgogCiAjaW1wb3J0IDxDYXJib24vQ2FyYm9uLmg+ICAgICAgICAg ICAgICAgICAgICAgICAgICAgLy8gZm9yIEdldEN1cnJlbnRFdmVudFRpbWUoKQpAQCAtMTY0LDYg KzE2NCwyNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY29uc3QgY2hhciAqYXJndltdKQogICAgIFtw cmVmZXJlbmNlcyBzZXRGYW50YXN5Rm9udEZhbWlseTpAIlBhcHlydXMiXTsKICAgICBbcHJlZmVy ZW5jZXMgc2V0RGVmYXVsdEZvbnRTaXplOjE2XTsKICAgICBbcHJlZmVyZW5jZXMgc2V0RGVmYXVs dEZpeGVkRm9udFNpemU6MTNdOworICAgIAorICAgIC8vIElmIHlvdSBuZWVkIHRvIGFkZCB0byB0 aGlzIGxpc3QsIHRoZW4sIG1vc3QgbGlrZWx5LCBpdCBzaG91bGQgZ28gYXQgdGhlIGVuZCwgZm9y IAorICAgIC8vIGV4aXN0aW5nIHJlc3VsdHMgdG8gYmUgdGhlIGxlYXN0IGxpa2VseSB0byBjaGFu Z2UuCisgICAgW3ByZWZlcmVuY2VzIHNldEZvbnRGYWxsYmFja0xpc3Q6W05TQXJyYXkgYXJyYXlX aXRoT2JqZWN0czoKKyAgICAgICAgQCJTeW1ib2wiLAorICAgICAgICBAIkx1Y2lkYSBHcmFuZGUi LAorICAgICAgICBAIkhpcmFNaW5Qcm8tVzMiLAorICAgICAgICBAIkFwcGxlTXl1bmdqbyIsCisg ICAgICAgIEAiQXBwbGUgU3ltYm9scyIsCisgICAgICAgIEAiTW9uYWNvIiwKKyAgICAgICAgQCJa YXBmIERpbmdiYXRzIiwKKyAgICAgICAgQCJHZWV6YSBQcm8iLAorICAgICAgICBAIkhpcmFLYWt1 UHJvLVczIiwKKyAgICAgICAgQCJBcHBsZSBMaUdvdGhpYyBNZWRpdW0iLAorICAgICAgICBAIlNU WGloZWkiLAorICAgICAgICBAIkFwcGxlR290aGljIFJlZ3VsYXIiLAorICAgICAgICBAIkRldmFu YWdhcmkgTVQiLAorICAgICAgICBAIkd1cm11a2hpIE1UIiwKKyAgICAgICAgQCJHdWphcmF0aSBN VCIsCisgICAgICAgIEAiU1RLYWl0aSIsCisgICAgICAgIG5pbF1dOwogICAgIFtwcmVmZXJlbmNl cyBzZXRNaW5pbXVtRm9udFNpemU6OV07CiAgICAgW3ByZWZlcmVuY2VzIHNldEphdmFFbmFibGVk Ok5PXTsKIApJbmRleDogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1w UmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZp c2lvbiAxMTk1NykKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVl Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTUyNSw2ICs1MjUs NyBAQAogCQkxNDlDMjlDNDA4OTAyQzZEMDA4QTlFRkMgLyogRGV2ZWxvcG1lbnQgKi8gPSB7CiAJ CQlpc2EgPSBYQ0J1aWxkQ29uZmlndXJhdGlvbjsKIAkJCWJ1aWxkU2V0dGluZ3MgPSB7CisJCQkJ RlJBTUVXT1JLX1NFQVJDSF9QQVRIUyA9IC9TeXN0ZW0vTGlicmFyeS9GcmFtZXdvcmtzL1F1YXJ0 ei5mcmFtZXdvcmsvRnJhbWV3b3JrczsKIAkJCQlHQ0NfQ19MQU5HVUFHRV9TVEFOREFSRCA9IGdu dTk5OwogCQkJCUdDQ19PUFRJTUlaQVRJT05fTEVWRUwgPSAwOwogCQkJCUdDQ19QUkVDT01QSUxF X1BSRUZJWF9IRUFERVIgPSBZRVM7CkBAIC01NDMsNiArNTQ0LDcgQEAKIAkJMTQ5QzI5QzUwODkw MkM2RDAwOEE5RUZDIC8qIERlcGxveW1lbnQgKi8gPSB7CiAJCQlpc2EgPSBYQ0J1aWxkQ29uZmln dXJhdGlvbjsKIAkJCWJ1aWxkU2V0dGluZ3MgPSB7CisJCQkJRlJBTUVXT1JLX1NFQVJDSF9QQVRI UyA9IC9TeXN0ZW0vTGlicmFyeS9GcmFtZXdvcmtzL1F1YXJ0ei5mcmFtZXdvcmsvRnJhbWV3b3Jr czsKIAkJCQlHQ0NfQ19MQU5HVUFHRV9TVEFOREFSRCA9IGdudTk5OwogCQkJCUdDQ19QUkVDT01Q SUxFX1BSRUZJWF9IRUFERVIgPSBZRVM7CiAJCQkJR0NDX1RSRUFUX1dBUk5JTkdTX0FTX0VSUk9S UyA9IFlFUzsKSW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJL aXRUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDExOTU3KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMDYtMDEtWFggIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBueXBvcC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTKS4KKworICAgICAgICAtIEZpeCBodHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcv c2hvd19idWcuY2dpP2lkPTY0MDAKKyAgICAgICAgQ1NTIDIuMSB0ZXN0cyBhcmUgdG9vIGRlcGVu ZGVudCBvbiBtYWNoaW5lIGZvbnRzCisKKyAgICAgICAgSW50cm9kdWNlcyBhIG5ldyBwcml2YXRl IHByZWZlcmVuY2UsIHdoaWNoIGhvbGRzIGEgbGlzdCBvZiBmb250cyB0byBiZSB1c2VkIGZvciBm YWxsYmFjayAoaWYgbm9uLWVtcHR5KS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL0R1bXBS ZW5kZXJUcmVlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6IAorICAgICAgICBBZGQgYSBmcmFt ZXdvcmsgc2VhcmNoIHBhdGgsIHNvIHRoYXQgV2ViUHJlZmVyZW5jZXNQcml2YXRlLmggY2FuIGJl IGluY2x1ZGVkLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUubToK KyAgICAgICAgU2V0IGEgbGlzdCBvZiBmb250cyB0byBiZSB1c2VkIGZvciBmYWxsYmFjay4KKwog MjAwNi0wMS0wOCAgTWFjaWVqIFN0YWNob3dpYWsgIDxtanNAYXBwbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEVyaWMuCg==