25657 2009-05-08 17:12:00 -0700 [Chromium] Non-BMP characters are not rendered correctly 2009-06-19 10:49:53 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Minor --- 1 jshin jshin agl ap oldest_to_newest 120492 0 jshin 2009-05-08 17:12:00 -0700 In getFontForCharacters in FontCacheLinux.cpp in platform/graphics/chromium does not handle surrogate pairs for non-BMP characters properly. It is trivial to fix, but I need to make a simple TTF supporting a few non-BMP characters to check in for layout test. 120498 1 agl 2009-05-08 18:25:24 -0700 There are lots of changes pending in the Linux font code. I'm waiting on the Skia unforking. Please don't try and fix anything, you'll just make merging harder! Thanks 125026 2 jshin 2009-06-09 15:38:39 -0700 Adam, are you done with the Skia unforking? Actually, the change does not touch Skia at all. It's like this in FontCacheLinux.cpp. +#include <unicode/utf16.h> #include <wtf/Assertions.h> namespace WebCore { @@ -59,8 +60,11 @@ int length) { FcCharSet* cset = FcCharSetCreate(); - for (int i = 0; i < length; ++i) - FcCharSetAddChar(cset, characters[i]); + for (int i = 0; i < length; ++i) { + UChar32 ucs4 = 0; + U16_NEXT(characters, i, length, ucs4); + FcCharSetAddChar(cset, ucs4); + } 125028 3 agl 2009-06-09 15:45:29 -0700 Yes, Skia is unforked. I just don't have time to work on complex text stuff right now. Feel free to land a patch if you like. 125392 4 31175 jshin 2009-06-11 16:12:19 -0700 Created attachment 31175 patch without the layout test result I have yet to make a freely-distributable font with a few non-BMP glyphs to use for layout test. Therefore, the test is attached without a result. 125779 5 31175 agl 2009-06-14 10:28:37 -0700 Comment on attachment 31175 patch without the layout test result > + for (int i = 0; i < length; ++i) { > + UChar32 ucs4 = 0; Setting this to zero every time would appear to be a waste. > + U16_NEXT(characters, i, length, ucs4); U16_NEXT is a terrible name for this macro! (Nothing to do with with patch though). From looking at the macro, it appears that it increments |i| for you: https://dev.mobileread.com/trac/webkitbrowser/browser/trunk/WebKit-r30377/WebKit/mac/icu/unicode/utf16.h?rev=3 However, you are also incrementing i in the for loop. Might not you be skipping charactors? AGL 126297 6 31376 jshin 2009-06-16 14:38:33 -0700 Created attachment 31376 patch with a test put in manual-tests I put non-bmp.html in WebCore/manual-tests. Once I make a small font covering non-BMP and contribute to the webkit, I'll move the test to fast/text. 126307 7 jshin 2009-06-16 14:47:30 -0700 (In reply to comment #5) > > From looking at the macro, it appears that it increments |i| for you: > > https://dev.mobileread.com/trac/webkitbrowser/browser/trunk/WebKit-r30377/WebKit/mac/icu/unicode/utf16.h?rev=3 > However, you are also incrementing i in the for loop. Might not you be skipping > charactors? You're right. I shouldn't have resurrected the patch from the memory. When I tested it on Linux, I used while loop. Thanks for catching it. > > AGL > 126380 8 31398 jshin 2009-06-16 21:58:58 -0700 Created attachment 31398 patch with a test put in manual-tests fixed a 'double' iteratorion issue pointed out by agl. 126749 9 31398 levin 2009-06-18 12:35:45 -0700 Comment on attachment 31398 patch with a test put in manual-tests There are tabs in the changelog which will need to be fixed on landing. 126962 10 jshin 2009-06-19 10:49:53 -0700 Landed in r44858 ( http://trac.webkit.org/changeset/44858) Sending WebCore/ChangeLog Adding WebCore/manual-tests/non-bmp.html Sending WebCore/platform/graphics/chromium/FontCacheLinux.cpp 31175 2009-06-11 16:12:19 -0700 2009-06-16 14:38:33 -0700 patch without the layout test result 25657.patch.1 text/plain 2736 jshin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDYxOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDYtMTEgIEp1bmdzaGlrIFNoaW4gIDxqc2hpbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1NjU3CisgICAgICAgIENo cm9taXVtIExpbnV4IHBvcnQgZG9lcyBub3QgaGFuZGxlIG5vbi1CTVAgY2hhcmFjdGVycyBwcm9w ZXJseS4KKyAgICAgICAgSXQncyBmaXhlZCB3aXRoIGEgJ1VURi0xNiBpdGVyYXRvciBtYWNybycg dG8gZXh0cmFjdCBVbmljb2RlCisgICAgICAgIGNvZGVwb2ludHMgb3V0IG9mIGEgVVRGLTE2IGlu cHV0IHN0cmluZy4KKworICAgICAgICBUZXN0OiBmYXN0L3RleHQvbm9uLWJtcC5odG1sCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9Gb250Q2FjaGVMaW51eC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OmdldEZvbnREYXRhRm9yQ2hhcmFjdGVycyk6CisK KwogMjAwOS0wNi0wMyAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4LmNwcAkocmV2aXNpb24gNDQ2MTkp CisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4LmNw cAkod29ya2luZyBjb3B5KQpAQCAtNDYsNiArNDYsNyBAQAogI2luY2x1ZGUgIlNrVHlwZWZhY2Uu aCIKICNpbmNsdWRlICJTa1V0aWxzLmgiCiAKKyNpbmNsdWRlIDx1bmljb2RlL3V0ZjE2Lmg+CiAj aW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNTks OCArNjAsMTEgQEAgY29uc3QgU2ltcGxlRm9udERhdGEqIEZvbnRDYWNoZTo6Z2V0Rm9udAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlu dCBsZW5ndGgpCiB7CiAgICAgRmNDaGFyU2V0KiBjc2V0ID0gRmNDaGFyU2V0Q3JlYXRlKCk7Ci0g ICAgZm9yIChpbnQgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkKLSAgICAgICAgRmNDaGFyU2V0QWRk Q2hhcihjc2V0LCBjaGFyYWN0ZXJzW2ldKTsKKyAgICBmb3IgKGludCBpID0gMDsgaSA8IGxlbmd0 aDsgKytpKSB7CisgICAgICAgIFVDaGFyMzIgdWNzNCA9IDA7CisgICAgICAgIFUxNl9ORVhUKGNo YXJhY3RlcnMsIGksIGxlbmd0aCwgdWNzNCk7CisgICAgICAgIEZjQ2hhclNldEFkZENoYXIoY3Nl dCwgdWNzNCk7CisgICAgfQogCiAgICAgRmNQYXR0ZXJuKiBwYXR0ZXJuID0gRmNQYXR0ZXJuQ3Jl YXRlKCk7CiAKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ0NjE5KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMDYtMTEgIEp1bmdzaGlr IFNoaW4gIDxqc2hpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTI1NjU3CisKKyAgICAgICAgVGVzdCBmb3Igbm9uLUJNUCBjaGFyYWN0ZXIgcmVuZGVyaW5n LgorCisgICAgICAgICogZmFzdC90ZXh0L25vbi1ibXAuaHRtbDogQWRkZWQuCisKIDIwMDktMDYt MTEgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJ1YmJlciBzdGFt cGVkIGJ5IERhdmUgTGV2aW4uCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3RleHQvbm9uLWJtcC5o dG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvdGV4dC9ub24tYm1wLmh0bWwJKHJl dmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L3RleHQvbm9uLWJtcC5odG1sCShyZXZpc2lv biAwKQpAQCAtMCwwICsxLDEyIEBACis8aHRtbD4KKzxoZWFkPgorPHRpdGxlPkJ1ZyAyNTY1NyA6 IE5vbi1CTVAgY2hhcmFjdGVyczwvdGl0bGU+Cis8L2hlYWQ+Cis8Ym9keT4KK1Rlc3QgZm9yIDxh IGhyZWY9Imh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1NjU3Ij5idWcg MjU2NTc8L2E+IDogCitMaXN0ZWQgYmVsb3cgYXJlIE1hdGhlbWF0aWNhbCBCb2xkIENhcGl0YWwg QSB0aHJvdWdoIEUgKFUrMUQ0MDAgLi4gVSsxRDQwNCkuCis8ZGl2PgorJiN4MWQ0MDA7JiN4MWQ0 MDE7JiN4MWQ0MDI7JiN4MWQ0MDM7JiN4MWQ0MDQ7Cis8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4K 31376 2009-06-16 14:38:33 -0700 2009-06-16 14:47:52 -0700 patch with a test put in manual-tests 25657.patch.2 text/plain 2481 jshin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDczOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDktMDYtMTYgIEp1bmdzaGlrIFNoaW4gIDxqc2hpbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1NjU3CisKKyAgICAgICAg Q2hyb21pdW0gTGludXggcG9ydCBkb2VzIG5vdCBoYW5kbGUgbm9uLUJNUCBjaGFyYWN0ZXJzIHBy b3Blcmx5LgorICAgICAgICBJdCdzIGZpeGVkIHdpdGggYSAnVVRGLTE2IGl0ZXJhdG9yIG1hY3Jv JyB0byBleHRyYWN0IFVuaWNvZGUKKyAgICAgICAgY29kZXBvaW50cyBvdXQgb2YgYSBVVEYtMTYg aW5wdXQgc3RyaW5nLgorCUEgbWFudWFsIHRlc3QgaXMgYWRkZWQgZm9yIG5vbi1CTVAgY2hhcmFj dGVyIHJlbmRlcmluZywKKwl3aGljaCB3ZSBjYW4gdXNlIHVudGlsIGEgc21hbGwgZnJlZWx5LWRp c3RyaWJ1dGFibGUgZm9udAorCWNvdmVyaW5nIG5vbi1CTVAgaXMgYWRkZWQgdG8gdGhlIFdlYmtp dCBzb3VyY2UgdHJlZS4KKworCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Rm9udENhY2hlTGludXguY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpnZXRGb250 RGF0YUZvckNoYXJhY3RlcnMpOgorICAgICAgICAqIG1hbnVhbC10ZXN0cy9ub24tYm1wLmh0bWw6 IEFkZGVkLgorCiAyMDA5LTA2LTE2ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KSW5kZXg6IFdlYkNvcmUv bWFudWFsLXRlc3RzL25vbi1ibXAuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL21hbnVhbC10 ZXN0cy9ub24tYm1wLmh0bWwJKHJldmlzaW9uIDApCisrKyBXZWJDb3JlL21hbnVhbC10ZXN0cy9u b24tYm1wLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMTIgQEAKKzxodG1sPgorPGhlYWQ+ Cis8dGl0bGU+QnVnIDI1NjU3IDogTm9uLUJNUCBjaGFyYWN0ZXJzPC90aXRsZT4KKzwvaGVhZD4K Kzxib2R5PgorVGVzdCBmb3IgPGEgaHJlZj0iaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjU2NTciPmJ1ZyAyNTY1NzwvYT4gOiAKK0xpc3RlZCBiZWxvdyBhcmUgTWF0aGVt YXRpY2FsIEJvbGQgQ2FwaXRhbCBBIHRocm91Z2ggRSAoVSsxRDQwMCAuLiBVKzFENDA0KS4gTm90 ZSB0aGF0IHlvdSBuZWVkIHRvIGluc3RhbGwgYSBmb250IGNvdmVyaW5nIFBsYW5lIDEgbGlrZSBD b2RlMjAwMSBmb3IgdGhpcyB0ZXN0LgorPGRpdj4KKyYjeDFkNDAwOyYjeDFkNDAxOyYjeDFkNDAy OyYjeDFkNDAzOyYjeDFkNDA0OworPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4 LmNwcAkocmV2aXNpb24gNDQ3MzEpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0ZvbnRDYWNoZUxpbnV4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDYsNiArNDYsNyBAQAog I2luY2x1ZGUgIlNrVHlwZWZhY2UuaCIKICNpbmNsdWRlICJTa1V0aWxzLmgiCiAKKyNpbmNsdWRl IDx1bmljb2RlL3V0ZjE2Lmg+CiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KIAogbmFtZXNw YWNlIFdlYkNvcmUgewpAQCAtNTksOCArNjAsMTEgQEAgY29uc3QgU2ltcGxlRm9udERhdGEqIEZv bnRDYWNoZTo6Z2V0Rm9udAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGludCBsZW5ndGgpCiB7CiAgICAgRmNDaGFyU2V0KiBjc2V0ID0g RmNDaGFyU2V0Q3JlYXRlKCk7Ci0gICAgZm9yIChpbnQgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkK LSAgICAgICAgRmNDaGFyU2V0QWRkQ2hhcihjc2V0LCBjaGFyYWN0ZXJzW2ldKTsKKyAgICBmb3Ig KGludCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKSB7CisgICAgICAgIFVDaGFyMzIgdWNzNCA9IDA7 CisgICAgICAgIFUxNl9ORVhUKGNoYXJhY3RlcnMsIGksIGxlbmd0aCwgdWNzNCk7CisgICAgICAg IEZjQ2hhclNldEFkZENoYXIoY3NldCwgdWNzNCk7CisgICAgfQogCiAgICAgRmNQYXR0ZXJuKiBw YXR0ZXJuID0gRmNQYXR0ZXJuQ3JlYXRlKCk7CiAK 31398 2009-06-16 21:58:58 -0700 2009-06-18 12:35:45 -0700 patch with a test put in manual-tests 25657.patch.2a text/plain 2478 jshin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDczOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDktMDYtMTYgIEp1bmdzaGlrIFNoaW4gIDxqc2hpbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI1NjU3CisKKyAgICAgICAg Q2hyb21pdW0gTGludXggcG9ydCBkb2VzIG5vdCBoYW5kbGUgbm9uLUJNUCBjaGFyYWN0ZXJzIHBy b3Blcmx5LgorICAgICAgICBJdCdzIGZpeGVkIHdpdGggYSAnVVRGLTE2IGl0ZXJhdG9yIG1hY3Jv JyB0byBleHRyYWN0IFVuaWNvZGUKKyAgICAgICAgY29kZXBvaW50cyBvdXQgb2YgYSBVVEYtMTYg aW5wdXQgc3RyaW5nLgorCUEgbWFudWFsIHRlc3QgaXMgYWRkZWQgZm9yIG5vbi1CTVAgY2hhcmFj dGVyIHJlbmRlcmluZywKKwl3aGljaCB3ZSBjYW4gdXNlIHVudGlsIGEgc21hbGwgZnJlZWx5LWRp c3RyaWJ1dGFibGUgZm9udAorCWNvdmVyaW5nIG5vbi1CTVAgaXMgYWRkZWQgdG8gdGhlIFdlYmtp dCBzb3VyY2UgdHJlZS4KKworCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v Rm9udENhY2hlTGludXguY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9udENhY2hlOjpnZXRGb250 RGF0YUZvckNoYXJhY3RlcnMpOgorICAgICAgICAqIG1hbnVhbC10ZXN0cy9ub24tYm1wLmh0bWw6 IEFkZGVkLgorCiAyMDA5LTA2LTE2ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KSW5kZXg6IFdlYkNvcmUv bWFudWFsLXRlc3RzL25vbi1ibXAuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL21hbnVhbC10 ZXN0cy9ub24tYm1wLmh0bWwJKHJldmlzaW9uIDApCisrKyBXZWJDb3JlL21hbnVhbC10ZXN0cy9u b24tYm1wLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMTIgQEAKKzxodG1sPgorPGhlYWQ+ Cis8dGl0bGU+QnVnIDI1NjU3IDogTm9uLUJNUCBjaGFyYWN0ZXJzPC90aXRsZT4KKzwvaGVhZD4K Kzxib2R5PgorVGVzdCBmb3IgPGEgaHJlZj0iaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjU2NTciPmJ1ZyAyNTY1NzwvYT4gOiAKK0xpc3RlZCBiZWxvdyBhcmUgTWF0aGVt YXRpY2FsIEJvbGQgQ2FwaXRhbCBBIHRocm91Z2ggRSAoVSsxRDQwMCAuLiBVKzFENDA0KS4gTm90 ZSB0aGF0IHlvdSBuZWVkIHRvIGluc3RhbGwgYSBmb250IGNvdmVyaW5nIFBsYW5lIDEgbGlrZSBD b2RlMjAwMSBmb3IgdGhpcyB0ZXN0LgorPGRpdj4KKyYjeDFkNDAwOyYjeDFkNDAxOyYjeDFkNDAy OyYjeDFkNDAzOyYjeDFkNDA0OworPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBXZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ZvbnRDYWNoZUxpbnV4 LmNwcAkocmV2aXNpb24gNDQ3MzEpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0ZvbnRDYWNoZUxpbnV4LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDYsNiArNDYsNyBAQAog I2luY2x1ZGUgIlNrVHlwZWZhY2UuaCIKICNpbmNsdWRlICJTa1V0aWxzLmgiCiAKKyNpbmNsdWRl IDx1bmljb2RlL3V0ZjE2Lmg+CiAjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KIAogbmFtZXNw YWNlIFdlYkNvcmUgewpAQCAtNTksOCArNjAsMTEgQEAgY29uc3QgU2ltcGxlRm9udERhdGEqIEZv bnRDYWNoZTo6Z2V0Rm9udAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGludCBsZW5ndGgpCiB7CiAgICAgRmNDaGFyU2V0KiBjc2V0ID0g RmNDaGFyU2V0Q3JlYXRlKCk7Ci0gICAgZm9yIChpbnQgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkK LSAgICAgICAgRmNDaGFyU2V0QWRkQ2hhcihjc2V0LCBjaGFyYWN0ZXJzW2ldKTsKKyAgICBmb3Ig KGludCBpID0gMDsgaSA8IGxlbmd0aDsgKSB7CisgICAgICAgIFVDaGFyMzIgdWNzNCA9IDA7Cisg ICAgICAgIFUxNl9ORVhUKGNoYXJhY3RlcnMsIGksIGxlbmd0aCwgdWNzNCk7CisgICAgICAgIEZj Q2hhclNldEFkZENoYXIoY3NldCwgdWNzNCk7CisgICAgfQogCiAgICAgRmNQYXR0ZXJuKiBwYXR0 ZXJuID0gRmNQYXR0ZXJuQ3JlYXRlKCk7CiAK