88845 2012-06-12 01:12:59 -0700 LocaleToScriptMappingDefault.cpp should also do what scriptCodeForFontSelection does in LocaleToScriptMappingICU.cpp 2012-06-14 02:56:29 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 falken falken ap jshin tkent tony webkit.review.bot oldest_to_newest 646718 0 falken 2012-06-12 01:12:59 -0700 LocaleToScriptMappingICU.cpp treats certain script codes as a single script for font selection purposes. For example "Hira", "Kana", "Jpan", and "Hrkt" are all treated as "Hrkt". This way we only have to set fonts for the "Hrkt" script in Settings, and have it be used for all of the Japanese scripts. LocaleToScriptMappingDefault.cpp should do the same thing. 646760 1 147042 falken 2012-06-12 02:30:00 -0700 Created attachment 147042 Patch 646761 2 falken 2012-06-12 02:31:33 -0700 Uploaded a patch. 647099 3 147042 tony 2012-06-12 11:11:39 -0700 Comment on attachment 147042 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147042&action=review Which ports use LocaleToScriptMappingICU and which use LocaleToScriptMappingDefault? > Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp:49 > + // Treat certain families of script codes as a single script for assigning a per-script font in Settings. > + static const UScriptCode japaneseScript = USCRIPT_KATAKANA_OR_HIRAGANA; > + static const UScriptCode koreanScript = USCRIPT_HANGUL; Why do we use separate variables for these rather than just inlining USCRIPT_KATAKANA_OR_HIRAGANA and USCRIPT_HANGUL? 647106 4 tony 2012-06-12 11:17:30 -0700 It looks like Chromium uses Default.cpp. Should it use ICU.cpp instead? 647491 5 falken 2012-06-12 16:57:16 -0700 (In reply to comment #3) > (From update of attachment 147042 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=147042&action=review > > Which ports use LocaleToScriptMappingICU and which use LocaleToScriptMappingDefault? Right now everyone uses Default. See <http://trac.webkit.org/changeset/110541> > > > Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp:49 > > + // Treat certain families of script codes as a single script for assigning a per-script font in Settings. > > + static const UScriptCode japaneseScript = USCRIPT_KATAKANA_OR_HIRAGANA; > > + static const UScriptCode koreanScript = USCRIPT_HANGUL; > > Why do we use separate variables for these rather than just inlining USCRIPT_KATAKANA_OR_HIRAGANA and USCRIPT_HANGUL? It seemed to have better readability this way and I thought the compiler would inline it anyway. I can change to inlining them. 648131 6 tony 2012-06-13 09:29:45 -0700 (In reply to comment #5) > (In reply to comment #3) > > (From update of attachment 147042 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=147042&action=review > > > > Which ports use LocaleToScriptMappingICU and which use LocaleToScriptMappingDefault? > > Right now everyone uses Default. See <http://trac.webkit.org/changeset/110541> I see, so this would change font selection behavior for all ports. Is it possible to make a layout test demonstrating this change? Is this more consistent with other browsers like Firefox, IE or Opera? > > > Source/WebCore/platform/text/LocaleToScriptMappingDefault.cpp:49 > > > + // Treat certain families of script codes as a single script for assigning a per-script font in Settings. > > > + static const UScriptCode japaneseScript = USCRIPT_KATAKANA_OR_HIRAGANA; > > > + static const UScriptCode koreanScript = USCRIPT_HANGUL; > > > > Why do we use separate variables for these rather than just inlining USCRIPT_KATAKANA_OR_HIRAGANA and USCRIPT_HANGUL? > > It seemed to have better readability this way and I thought the compiler would inline it anyway. I can change to inlining them. I think it would be more consistent if they were all USCRIPT_. 648134 7 tony 2012-06-13 09:32:31 -0700 (In reply to comment #6) > I see, so this would change font selection behavior for all ports. Is it possible to make a layout test demonstrating this change? Is this more consistent with other browsers like Firefox, IE or Opera? Oh, sorry, there is a test. I'm still curious about the second question. Also, are there sites currently using lang=ja-{Hira,Hrkt,Jpan,Kana}? 648643 8 falken 2012-06-13 18:04:04 -0700 I'll make the change to use USCRIPT_. (In reply to comment #7) > (In reply to comment #6) > > I see, so this would change font selection behavior for all ports. Is it possible to make a layout test demonstrating this change? Is this more consistent with other browsers like Firefox, IE or Opera? I think the other browsers don't really look at script and just use the language. I tested on Firefox, and it uses the font preference for Japanese to render all of "lang=ja-{Hira,Hrkt,Jpan,Kana}", as this patch would do. > > Oh, sorry, there is a test. I'm still curious about the second question. Also, are there sites currently using lang=ja-{Hira,Hrkt,Jpan,Kana}? It seems really rare, if it happens at all. I actually only noticed this because my demo to show per-script font settings uses the script directly to show how sample text looks under different per-script font settings. I think no one would want different settings for Hira/Hrkt/Jpan/Kana though, so they should all be rendered with the same setting. 648657 9 147460 falken 2012-06-13 18:32:03 -0700 Created attachment 147460 Patch 648776 10 147460 tkent 2012-06-13 21:13:57 -0700 Comment on attachment 147460 Patch Looks ok 648779 11 147460 falken 2012-06-13 21:21:01 -0700 Comment on attachment 147460 Patch Thanks for the reviews. 649018 12 147460 webkit.review.bot 2012-06-14 02:56:23 -0700 Comment on attachment 147460 Patch Clearing flags on attachment: 147460 Committed r120303: <http://trac.webkit.org/changeset/120303> 649019 13 webkit.review.bot 2012-06-14 02:56:29 -0700 All reviewed patches have been landed. Closing bug. 147042 2012-06-12 02:30:00 -0700 2012-06-13 18:31:57 -0700 Patch bug-88845-20120612182959.patch text/plain 5907 falken U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMDI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTAyYTA2ZDRmMDA2Nzkz YWU1YTQxYWI1YTYzODk5OTZhNjAxZGVhMC4uOTdjM2VhNmUyYjQwYzQxMjFiOTZiMGM5YjM1Nzgx OGYzYjViMWExMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA2LTEyICBNYXR0 IEZhbGtlbmhhZ2VuICA8ZmFsa2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBMb2NhbGVUb1Nj cmlwdE1hcHBpbmdEZWZhdWx0LmNwcCBzaG91bGQgYWxzbyBkbyB3aGF0IHNjcmlwdENvZGVGb3JG b250U2VsZWN0aW9uIGRvZXMgaW4gTG9jYWxlVG9TY3JpcHRNYXBwaW5nSUNVLmNwcAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg4NDUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L3RleHQv aW50ZXJuYXRpb25hbC9qcGFuLXNjcmlwdC1lcXVpdmFsZW5jZS5odG1sCisKKyAgICAgICAgKiBw bGF0Zm9ybS90ZXh0L0xvY2FsZVRvU2NyaXB0TWFwcGluZ0RlZmF1bHQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6c2NyaXB0TmFtZVRvQ29kZSk6CisKIDIwMTItMDYtMTEgIEphbWVzIFJvYmluc29u ICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIFBvcnQgRHJhd2lu Z0J1ZmZlckNocm9taXVtIGZyb20gVGV4dHVyZUxheWVyQ2hyb21pdW0gb3ZlciB0byBXZWJFeHRl cm5hbFRleHR1cmVMYXllcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4 dC9Mb2NhbGVUb1NjcmlwdE1hcHBpbmdEZWZhdWx0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL3RleHQvTG9jYWxlVG9TY3JpcHRNYXBwaW5nRGVmYXVsdC5jcHAKaW5kZXggNGVkMDNjZTRl MDdlNWQ4Yzk3MWY5ZDFmZWQ5NWYwMDhiZjRhNTYxOS4uMzJiODkwMWRhNGI5OGQ4ZDIzYTRlYmZj OTViYWZmZDE0N2I4MTFmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4 dC9Mb2NhbGVUb1NjcmlwdE1hcHBpbmdEZWZhdWx0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS90ZXh0L0xvY2FsZVRvU2NyaXB0TWFwcGluZ0RlZmF1bHQuY3BwCkBAIC00NCw2ICs0 NCwxMCBAQCBVU2NyaXB0Q29kZSBzY3JpcHROYW1lVG9Db2RlKGNvbnN0IFN0cmluZyYgc2NyaXB0 TmFtZSkKICAgICAgICAgVVNjcmlwdENvZGUgY29kZTsKICAgICB9OwogCisgICAgLy8gVHJlYXQg Y2VydGFpbiBmYW1pbGllcyBvZiBzY3JpcHQgY29kZXMgYXMgYSBzaW5nbGUgc2NyaXB0IGZvciBh c3NpZ25pbmcgYSBwZXItc2NyaXB0IGZvbnQgaW4gU2V0dGluZ3MuCisgICAgc3RhdGljIGNvbnN0 IFVTY3JpcHRDb2RlIGphcGFuZXNlU2NyaXB0ID0gVVNDUklQVF9LQVRBS0FOQV9PUl9ISVJBR0FO QTsKKyAgICBzdGF0aWMgY29uc3QgVVNjcmlwdENvZGUga29yZWFuU2NyaXB0ID0gVVNDUklQVF9I QU5HVUw7CisKICAgICBzdGF0aWMgY29uc3QgU2NyaXB0TmFtZUNvZGUgc2NyaXB0TmFtZUNvZGVM aXN0W10gPSB7CiAgICAgICAgIHsgInp5eXkiLCBVU0NSSVBUX0NPTU1PTiB9LAogICAgICAgICB7 ICJxYWFpIiwgVVNDUklQVF9JTkhFUklURUQgfSwKQEAgLTYzLDExICs2NywxMSBAQCBVU2NyaXB0 Q29kZSBzY3JpcHROYW1lVG9Db2RlKGNvbnN0IFN0cmluZyYgc2NyaXB0TmFtZSkKICAgICAgICAg eyAiZ3VqciIsIFVTQ1JJUFRfR1VKQVJBVEkgfSwKICAgICAgICAgeyAiZ3VydSIsIFVTQ1JJUFRf R1VSTVVLSEkgfSwKICAgICAgICAgeyAiaGFuaSIsIFVTQ1JJUFRfSEFOIH0sCi0gICAgICAgIHsg ImhhbmciLCBVU0NSSVBUX0hBTkdVTCB9LAorICAgICAgICB7ICJoYW5nIiwga29yZWFuU2NyaXB0 IH0sCiAgICAgICAgIHsgImhlYnIiLCBVU0NSSVBUX0hFQlJFVyB9LAotICAgICAgICB7ICJoaXJh IiwgVVNDUklQVF9ISVJBR0FOQSB9LAorICAgICAgICB7ICJoaXJhIiwgamFwYW5lc2VTY3JpcHQg fSwKICAgICAgICAgeyAia25kYSIsIFVTQ1JJUFRfS0FOTkFEQSB9LAotICAgICAgICB7ICJrYW5h IiwgVVNDUklQVF9LQVRBS0FOQSB9LAorICAgICAgICB7ICJrYW5hIiwgamFwYW5lc2VTY3JpcHQg fSwKICAgICAgICAgeyAia2htciIsIFVTQ1JJUFRfS0hNRVIgfSwKICAgICAgICAgeyAibGFvbyIs IFVTQ1JJUFRfTEFPIH0sCiAgICAgICAgIHsgImxhdG4iLCBVU0NSSVBUX0xBVElOIH0sCkBAIC05 OSw3ICsxMDMsNyBAQCBVU2NyaXB0Q29kZSBzY3JpcHROYW1lVG9Db2RlKGNvbnN0IFN0cmluZyYg c2NyaXB0TmFtZSkKICAgICAgICAgeyAic2hhdyIsIFVTQ1JJUFRfU0hBVklBTiB9LAogICAgICAg ICB7ICJ0YWxlIiwgVVNDUklQVF9UQUlfTEUgfSwKICAgICAgICAgeyAidWdhciIsIFVTQ1JJUFRf VUdBUklUSUMgfSwKLSAgICAgICAgeyAiaHJrdCIsIFVTQ1JJUFRfS0FUQUtBTkFfT1JfSElSQUdB TkEgfSwKKyAgICAgICAgeyAiaHJrdCIsIGphcGFuZXNlU2NyaXB0IH0sCiAgICAgICAgIHsgImJ1 Z2kiLCBVU0NSSVBUX0JVR0lORVNFIH0sCiAgICAgICAgIHsgImdsYWciLCBVU0NSSVBUX0dMQUdP TElUSUMgfSwKICAgICAgICAgeyAia2hhciIsIFVTQ1JJUFRfS0hBUk9TSFRISSB9LApAQCAtMTQ3 LDYgKzE1MSw4IEBAIFVTY3JpcHRDb2RlIHNjcmlwdE5hbWVUb0NvZGUoY29uc3QgU3RyaW5nJiBz Y3JpcHROYW1lKQogICAgICAgICB7ICJ2YWlpIiwgVVNDUklQVF9WQUkgfSwKICAgICAgICAgeyAi dmlzcCIsIFVTQ1JJUFRfVklTSUJMRV9TUEVFQ0ggfSwKICAgICAgICAgeyAieHN1eCIsIFVTQ1JJ UFRfQ1VORUlGT1JNIH0sCisgICAgICAgIHsgImpwYW4iLCBqYXBhbmVzZVNjcmlwdCB9LAorICAg ICAgICB7ICJrb3JlIiwga29yZWFuU2NyaXB0IH0sCiAgICAgICAgIHsgInp4eHgiLCBVU0NSSVBU X1VOV1JJVFRFTl9MQU5HVUFHRVMgfSwKICAgICAgICAgeyAienp6eiIsIFVTQ1JJUFRfVU5LTk9X TiB9CiAgICAgfTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwppbmRleCBmNWNlYTQ4NDc5YzUwNDgyODk5NTAyMTEzZjc4ZTg2ZjViYTU2 MjA1Li44N2FmNDMxYjA4OTc1YjVkNTU5OTkxNGYzMTlkOGUyMTQ4NDAwMDhiIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTMgQEAKKzIwMTItMDYtMTIgIE1hdHQgRmFsa2VuaGFnZW4gIDxmYWxrZW5AY2hyb21p dW0ub3JnPgorCisgICAgICAgIExvY2FsZVRvU2NyaXB0TWFwcGluZ0RlZmF1bHQuY3BwIHNob3Vs ZCBhbHNvIGRvIHdoYXQgc2NyaXB0Q29kZUZvckZvbnRTZWxlY3Rpb24gZG9lcyBpbiBMb2NhbGVU b1NjcmlwdE1hcHBpbmdJQ1UuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04ODg0NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvanBhbi1zY3JpcHQtZXF1aXZh bGVuY2UtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogZmFzdC90ZXh0L2ludGVybmF0 aW9uYWwvanBhbi1zY3JpcHQtZXF1aXZhbGVuY2UuaHRtbDogQWRkZWQuCisKIDIwMTItMDYtMTEg IERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBBZGRlZCBodHRwL3Rl c3RzL3NlY3VyaXR5L21peGVkQ29udGVudC9ibG9iLXVybC1pbi1pZnJhbWUuaHRtbCBiYWNrIHRv IHRoZSBNYWMgc2tpcCBsaXN0LCBhcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90ZXh0 L2ludGVybmF0aW9uYWwvanBhbi1zY3JpcHQtZXF1aXZhbGVuY2UtZXhwZWN0ZWQuaHRtbCBiL0xh eW91dFRlc3RzL2Zhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL2pwYW4tc2NyaXB0LWVxdWl2YWxlbmNl LWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNmM2OGFhM2FlMjE1NmNlYWFmNjU4OGIxMmRjZjNm YmRhMzY3OTlmMQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9pbnRl cm5hdGlvbmFsL2pwYW4tc2NyaXB0LWVxdWl2YWxlbmNlLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCAr MSwxNSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPC9oZWFkPgorPGJvZHk+ Cis8ZGl2IHN0eWxlPSJmb250LXNpemU6IDIwcHgiPgorPGRpdiBzdHlsZT0iZm9udC1mYW1pbHk6 ICdBaGVtJyI+dGhpcyBpcyBhaGVtIGZvbnQ8L2Rpdj4KKzxkaXYgc3R5bGU9ImZvbnQtZmFtaWx5 OiAnQWhlbSciPnRoaXMgaXMgYWhlbSBmb250PC9kaXY+Cis8ZGl2IHN0eWxlPSJmb250LWZhbWls eTogJ0FoZW0nIj50aGlzIGlzIGFoZW0gZm9udDwvZGl2PgorPGRpdiBzdHlsZT0iZm9udC1mYW1p bHk6ICdBaGVtJyI+dGhpcyBpcyBhaGVtIGZvbnQ8L2Rpdj4KKzxkaXYgc3R5bGU9ImZvbnQtZmFt aWx5OiAnQWhlbSciPnRoaXMgaXMgYWhlbSBmb250PC9kaXY+Cis8ZGl2IHN0eWxlPSJmb250LWZh bWlseTogJ0FoZW0nIj50aGlzIGlzIGFoZW0gZm9udDwvZGl2PgorPC9kaXY+Cis8L2JvZHk+Cis8 L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC9q cGFuLXNjcmlwdC1lcXVpdmFsZW5jZS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVy bmF0aW9uYWwvanBhbi1zY3JpcHQtZXF1aXZhbGVuY2UuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41ZDViNzUw NmMyZGRhYzhmOTUwNWUxOTdmZjg0N2M4YzMxNjdhZjFhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvanBhbi1zY3JpcHQtZXF1aXZhbGVuY2Uu aHRtbApAQCAtMCwwICsxLDI1IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8 c2NyaXB0PgoraWYgKHdpbmRvdy5pbnRlcm5hbHMpIHsKKyAgICB3aW5kb3cuaW50ZXJuYWxzLnNl dHRpbmdzLnNldFN0YW5kYXJkRm9udEZhbWlseSgiQWhlbSIsICJIcmt0Iik7CisgICAgd2luZG93 LmludGVybmFscy5zZXR0aW5ncy5zZXRTdGFuZGFyZEZvbnRGYW1pbHkoIkFoZW0iLCAiSGFuZyIp OworfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzwhLS0gYnVnIDg4ODQ1LiAgVGVzdCB0 aGF0IHRoZSB2YXJpb3VzIEphcGFuZXNlIHNjcmlwdCBjb2RlcyAoIkhpcmEiLCAiSHJrdCIsICJL YW5hIiwKKyJKcGFuIikgYXJlIHRyZWF0ZWQgdGhlIHNhbWUgZm9yIGFzc2lnbmluZyBhIHBlci1z Y3JpcHQgZm9udCBzZXR0aW5nLiBTaW1pbGFybHkKK3dpdGggS29yZWFuIHNjcmlwdCBjb2Rlcy4g VGhlIHRlc3QgcGFzc2VzIGlmIGFsbCBkaXZzIGFyZSBpbiBBaGVtIGZvbnQuCistLT4KKzxkaXYg c3R5bGU9ImZvbnQtc2l6ZTogMjBweCI+Cis8ZGl2IGxhbmc9ImphLUhpcmEiPnRoaXMgaXMgYWhl bSBmb250PC9kaXY+Cis8ZGl2IGxhbmc9ImphLUhya3QiPnRoaXMgaXMgYWhlbSBmb250PC9kaXY+ Cis8ZGl2IGxhbmc9ImphLUpwYW4iPnRoaXMgaXMgYWhlbSBmb250PC9kaXY+Cis8ZGl2IGxhbmc9 ImphLUthbmEiPnRoaXMgaXMgYWhlbSBmb250PC9kaXY+Cis8ZGl2IGxhbmc9ImtvLUhhbmciPnRo aXMgaXMgYWhlbSBmb250PC9kaXY+Cis8ZGl2IGxhbmc9ImtvLUtvcmUiPnRoaXMgaXMgYWhlbSBm b250PC9kaXY+Cis8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4K 147460 2012-06-13 18:32:03 -0700 2012-06-14 02:56:23 -0700 Patch bug-88845-20120614103202.patch text/plain 5490 falken U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWVmOWQ2NmJiMjA3ZmMw NTI3Y2I2NzQ3YzA1NWNjYTY5NTA3NGNiYi4uZGQ1YWY1NjJjNWM3MDBlNWEyNTc1NDU1MDIxZDcy OGU2NjgwMGQ1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA2LTEyICBNYXR0 IEZhbGtlbmhhZ2VuICA8ZmFsa2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBMb2NhbGVUb1Nj cmlwdE1hcHBpbmdEZWZhdWx0LmNwcCBzaG91bGQgYWxzbyBkbyB3aGF0IHNjcmlwdENvZGVGb3JG b250U2VsZWN0aW9uIGRvZXMgaW4gTG9jYWxlVG9TY3JpcHRNYXBwaW5nSUNVLmNwcAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODg4NDUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L3RleHQv aW50ZXJuYXRpb25hbC9qcGFuLXNjcmlwdC1lcXVpdmFsZW5jZS5odG1sCisKKyAgICAgICAgKiBw bGF0Zm9ybS90ZXh0L0xvY2FsZVRvU2NyaXB0TWFwcGluZ0RlZmF1bHQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6c2NyaXB0TmFtZVRvQ29kZSk6CisKIDIwMTItMDYtMTIgIFdlaSBKYW1lcyAgPGph bWVzLndlaUBpbnRlbC5jb20+CiAKICAgICAgICAgd2ViY29yZSBzaG91bGQgZGVwZW5kIG9uIHdl YmNvcmVfYXJtX25lb24gZm9yIG9ubHkgYXJtIHRhcmdldF9hcmNoCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsZVRvU2NyaXB0TWFwcGluZ0RlZmF1bHQuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGVUb1NjcmlwdE1hcHBpbmdEZWZh dWx0LmNwcAppbmRleCA0ZWQwM2NlNGUwN2U1ZDhjOTcxZjlkMWZlZDk1ZjAwOGJmNGE1NjE5Li45 MDk0NzM4NDk2OTZiNGMyOTJkNmI5YWMyODViYzdkOWY0YWMyODQxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsZVRvU2NyaXB0TWFwcGluZ0RlZmF1bHQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlVG9TY3JpcHRNYXBwaW5n RGVmYXVsdC5jcHAKQEAgLTQ0LDYgKzQ0LDEwIEBAIFVTY3JpcHRDb2RlIHNjcmlwdE5hbWVUb0Nv ZGUoY29uc3QgU3RyaW5nJiBzY3JpcHROYW1lKQogICAgICAgICBVU2NyaXB0Q29kZSBjb2RlOwog ICAgIH07CiAKKyAgICAvLyBUaGlzIGdlbmVyYWxseSBtYXBzIGFuIElTTyAxNTkyNCBzY3JpcHQg Y29kZSB0byBpdHMgVVNjcmlwdENvZGUsIGJ1dCBjZXJ0YWluIGZhbWlsaWVzIG9mIHNjcmlwdCBj b2RlcyBhcmUKKyAgICAvLyB0cmVhdGVkIGFzIGEgc2luZ2xlIHNjcmlwdCBmb3IgYXNzaWduaW5n IGEgcGVyLXNjcmlwdCBmb250IGluIFNldHRpbmdzLiBGb3IgZXhhbXBsZSwgImhpcmEiIGlzIG1h cHBlZCB0bworICAgIC8vIFVTQ1JJUFRfS0FUQUtBTkFfT1JfSElSQUdBTkEgaW5zdGVhZCBvZiBV U0NSSVBUX0hJUkFHQU5BLCBzaW5jZSB3ZSB3YW50IGFsbCBKYXBhbmVzZSBzY3JpcHRzIHRvIGJl IHJlbmRlcmVkCisgICAgLy8gdXNpbmcgdGhlIHNhbWUgZm9udCBzZXR0aW5nLgogICAgIHN0YXRp YyBjb25zdCBTY3JpcHROYW1lQ29kZSBzY3JpcHROYW1lQ29kZUxpc3RbXSA9IHsKICAgICAgICAg eyAienl5eSIsIFVTQ1JJUFRfQ09NTU9OIH0sCiAgICAgICAgIHsgInFhYWkiLCBVU0NSSVBUX0lO SEVSSVRFRCB9LApAQCAtNjUsOSArNjksOSBAQCBVU2NyaXB0Q29kZSBzY3JpcHROYW1lVG9Db2Rl KGNvbnN0IFN0cmluZyYgc2NyaXB0TmFtZSkKICAgICAgICAgeyAiaGFuaSIsIFVTQ1JJUFRfSEFO IH0sCiAgICAgICAgIHsgImhhbmciLCBVU0NSSVBUX0hBTkdVTCB9LAogICAgICAgICB7ICJoZWJy IiwgVVNDUklQVF9IRUJSRVcgfSwKLSAgICAgICAgeyAiaGlyYSIsIFVTQ1JJUFRfSElSQUdBTkEg fSwKKyAgICAgICAgeyAiaGlyYSIsIFVTQ1JJUFRfS0FUQUtBTkFfT1JfSElSQUdBTkEgfSwKICAg ICAgICAgeyAia25kYSIsIFVTQ1JJUFRfS0FOTkFEQSB9LAotICAgICAgICB7ICJrYW5hIiwgVVND UklQVF9LQVRBS0FOQSB9LAorICAgICAgICB7ICJrYW5hIiwgVVNDUklQVF9LQVRBS0FOQV9PUl9I SVJBR0FOQSB9LAogICAgICAgICB7ICJraG1yIiwgVVNDUklQVF9LSE1FUiB9LAogICAgICAgICB7 ICJsYW9vIiwgVVNDUklQVF9MQU8gfSwKICAgICAgICAgeyAibGF0biIsIFVTQ1JJUFRfTEFUSU4g fSwKQEAgLTE0Nyw2ICsxNTEsOCBAQCBVU2NyaXB0Q29kZSBzY3JpcHROYW1lVG9Db2RlKGNvbnN0 IFN0cmluZyYgc2NyaXB0TmFtZSkKICAgICAgICAgeyAidmFpaSIsIFVTQ1JJUFRfVkFJIH0sCiAg ICAgICAgIHsgInZpc3AiLCBVU0NSSVBUX1ZJU0lCTEVfU1BFRUNIIH0sCiAgICAgICAgIHsgInhz dXgiLCBVU0NSSVBUX0NVTkVJRk9STSB9LAorICAgICAgICB7ICJqcGFuIiwgVVNDUklQVF9LQVRB S0FOQV9PUl9ISVJBR0FOQSB9LAorICAgICAgICB7ICJrb3JlIiwgVVNDUklQVF9IQU5HVUwgfSwK ICAgICAgICAgeyAienh4eCIsIFVTQ1JJUFRfVU5XUklUVEVOX0xBTkdVQUdFUyB9LAogICAgICAg ICB7ICJ6enp6IiwgVVNDUklQVF9VTktOT1dOIH0KICAgICB9OwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDIxY2NhZDJmYWRj NTFjMTk0ZmM0MWU4MWEyOWU2ODlmMDgxN2VmOTcuLjI4ZDY4NDFhOWY1YWNhYjczZmE0ZjY3ZWIz ZTA5MDcyY2E3NDViOGQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wNi0xMiAgTWF0dCBG YWxrZW5oYWdlbiAgPGZhbGtlbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTG9jYWxlVG9TY3Jp cHRNYXBwaW5nRGVmYXVsdC5jcHAgc2hvdWxkIGFsc28gZG8gd2hhdCBzY3JpcHRDb2RlRm9yRm9u dFNlbGVjdGlvbiBkb2VzIGluIExvY2FsZVRvU2NyaXB0TWFwcGluZ0lDVS5jcHAKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4ODQ1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L3RleHQvaW50ZXJu YXRpb25hbC9qcGFuLXNjcmlwdC1lcXVpdmFsZW5jZS1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAg ICAgICAgKiBmYXN0L3RleHQvaW50ZXJuYXRpb25hbC9qcGFuLXNjcmlwdC1lcXVpdmFsZW5jZS5o dG1sOiBBZGRlZC4KKwogMjAxMi0wNi0xMiAgRWRhZW5hIFNhbGluYXMgSmFzc28gIDxlZGFlbmFA YXBwbGUuY29tPgogCiAgICAgICAgIENhbid0IHNldCBlbC50eXBlIG9uIGEgPGJ1dHRvbj4gZWxl bWVudApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvanBh bi1zY3JpcHQtZXF1aXZhbGVuY2UtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvdGV4 dC9pbnRlcm5hdGlvbmFsL2pwYW4tc2NyaXB0LWVxdWl2YWxlbmNlLWV4cGVjdGVkLmh0bWwKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uNmM2OGFhM2FlMjE1NmNlYWFmNjU4OGIxMmRjZjNmYmRhMzY3OTlmMQotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL2pwYW4tc2Ny aXB0LWVxdWl2YWxlbmNlLWV4cGVjdGVkLmh0bWwKQEAgLTAsMCArMSwxNSBAQAorPCFET0NUWVBF IGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2IHN0eWxlPSJmb250 LXNpemU6IDIwcHgiPgorPGRpdiBzdHlsZT0iZm9udC1mYW1pbHk6ICdBaGVtJyI+dGhpcyBpcyBh aGVtIGZvbnQ8L2Rpdj4KKzxkaXYgc3R5bGU9ImZvbnQtZmFtaWx5OiAnQWhlbSciPnRoaXMgaXMg YWhlbSBmb250PC9kaXY+Cis8ZGl2IHN0eWxlPSJmb250LWZhbWlseTogJ0FoZW0nIj50aGlzIGlz IGFoZW0gZm9udDwvZGl2PgorPGRpdiBzdHlsZT0iZm9udC1mYW1pbHk6ICdBaGVtJyI+dGhpcyBp cyBhaGVtIGZvbnQ8L2Rpdj4KKzxkaXYgc3R5bGU9ImZvbnQtZmFtaWx5OiAnQWhlbSciPnRoaXMg aXMgYWhlbSBmb250PC9kaXY+Cis8ZGl2IHN0eWxlPSJmb250LWZhbWlseTogJ0FoZW0nIj50aGlz IGlzIGFoZW0gZm9udDwvZGl2PgorPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC9qcGFuLXNjcmlwdC1lcXVpdmFs ZW5jZS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvanBhbi1zY3Jp cHQtZXF1aXZhbGVuY2UuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41ZDViNzUwNmMyZGRhYzhmOTUwNWUxOTdm Zjg0N2M4YzMxNjdhZjFhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC90ZXh0 L2ludGVybmF0aW9uYWwvanBhbi1zY3JpcHQtZXF1aXZhbGVuY2UuaHRtbApAQCAtMCwwICsxLDI1 IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0PgoraWYgKHdpbmRv dy5pbnRlcm5hbHMpIHsKKyAgICB3aW5kb3cuaW50ZXJuYWxzLnNldHRpbmdzLnNldFN0YW5kYXJk Rm9udEZhbWlseSgiQWhlbSIsICJIcmt0Iik7CisgICAgd2luZG93LmludGVybmFscy5zZXR0aW5n cy5zZXRTdGFuZGFyZEZvbnRGYW1pbHkoIkFoZW0iLCAiSGFuZyIpOworfQorPC9zY3JpcHQ+Cis8 L2hlYWQ+Cis8Ym9keT4KKzwhLS0gYnVnIDg4ODQ1LiAgVGVzdCB0aGF0IHRoZSB2YXJpb3VzIEph cGFuZXNlIHNjcmlwdCBjb2RlcyAoIkhpcmEiLCAiSHJrdCIsICJLYW5hIiwKKyJKcGFuIikgYXJl IHRyZWF0ZWQgdGhlIHNhbWUgZm9yIGFzc2lnbmluZyBhIHBlci1zY3JpcHQgZm9udCBzZXR0aW5n LiBTaW1pbGFybHkKK3dpdGggS29yZWFuIHNjcmlwdCBjb2Rlcy4gVGhlIHRlc3QgcGFzc2VzIGlm IGFsbCBkaXZzIGFyZSBpbiBBaGVtIGZvbnQuCistLT4KKzxkaXYgc3R5bGU9ImZvbnQtc2l6ZTog MjBweCI+Cis8ZGl2IGxhbmc9ImphLUhpcmEiPnRoaXMgaXMgYWhlbSBmb250PC9kaXY+Cis8ZGl2 IGxhbmc9ImphLUhya3QiPnRoaXMgaXMgYWhlbSBmb250PC9kaXY+Cis8ZGl2IGxhbmc9ImphLUpw YW4iPnRoaXMgaXMgYWhlbSBmb250PC9kaXY+Cis8ZGl2IGxhbmc9ImphLUthbmEiPnRoaXMgaXMg YWhlbSBmb250PC9kaXY+Cis8ZGl2IGxhbmc9ImtvLUhhbmciPnRoaXMgaXMgYWhlbSBmb250PC9k aXY+Cis8ZGl2IGxhbmc9ImtvLUtvcmUiPnRoaXMgaXMgYWhlbSBmb250PC9kaXY+Cis8L2Rpdj4K KzwvYm9keT4KKzwvaHRtbD4K