98452 2012-10-04 14:06:26 -0700 Font::glyphDataAndPageForCharacter doesn't account for text orientation when using systemFallback on a cold cache. 2012-10-08 10:31:14 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enrica enrica gyuyoung.kim mitz rakuco webkit.review.bot oldest_to_newest 735000 0 enrica 2012-10-04 14:06:26 -0700 The text orientation is taken into account only when the glyph is already in the cache. Use the attached test case to reproduce this problem, launching it from a new instance of Safari. The line break occurs in the wrong place and you'll see the difference where reloading the page. 735001 1 167170 enrica 2012-10-04 14:07:29 -0700 Created attachment 167170 Test case 735108 2 167197 enrica 2012-10-04 16:26:27 -0700 Created attachment 167197 Patch 735142 3 167197 mitz 2012-10-04 17:02:49 -0700 Comment on attachment 167197 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=167197&action=review > Source/WebCore/platform/graphics/FontFastPath.cpp:50 > +static inline std::pair<GlyphData, GlyphPage*> applyTextOrientationForCharacter(UChar32 c, GlyphData& data, GlyphPage* page, unsigned pageNumber, TextOrientation orientation) Please rename “c” to “character”. The verb “apply” doesn’t fit a function that doesn’t mutate anything. How about glyphDataAndPageForCharacterWithTextOrientation(…), perhaps also moving the TextOrientation parameter to the second spot? 735212 4 enrica 2012-10-04 18:33:20 -0700 (In reply to comment #3) > (From update of attachment 167197 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=167197&action=review > > > Source/WebCore/platform/graphics/FontFastPath.cpp:50 > > +static inline std::pair<GlyphData, GlyphPage*> applyTextOrientationForCharacter(UChar32 c, GlyphData& data, GlyphPage* page, unsigned pageNumber, TextOrientation orientation) > > Please rename “c” to “character”. The verb “apply” doesn’t fit a function that doesn’t mutate anything. How about glyphDataAndPageForCharacterWithTextOrientation(…), perhaps also moving the TextOrientation parameter to the second spot? That was the first name I came up with, but then I thought it was too long. I should have followed my instincts :-) thanks for the review, will do as you suggested. 735228 5 enrica 2012-10-04 19:03:34 -0700 Committed revision 130443. 167170 2012-10-04 14:07:29 -0700 2012-10-04 14:07:29 -0700 Test case vertical-rl-rtl-linebreak.html text/html 320 enrica PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KPG1ldGEgaHR0cC1lcXVpdj0iY29udGVudC10 eXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9dXRmLTgiPgo8L2hlYWQ+Cjxib2R5Pgo8 ZGl2IHN0eWxlPSJmb250LWZhbWlseTogbW9ub3NwYWNlOyB3aWR0aDogOThweDsgZm9udC1zaXpl OiAyMHB4OyBoZWlnaHQ6IDE1ZXg7IC13ZWJraXQtd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1ybDsg b3V0bGluZTogbm9uZTsiPgo8cCBkaXI9InJ0bCI+15DXoNeZINeX16rXldecLiDXkNeZ158g15zX mSDXqdedLjwvcD4KPC9kaXY+CjwvYm9keT4KPC9odG1sPgo= 167197 2012-10-04 16:26:27 -0700 2012-10-04 17:02:49 -0700 Patch fontcache.txt text/plain 14048 enrica SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMDQzMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTEwLTA0ICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgRm9udDo6Z2x5cGhEYXRhQW5k UGFnZUZvckNoYXJhY3RlciBkb2Vzbid0IGFjY291bnQgZm9yIHRleHQgb3JpZW50YXRpb24gd2hl biB1c2luZyBzeXN0ZW1GYWxsYmFjayBvbiBhIGNvbGQgY2FjaGUuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODQ1Mi4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgdGV4dCBvcmllbnRhdGlvbiB3YXMg Y29uc2lkZXJlZCBvbmx5IHdoZW4gdGhlcmUgaXMgYSBjYWNoZSBoaXQuCisgICAgICAgIFRoaXMg Y2hhbmdlIG1vdmVzIHRoZSBsb2dpYyB0byBoYW5kbGUgdGV4dCBvcmllbnRhdGlvbiB0byBhIHNl cGFyYXRlCisgICAgICAgIGlubGluZSBmdW5jdGlvbiB0aGF0IGlzIGNhbGxlZCBhbHNvIHdoZW4g dGhlIGdseXBoIGlzIGFkZGVkIHRvIHRoZSBjYWNoZS4KKworICAgICAgICBUZXN0OiBmYXN0L3Rl eHQvdmVydGljYWwtcmwtcnRsLWxpbmVicmVhay5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9Gb250RmFzdFBhdGguY3BwOgorICAgICAgICAoV2ViQ29yZTo6YXBwbHlUZXh0T3Jp ZW50YXRpb25Gb3JDaGFyYWN0ZXIpOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkZvbnQ6Omds eXBoRGF0YUFuZFBhZ2VGb3JDaGFyYWN0ZXIpOiBNb2RpZmllZCB0byB1c2UgdGhlIG5ldyBmdW5j dGlvbiBpbgorICAgICAgICBib3RoIGNhc2VzIG9mIGNvbGQgYW5kIHdhcm0gY2FjaGUuCisKIDIw MTItMTAtMDQgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQnVp bGQgZml4IGFmdGVyIHIxMzA0MTEuIEFkZCB0aGUgcmlnaHQgb2Zmc2V0LgpJbmRleDogU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udEZhc3RQYXRoLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250RmFzdFBhdGguY3BwCShyZXZp c2lvbiAxMzAzMDApCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250RmFz dFBhdGguY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw2ICs0Nyw0MCBAQCBHbHlwaERhdGEgRm9u dDo6Z2x5cGhEYXRhRm9yQ2hhcmFjdGVyKFVDCiAgICAgcmV0dXJuIGdseXBoRGF0YUFuZFBhZ2VG b3JDaGFyYWN0ZXIoYywgbWlycm9yLCB2YXJpYW50KS5maXJzdDsKIH0KIAorc3RhdGljIGlubGlu ZSBzdGQ6OnBhaXI8R2x5cGhEYXRhLCBHbHlwaFBhZ2UqPiBhcHBseVRleHRPcmllbnRhdGlvbkZv ckNoYXJhY3RlcihVQ2hhcjMyIGMsIEdseXBoRGF0YSYgZGF0YSwgR2x5cGhQYWdlKiBwYWdlLCB1 bnNpZ25lZCBwYWdlTnVtYmVyLCBUZXh0T3JpZW50YXRpb24gb3JpZW50YXRpb24pCit7CisgICAg aWYgKG9yaWVudGF0aW9uID09IFRleHRPcmllbnRhdGlvblZlcnRpY2FsUmlnaHQpIHsKKyAgICAg ICAgUmVmUHRyPFNpbXBsZUZvbnREYXRhPiB2ZXJ0aWNhbFJpZ2h0Rm9udERhdGEgPSBkYXRhLmZv bnREYXRhLT52ZXJ0aWNhbFJpZ2h0T3JpZW50YXRpb25Gb250RGF0YSgpOworICAgICAgICBHbHlw aFBhZ2VUcmVlTm9kZSogdmVydGljYWxSaWdodE5vZGUgPSBHbHlwaFBhZ2VUcmVlTm9kZTo6Z2V0 Um9vdENoaWxkKHZlcnRpY2FsUmlnaHRGb250RGF0YS5nZXQoKSwgcGFnZU51bWJlcik7CisgICAg ICAgIEdseXBoUGFnZSogdmVydGljYWxSaWdodFBhZ2UgPSB2ZXJ0aWNhbFJpZ2h0Tm9kZS0+cGFn ZSgpOworICAgICAgICBpZiAodmVydGljYWxSaWdodFBhZ2UpIHsKKyAgICAgICAgICAgIEdseXBo RGF0YSB2ZXJ0aWNhbFJpZ2h0RGF0YSA9IHZlcnRpY2FsUmlnaHRQYWdlLT5nbHlwaERhdGFGb3JD aGFyYWN0ZXIoYyk7CisgICAgICAgICAgICAvLyBJZiB0aGUgZ2x5cGhzIGFyZSBkaXN0aW5jdCwg d2Ugd2lsbCBtYWtlIHRoZSBhc3N1bXB0aW9uIHRoYXQgdGhlIGZvbnQgaGFzIGEgdmVydGljYWwt cmlnaHQgZ2x5cGggYmFrZWQKKyAgICAgICAgICAgIC8vIGludG8gaXQuCisgICAgICAgICAgICBp ZiAoZGF0YS5nbHlwaCAhPSB2ZXJ0aWNhbFJpZ2h0RGF0YS5nbHlwaCkKKyAgICAgICAgICAgICAg ICByZXR1cm4gbWFrZV9wYWlyKGRhdGEsIHBhZ2UpOworICAgICAgICAgICAgLy8gVGhlIGdseXBo cyBhcmUgaWRlbnRpY2FsLCBtZWFuaW5nIHRoYXQgd2Ugc2hvdWxkIGp1c3QgdXNlIHRoZSBob3Jp em9udGFsIGdseXBoLgorICAgICAgICAgICAgaWYgKHZlcnRpY2FsUmlnaHREYXRhLmZvbnREYXRh KQorICAgICAgICAgICAgICAgIHJldHVybiBtYWtlX3BhaXIodmVydGljYWxSaWdodERhdGEsIHZl cnRpY2FsUmlnaHRQYWdlKTsKKyAgICAgICAgfQorICAgIH0gZWxzZSBpZiAob3JpZW50YXRpb24g PT0gVGV4dE9yaWVudGF0aW9uVXByaWdodCkgeworICAgICAgICBSZWZQdHI8U2ltcGxlRm9udERh dGE+IHVwcmlnaHRGb250RGF0YSA9IGRhdGEuZm9udERhdGEtPnVwcmlnaHRPcmllbnRhdGlvbkZv bnREYXRhKCk7CisgICAgICAgIEdseXBoUGFnZVRyZWVOb2RlKiB1cHJpZ2h0Tm9kZSA9IEdseXBo UGFnZVRyZWVOb2RlOjpnZXRSb290Q2hpbGQodXByaWdodEZvbnREYXRhLmdldCgpLCBwYWdlTnVt YmVyKTsKKyAgICAgICAgR2x5cGhQYWdlKiB1cHJpZ2h0UGFnZSA9IHVwcmlnaHROb2RlLT5wYWdl KCk7CisgICAgICAgIGlmICh1cHJpZ2h0UGFnZSkgeworICAgICAgICAgICAgR2x5cGhEYXRhIHVw cmlnaHREYXRhID0gdXByaWdodFBhZ2UtPmdseXBoRGF0YUZvckNoYXJhY3RlcihjKTsKKyAgICAg ICAgICAgIC8vIElmIHRoZSBnbHlwaHMgYXJlIHRoZSBzYW1lLCB0aGVuIHdlIGtub3cgd2UgY2Fu IGp1c3QgdXNlIHRoZSBob3Jpem9udGFsIGdseXBoIHJvdGF0ZWQgdmVydGljYWxseSB0byBiZSB1 cHJpZ2h0LgorICAgICAgICAgICAgaWYgKGRhdGEuZ2x5cGggPT0gdXByaWdodERhdGEuZ2x5cGgp CisgICAgICAgICAgICAgICAgcmV0dXJuIG1ha2VfcGFpcihkYXRhLCBwYWdlKTsKKyAgICAgICAg ICAgIC8vIFRoZSBnbHlwaHMgYXJlIGRpc3RpbmN0LCBtZWFuaW5nIHRoYXQgdGhlIGZvbnQgaGFz IGEgdmVydGljYWwtcmlnaHQgZ2x5cGggYmFrZWQgaW50byBpdC4gV2UgY2FuJ3QgdXNlIHRoYXQK KyAgICAgICAgICAgIC8vIGdseXBoLCBzbyB3ZSBmYWxsIGJhY2sgdG8gdGhlIHVwcmlnaHQgZGF0 YSBhbmQgdXNlIHRoZSBob3Jpem9udGFsIGdseXBoLgorICAgICAgICAgICAgaWYgKHVwcmlnaHRE YXRhLmZvbnREYXRhKQorICAgICAgICAgICAgICAgIHJldHVybiBtYWtlX3BhaXIodXByaWdodERh dGEsIHVwcmlnaHRQYWdlKTsKKyAgICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gbWFrZV9wYWly KGRhdGEsIHBhZ2UpOworfQorCiBzdGQ6OnBhaXI8R2x5cGhEYXRhLCBHbHlwaFBhZ2UqPiBGb250 OjpnbHlwaERhdGFBbmRQYWdlRm9yQ2hhcmFjdGVyKFVDaGFyMzIgYywgYm9vbCBtaXJyb3IsIEZv bnREYXRhVmFyaWFudCB2YXJpYW50KSBjb25zdAogewogICAgIEFTU0VSVChpc01haW5UaHJlYWQo KSk7CkBAIC05NSw0MCArMTI5LDkgQEAgc3RkOjpwYWlyPEdseXBoRGF0YSwgR2x5cGhQYWdlKj4g Rm9udDo6ZwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZhcmlhbnQgPSBCcm9rZW5JZGVv Z3JhcGhWYXJpYW50OwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAg ICAgICAgICAgICAgICAgICAgaWYgKG1fZm9udERlc2NyaXB0aW9uLnRleHRPcmllbnRhdGlvbigp ID09IFRleHRPcmllbnRhdGlvblZlcnRpY2FsUmlnaHQpIHsKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICBSZWZQdHI8U2ltcGxlRm9udERhdGE+IHZlcnRpY2FsUmlnaHRGb250RGF0YSA9IGRh dGEuZm9udERhdGEtPnZlcnRpY2FsUmlnaHRPcmllbnRhdGlvbkZvbnREYXRhKCk7Ci0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgR2x5cGhQYWdlVHJlZU5vZGUqIHZlcnRpY2FsUmlnaHROb2Rl ID0gR2x5cGhQYWdlVHJlZU5vZGU6OmdldFJvb3RDaGlsZCh2ZXJ0aWNhbFJpZ2h0Rm9udERhdGEu Z2V0KCksIHBhZ2VOdW1iZXIpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdseXBoUGFn ZSogdmVydGljYWxSaWdodFBhZ2UgPSB2ZXJ0aWNhbFJpZ2h0Tm9kZS0+cGFnZSgpOwotICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGlmICh2ZXJ0aWNhbFJpZ2h0UGFnZSkgewotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBHbHlwaERhdGEgdmVydGljYWxSaWdodERhdGEgPSB2ZXJ0 aWNhbFJpZ2h0UGFnZS0+Z2x5cGhEYXRhRm9yQ2hhcmFjdGVyKGMpOwotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAvLyBJZiB0aGUgZ2x5cGhzIGFyZSBkaXN0aW5jdCwgd2Ugd2lsbCBt YWtlIHRoZSBhc3N1bXB0aW9uIHRoYXQgdGhlIGZvbnQgaGFzIGEgdmVydGljYWwtcmlnaHQgZ2x5 cGggYmFrZWQKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gaW50byBpdC4KLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGRhdGEuZ2x5cGggIT0gdmVydGljYWxS aWdodERhdGEuZ2x5cGgpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1 cm4gbWFrZV9wYWlyKGRhdGEsIHBhZ2UpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAvLyBUaGUgZ2x5cGhzIGFyZSBpZGVudGljYWwsIG1lYW5pbmcgdGhhdCB3ZSBzaG91bGQganVz dCB1c2UgdGhlIGhvcml6b250YWwgZ2x5cGguCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGlmICh2ZXJ0aWNhbFJpZ2h0RGF0YS5mb250RGF0YSkKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHJldHVybiBtYWtlX3BhaXIodmVydGljYWxSaWdodERhdGEsIHZlcnRp Y2FsUmlnaHRQYWdlKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICAgICAgICAgICAgICB9IGVsc2UgaWYgKG1fZm9udERlc2NyaXB0aW9uLnRleHRPcmllbnRhdGlv bigpID09IFRleHRPcmllbnRhdGlvblVwcmlnaHQpIHsKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBSZWZQdHI8U2ltcGxlRm9udERhdGE+IHVwcmlnaHRGb250RGF0YSA9IGRhdGEuZm9udERh dGEtPnVwcmlnaHRPcmllbnRhdGlvbkZvbnREYXRhKCk7Ci0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgR2x5cGhQYWdlVHJlZU5vZGUqIHVwcmlnaHROb2RlID0gR2x5cGhQYWdlVHJlZU5vZGU6 OmdldFJvb3RDaGlsZCh1cHJpZ2h0Rm9udERhdGEuZ2V0KCksIHBhZ2VOdW1iZXIpOwotICAgICAg ICAgICAgICAgICAgICAgICAgICAgIEdseXBoUGFnZSogdXByaWdodFBhZ2UgPSB1cHJpZ2h0Tm9k ZS0+cGFnZSgpOwotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICh1cHJpZ2h0UGFnZSkg ewotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHbHlwaERhdGEgdXByaWdodERhdGEg PSB1cHJpZ2h0UGFnZS0+Z2x5cGhEYXRhRm9yQ2hhcmFjdGVyKGMpOwotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAvLyBJZiB0aGUgZ2x5cGhzIGFyZSB0aGUgc2FtZSwgdGhlbiB3ZSBr bm93IHdlIGNhbiBqdXN0IHVzZSB0aGUgaG9yaXpvbnRhbCBnbHlwaCByb3RhdGVkIHZlcnRpY2Fs bHkgdG8gYmUgdXByaWdodC4KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGRh dGEuZ2x5cGggPT0gdXByaWdodERhdGEuZ2x5cGgpCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICByZXR1cm4gbWFrZV9wYWlyKGRhdGEsIHBhZ2UpOwotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAvLyBUaGUgZ2x5cGhzIGFyZSBkaXN0aW5jdCwgbWVhbmluZyB0aGF0 IHRoZSBmb250IGhhcyBhIHZlcnRpY2FsLXJpZ2h0IGdseXBoIGJha2VkIGludG8gaXQuIFdlIGNh bid0IHVzZSB0aGF0Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIGdseXBoLCBz byB3ZSBmYWxsIGJhY2sgdG8gdGhlIHVwcmlnaHQgZGF0YSBhbmQgdXNlIHRoZSBob3Jpem9udGFs IGdseXBoLgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAodXByaWdodERhdGEu Zm9udERhdGEpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gbWFr ZV9wYWlyKHVwcmlnaHREYXRhLCB1cHJpZ2h0UGFnZSk7Ci0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgfQotICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICB9 IGVsc2UKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybiBhcHBseVRleHRPcmllbnRhdGlv bkZvckNoYXJhY3RlcihjLCBkYXRhLCBwYWdlLCBwYWdlTnVtYmVyLCBtX2ZvbnREZXNjcmlwdGlv bi50ZXh0T3JpZW50YXRpb24oKSk7CiAKLSAgICAgICAgICAgICAgICAgICAgICAgIC8vIFNob3Vs ZG4ndCBiZSBwb3NzaWJsZSB0byBldmVuIHJlYWNoIHRoaXMgcG9pbnQuCi0gICAgICAgICAgICAg ICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgICAgICAgICByZXR1cm4gbWFrZV9wYWlyKGRhdGEsIHBhZ2UpOwogICAgICAg ICAgICAgICAgIH0KIApAQCAtMjIyLDYgKzIyNSw4IEBAIHN0ZDo6cGFpcjxHbHlwaERhdGEsIEds eXBoUGFnZSo+IEZvbnQ6OmcKICNlbHNlCiAgICAgICAgICAgICBwYWdlLT5zZXRHbHlwaERhdGFG b3JDaGFyYWN0ZXIoYywgZGF0YS5nbHlwaCwgZGF0YS5mb250RGF0YSk7CiAgICAgICAgICAgICBk YXRhLmZvbnREYXRhLT5zZXRNYXhHbHlwaFBhZ2VUcmVlTGV2ZWwobWF4KGRhdGEuZm9udERhdGEt Pm1heEdseXBoUGFnZVRyZWVMZXZlbCgpLCBub2RlLT5sZXZlbCgpKSk7CisgICAgICAgICAgICBp ZiAoZGF0YS5mb250RGF0YS0+cGxhdGZvcm1EYXRhKCkub3JpZW50YXRpb24oKSAhPSBIb3Jpem9u dGFsICYmICFkYXRhLmZvbnREYXRhLT5pc1RleHRPcmllbnRhdGlvbkZhbGxiYWNrKCkpCisgICAg ICAgICAgICAgICAgcmV0dXJuIGFwcGx5VGV4dE9yaWVudGF0aW9uRm9yQ2hhcmFjdGVyKGMsIGRh dGEsIGZhbGxiYWNrUGFnZSwgcGFnZU51bWJlciwgbV9mb250RGVzY3JpcHRpb24udGV4dE9yaWVu dGF0aW9uKCkpOwogI2VuZGlmCiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIG1ha2VfcGFpcihk YXRhLCBwYWdlKTsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMDQzMikKKysrIExheW91dFRlc3RzL0No YW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDEyLTEwLTA0ICBFbnJp Y2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgRm9udDo6Z2x5cGhEYXRh QW5kUGFnZUZvckNoYXJhY3RlciBkb2Vzbid0IGFjY291bnQgZm9yIHRleHQgb3JpZW50YXRpb24g d2hlbiB1c2luZyBzeXN0ZW1GYWxsYmFjayBvbiBhIGNvbGQgY2FjaGUuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODQ1Mi4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgbmV3IHRlc3QgYWRkcyBwbGF0 Zm9ybSBzcGVjaWZpYyByZXN1bHRzIGZvciBNYWMsIHNpbmNlIGl0IHVzZXMgc3lzdGVtIGZhbGxi YWNrIGZvbnRzLgorICAgICAgICBJJ3ZlIGFkZGVkIHRoZSBleHBlY3RlZCBmYWlsdXJlIGZvciBh bGwgdGhlIG90aGVyIHBsYXRmb3Jtcy4KKworICAgICAgICAqIGZhc3QvdGV4dC92ZXJ0aWNhbC1y bC1ydGwtbGluZWJyZWFrLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVt L1Rlc3RFeHBlY3RhdGlvbnM6CisgICAgICAgICogcGxhdGZvcm0vZWZsL1Rlc3RFeHBlY3RhdGlv bnM6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnM6CisgICAgICAgICog cGxhdGZvcm0vbWFjL2Zhc3QvdGV4dC92ZXJ0aWNhbC1ybC1ydGwtbGluZWJyZWFrLWV4cGVjdGVk LnR4dDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vcXQvVGVzdEV4cGVjdGF0aW9uczoKKyAg ICAgICAgKiBwbGF0Zm9ybS93aW4vVGVzdEV4cGVjdGF0aW9uczoKKwogMjAxMi0xMC0wNCAgQWxw aGEgTGFtICA8aGNsYW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIENocm9t aXVtIHJlYmFzZWxpbmVzLgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3ZlcnRpY2FsLXJs LXJ0bC1saW5lYnJlYWsuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3RleHQv dmVydGljYWwtcmwtcnRsLWxpbmVicmVhay5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVz dHMvZmFzdC90ZXh0L3ZlcnRpY2FsLXJsLXJ0bC1saW5lYnJlYWsuaHRtbAkocmV2aXNpb24gMCkK QEAgLTAsMCArMSwxMiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEg aHR0cC1lcXVpdj0iY29udGVudC10eXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9dXRm LTgiPgorPC9oZWFkPgorPGJvZHk+Cis8cD5UaGlzIHRlc3RzIGxpbmUgYnJlYWsgb24gdmVydGlj YWwgdGV4dC4gVGhlIHRlc3Qgc2hvdWxkIGJlIHJ1biBvbiBhIGNvbGQgZm9udCBjYWNoZSBhbmQg cmVmcmVzaGluZyB0aGUgcGFnZSBzaG91bGQgbm90IHNob3cgZGlmZmVyZW5jZS48L3A+Cis8ZGl2 IGRpcj0icnRsIiBzdHlsZT0iZm9udC1mYW1pbHk6IG1vbm9zcGFjZTsgZm9udC1zaXplOiAyMHB4 OyBoZWlnaHQ6IDE1ZXg7IHdpZHRoOiA5OHB4OyAtd2Via2l0LXdyaXRpbmctbW9kZTogdmVydGlj YWwtcmw7IG91dGxpbmU6IG5vbmU7Ij4KK9eQ16DXmSDXl9eq15XXnC4g15DXmdefINec15kg16nX nS4KKzwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0v Y2hyb21pdW0vVGVzdEV4cGVjdGF0aW9ucwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0 Zm9ybS9jaHJvbWl1bS9UZXN0RXhwZWN0YXRpb25zCShyZXZpc2lvbiAxMzAzMDApCisrKyBMYXlv dXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS9UZXN0RXhwZWN0YXRpb25zCSh3b3JraW5nIGNvcHkp CkBAIC05NzEsNiArOTcxLDkgQEAgd2Via2l0Lm9yZy9iLzgzMjYwIGZhc3QvdGV4dC9pbnRlcm5h dGlvbgogIyBNYXJraW5nIGFzIGV4cGVjdGVkIGZhaWxpbmcgdW50aWwgdGhlIHRlc3QgY2FuIGJl IHVwZGF0ZWQgYW5kIGFsbCBwbGF0Zm9ybXMgcmViYXNlbGluZWQuCiB3ZWJraXQub3JnL2IvOTYz MTkgZmFzdC9ibG9jay9mbG9hdC9vdmVyaGFuZ2luZy10YWxsLWJsb2NrLmh0bWwgWyBGYWlsdXJl IF0KIAorIyBOZXcgdGVzdCBhZGRlZCB0aGF0IG5lZWRzIHBsYXRmb3JtIHNwZWNpZmljIHJlc3Vs dHMKK3dlYmtpdC5vcmcvYi85ODQ1MiBmYXN0L3RleHQvdmVydGljYWwtcmwtcnRsLWxpbmVicmVh ay5odG1sIFsgRmFpbHVyZSBdCisKICMgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KICMgSW5zcGVjdG9yIHRlc3RzCiAjIC0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvVGVzdEV4cGVjdGF0aW9ucwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvVGVzdEV4cGVjdGF0aW9ucwko cmV2aXNpb24gMTMwMzAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1Rlc3RFeHBlY3Rh dGlvbnMJKHdvcmtpbmcgY29weSkKQEAgLTY1MCw2ICs2NTAsOSBAQCB3ZWJraXQub3JnL2IvOTA5 MjggZmFzdC9kb20vT3JpZW50YXRpb24gCiAjIEVGTCBwb3J0IGRvZXMgbm90IGltcGxlbWVudCBE ZXZpY2VNb3Rpb24KIHdlYmtpdC5vcmcvYi85NTMwMCBmYXN0L2RvbS9EZXZpY2VNb3Rpb24gWyBT a2lwIF0KIAorIyBOZXcgdGVzdCBhZGRlZCBmb3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTk4NDUyIG5lZWRzIHBsYXRmb3JtIHNwZWNpZmljIHJlc3VsdHMKK2Zhc3Qv dGV4dC92ZXJ0aWNhbC1ybC1ydGwtbGluZWJyZWFrLmh0bWwgWyBGYWlsdXJlIF0KKwogIyBUaGUg RUZMIHBvcnQgaGFzIG5vIHN1cHBvcnQgZm9yIGFjY2Vzc2liaWxpdHkgZmVhdHVyZXMKIEJ1ZyhF RkwpIGFjY2Vzc2liaWxpdHkgWyBTa2lwIF0KIApJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0v Z3RrL1Rlc3RFeHBlY3RhdGlvbnMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0v Z3RrL1Rlc3RFeHBlY3RhdGlvbnMJKHJldmlzaW9uIDEzMDMwMCkKKysrIExheW91dFRlc3RzL3Bs YXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zCSh3b3JraW5nIGNvcHkpCkBAIC00MzEsNiArNDMx LDkgQEAgd2Via2l0Lm9yZy9iLzg0NjM1IGZhc3QvZG9tL0hUTUxEaWFsb2dFbAogd2Via2l0Lm9y Zy9iLzkyOTQyIGZhc3QvZG9tL1Byb3hpbWl0eQogd2Via2l0Lm9yZy9iLzkyOTQyIGZhc3QvZXZl bnRzL2NvbnN0cnVjdG9ycy9kZXZpY2UtcHJveGltaXR5LWV2ZW50LWNvbnN0cnVjdG9yLmh0bWwK IAorIyBOZXcgdGVzdCBhZGRlZCBmb3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTk4NDUyIG5lZWRzIHBsYXRmb3JtIHNwZWNpZmljIHJlc3VsdHMKK2Zhc3QvdGV4dC92 ZXJ0aWNhbC1ybC1ydGwtbGluZWJyZWFrLmh0bWwgWyBGYWlsdXJlIF0KKwogIy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8KICMgRW5kIG9mIEV4cGVjdGVkIGZhaWx1cmVzCiAjLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLwpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFj L2Zhc3QvdGV4dC92ZXJ0aWNhbC1ybC1ydGwtbGluZWJyZWFrLWV4cGVjdGVkLnR4dAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC90ZXh0L3ZlcnRpY2FsLXJsLXJ0 bC1saW5lYnJlYWstZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjL2Zhc3QvdGV4dC92ZXJ0aWNhbC1ybC1ydGwtbGluZWJyZWFrLWV4cGVjdGVkLnR4 dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwxMyBAQAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4 NjAwCisgIFJlbmRlclZpZXcgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCitsYXllciBhdCAoMCwwKSBz aXplIDgwMHgyMTEKKyAgUmVuZGVyQmxvY2sge0hUTUx9IGF0ICgwLDApIHNpemUgODAweDIxMQor ICAgIFJlbmRlckJvZHkge0JPRFl9IGF0ICg4LDE2KSBzaXplIDc4NHgxODcKKyAgICAgIFJlbmRl ckJsb2NrIHtQfSBhdCAoMCwwKSBzaXplIDc4NHgzNgorICAgICAgICBSZW5kZXJUZXh0IHsjdGV4 dH0gYXQgKDAsMCkgc2l6ZSA3NjB4MzYKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0 aCA3NjA6ICJUaGlzIHRlc3RzIGxpbmUgYnJlYWsgb24gdmVydGljYWwgdGV4dC4gVGhlIHRlc3Qg c2hvdWxkIGJlIHJ1biBvbiBhIGNvbGQgZm9udCBjYWNoZSBhbmQgcmVmcmVzaGluZyB0aGUgcGFn ZSBzaG91bGQgbm90IHNob3ciCisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMTgpIHdpZHRoIDY3 OiAiZGlmZmVyZW5jZS4iCisgICAgICBSZW5kZXJCbG9jayB7RElWfSBhdCAoMCw1Mikgc2l6ZSA5 OHgxMzUKKyAgICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgxLDApIHNpemUgNDd4MTM1Cisg ICAgICAgICAgdGV4dCBydW4gYXQgKDEsMCkgd2lkdGggMTM1IFJUTDogIlx4ezVEMH1ceHs1RTB9 XHh7NUQ5fSBceHs1RDd9XHh7NUVBfVx4ezVENX1ceHs1REN9LiBceHs1RDB9XHh7NUQ5fVx4ezVE Rn0iCisgICAgICAgICAgdGV4dCBydW4gYXQgKDI1LDY1KSB3aWR0aCA3MCBSVEw6ICJceHs1REN9 XHh7NUQ5fSBceHs1RTl9XHh7NUREfS4iCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9U ZXN0RXhwZWN0YXRpb25zCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL3F0L1Rl c3RFeHBlY3RhdGlvbnMJKHJldmlzaW9uIDEzMDMwMCkKKysrIExheW91dFRlc3RzL3BsYXRmb3Jt L3F0L1Rlc3RFeHBlY3RhdGlvbnMJKHdvcmtpbmcgY29weSkKQEAgLTEwNjEsNiArMTA2MSw4IEBA IGZhc3Qvc2VsZWN0b3JzL3VucXVhbGlmaWVkLWhvdmVyLXN0cmljdC4KICMgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5MTUzCiBodHRwL3Rlc3RzL3dlYnNvY2tldC90 ZXN0cy9oeWJpL3dvcmtlcnMvY2xvc2UuaHRtbAogCisjIE5ldyB0ZXN0IGFkZGVkIGZvciBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTg0NTIgbmVlZHMgcGxhdGZvcm0g c3BlY2lmaWMgcmVzdWx0cworZmFzdC90ZXh0L3ZlcnRpY2FsLXJsLXJ0bC1saW5lYnJlYWsuaHRt bAogCiAjID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PSAjCiAjIGZhaWxpbmcgbWVkaWEgdGVzdHMKSW5kZXg6 IExheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zCShyZXZpc2lvbiAxMzAz MDApCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vVGVzdEV4cGVjdGF0aW9ucwkod29ya2lu ZyBjb3B5KQpAQCAtMTg3LDYgKzE4Nyw5IEBAIGZhc3QvZXZlbnRzL2tleWRvd24tbnVtcGFkLWtl eXMuaHRtbAogIyBObyBidXR0b24gdHJhY2tlZAogZmFzdC9ldmVudHMvbW91c2VvdmVyLWJ1dHRv bi5odG1sCiAKKyMgTmV3IHRlc3QgYWRkZWQgZm9yIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD05ODQ1MiBuZWVkcyBwbGF0Zm9ybSBzcGVjaWZpYyByZXN1bHRzCitmYXN0 L3RleHQvdmVydGljYWwtcmwtcnRsLWxpbmVicmVhay5odG1sIFsgRmFpbHVyZSBdCisKICMgVGhl IGVxcWl2YWxlbnQgb2Ygb3B0aW9uLXRhYiBkb2VzbiBub3QgZXhpc3QgaW4gQm9vbWVyIDxyZGFy Oi8vcHJvYmxlbS81MTM3MjMwPgogZmFzdC9ldmVudHMvZnJhbWUtdGFiLWZvY3VzLmh0bWwKIGZh c3QvZXZlbnRzL29wdGlvbi10YWIuaHRtbAo=