27663 2009-07-24 12:25:57 -0700 FontPlatformData for Qt requires mapping from FontWeight to QFont::Weight 2009-07-27 14:32:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 0 mifenton webkit-unassigned manyoso oldest_to_newest 134624 0 mifenton 2009-07-24 12:25:57 -0700 Based on FIXME's found in graphics/qt/FontPlatformDataQt.cpp and graphics/qt/FontCacheQt.cpp an update is required to map FontWeight to QFont::Weight values. 134628 1 33461 mifenton 2009-07-24 12:32:44 -0700 Created attachment 33461 Path to add toQFontWeight functionality. 134638 2 33461 manyoso 2009-07-24 12:59:49 -0700 Comment on attachment 33461 Path to add toQFontWeight functionality. > + static inline QFont::Weight toQFontWeight(FontWeight fontWeight) > + { > + QFont::Weight weight; Unnecessary. > + switch (fontWeight) { > + case FontWeight100: > + case FontWeight200: > + weight = QFont::Light; > + break; return QFont::Light; > + case FontWeight600: > + weight = QFont::DemiBold; return QFont::DemiBold; And so on... > - if (description.weight() >= FontWeight600) { > - m_font.setWeight(QFont::Bold); > - m_bold = true; > - } else > - m_font.setWeight(QFont::Normal); > + > + m_font.setWeight(toQFontWeight(description.weight())); > + m_bold = m_font.bold(); Seems unnecessary to keep 'm_bold' with what you are doing. m_font.bold() stores the state. However, this appears to be a behavior change. Are you sure it is correct? How did you go about determining the proper mapping? Did you run the layout tests before and after to see if anything changed? Cheers, Adam 134950 3 33556 mifenton 2009-07-27 11:07:04 -0700 Created attachment 33556 Revised Patch Patch has been updated. Based on feedback, toQFontWeight now returns values directly within intermediary variable. Switch bold calculation to >Normal from >=Bold to ensure logic matches calculation provided by QFont.bold(). This does not break any tests. m_bold variable is required by FontPlatformData and can not be removed without affecting other platforms. 134963 4 33556 manyoso 2009-07-27 11:29:46 -0700 Comment on attachment 33556 Revised Patch Looks good to me. 135023 5 manyoso 2009-07-27 14:32:12 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/platform/graphics/qt/FontCacheQt.cpp M WebCore/platform/graphics/qt/FontPlatformData.h M WebCore/platform/graphics/qt/FontPlatformDataQt.cpp Committed r46428 M WebCore/ChangeLog M WebCore/platform/graphics/qt/FontCacheQt.cpp M WebCore/platform/graphics/qt/FontPlatformData.h M WebCore/platform/graphics/qt/FontPlatformDataQt.cpp r46428 = 4e8d024866454361b6a4ba28eff659a91cc1517e (git-svn) No changes between current HEAD and refs/remotes/git-svn Resetting to the latest refs/remotes/git-svn http://trac.webkit.org/changeset/46428 33461 2009-07-24 12:32:44 -0700 2009-07-27 11:07:04 -0700 Path to add toQFontWeight functionality. QFontWeightPatch.diff text/plain 3683 mifenton ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YjMxMzA2Ni4uNjhlZDM5MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAwOS0wNy0yNCAgTWlrZSBGZW50b24g IDxtaWtlLmZlbnRvbkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIG1hcHBpbmcgRm9udFdlaWdodCB0byBRRm9udDo6 V2VpZ2h0IHZhbHVlcyBhcyByZXF1ZXN0ZWQgdmlhIEZJWE1FLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc2NjMKKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3F0L0ZvbnRDYWNoZVF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0 Zm9ybURhdGFDYWNoZUtleTo6Rm9udFBsYXRmb3JtRGF0YUNhY2hlS2V5KToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UGxhdGZvcm1EYXRhLmg6CisgICAgICAgIChXZWJDb3Jl OjpGb250UGxhdGZvcm1EYXRhOjp0b1FGb250V2VpZ2h0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9xdC9Gb250UGxhdGZvcm1EYXRhUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YSk6CisKIDIwMDktMDctMjMgIFhhbiBMb3Bl eiAgPHhsb3BlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcmsgUm93ZS4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udENhY2hlUXQuY3Bw IGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250Q2FjaGVRdC5jcHAKaW5kZXggMzNl NWQ1MS4uOTQ3NmEzZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9G b250Q2FjaGVRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250Q2Fj aGVRdC5jcHAKQEAgLTY1LDcgKzY1LDcgQEAgcHVibGljOgogICAgICAgICAsIG1faGFzaCgwKQog ICAgIHsKICAgICAgICAgLy8gRklYTUU6IE1hcCBhbGwgRm9udFdlaWdodCB2YWx1ZXMgdG8gUUZv bnQgd2VpZ2h0cyBpbiBGb250UGxhdGZvcm1EYXRhJ3MgY3RvciBhbmQgZm9sbG93IGl0IGhlcmUK LSAgICAgICAgaWYgKGRlc2NyaXB0aW9uLndlaWdodCgpID49IEZvbnRXZWlnaHQ2MDApCisgICAg ICAgIGlmIChGb250UGxhdGZvcm1EYXRhOjp0b1FGb250V2VpZ2h0KGRlc2NyaXB0aW9uLndlaWdo dCgpKSA+PSBRRm9udDo6Qm9sZCkKICAgICAgICAgICAgIG1fYm9sZCA9IHRydWU7CiAKICAgICAg ICAgY29uc3QgRm9udEZhbWlseSogZmFtaWx5ID0gJmRlc2NyaXB0aW9uLmZhbWlseSgpOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UGxhdGZvcm1EYXRhLmgg Yi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ZvbnRQbGF0Zm9ybURhdGEuaAppbmRleCBh MGUyNDhjLi42MGM3ZjJhIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0 L0ZvbnRQbGF0Zm9ybURhdGEuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0Zv bnRQbGF0Zm9ybURhdGEuaApAQCAtMzksNiArMzksMzYgQEAgcHVibGljOgogICAgIEZvbnRQbGF0 Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiwgaW50IHdvcmRTcGFjaW5nID0gMCwgaW50 IGxldHRlclNwYWNpbmcgPSAwKTsKICAgICBGb250UGxhdGZvcm1EYXRhKGNvbnN0IFFGb250Jiwg Ym9vbCBib2xkKTsKIAorICAgIHN0YXRpYyBpbmxpbmUgUUZvbnQ6OldlaWdodCB0b1FGb250V2Vp Z2h0KEZvbnRXZWlnaHQgZm9udFdlaWdodCkKKyAgICB7CisgICAgICAgIFFGb250OjpXZWlnaHQg d2VpZ2h0OworCisgICAgICAgIHN3aXRjaCAoZm9udFdlaWdodCkgeworICAgICAgICBjYXNlIEZv bnRXZWlnaHQxMDA6CisgICAgICAgIGNhc2UgRm9udFdlaWdodDIwMDoKKyAgICAgICAgICAgIHdl aWdodCA9IFFGb250OjpMaWdodDsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEZv bnRXZWlnaHQ2MDA6CisgICAgICAgICAgICB3ZWlnaHQgPSBRRm9udDo6RGVtaUJvbGQ7CisgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBGb250V2VpZ2h0NzAwOgorICAgICAgICBjYXNl IEZvbnRXZWlnaHQ4MDA6CisgICAgICAgICAgICB3ZWlnaHQgPSBRRm9udDo6Qm9sZDsKKyAgICAg ICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEZvbnRXZWlnaHQ5MDA6CisgICAgICAgICAgICB3 ZWlnaHQgPSBRRm9udDo6QmxhY2s7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBG b250V2VpZ2h0MzAwOgorICAgICAgICBjYXNlIEZvbnRXZWlnaHQ0MDA6CisgICAgICAgIGNhc2Ug Rm9udFdlaWdodDUwMDoKKyAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgIHdlaWdodCA9IFFG b250OjpOb3JtYWw7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorCisgICAgICAgIHJl dHVybiB3ZWlnaHQ7CisgICAgfQorCiAgICAgUUZvbnQgZm9udCgpIGNvbnN0IHsgcmV0dXJuIG1f Zm9udDsgfQogICAgIGZsb2F0IHNpemUoKSBjb25zdCB7IHJldHVybiBtX3NpemU7IH0KICAgICBR U3RyaW5nIGZhbWlseSgpIGNvbnN0IHsgcmV0dXJuIG1fZm9udC5mYW1pbHkoKTsgfQpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UGxhdGZvcm1EYXRhUXQuY3Bw IGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UGxhdGZvcm1EYXRhUXQuY3BwCmlu ZGV4IDJmMzcwZGMuLjZhZWViMmUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvRm9udFBsYXRmb3JtRGF0YVF0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3F0L0ZvbnRQbGF0Zm9ybURhdGFRdC5jcHAKQEAgLTQwLDEyICs0MCw5IEBAIEZvbnRQbGF0 Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udERlc2NyaXB0aW9uJiBkZXNjcmlw dGlvbiwgaW50IHdvcmRTCiAgICAgbV9mb250LnNldEZhbWlseShmYW1pbHlOYW1lKTsKICAgICBt X2ZvbnQuc2V0UGl4ZWxTaXplKHFSb3VuZChkZXNjcmlwdGlvbi5jb21wdXRlZFNpemUoKSkpOwog ICAgIG1fZm9udC5zZXRJdGFsaWMoZGVzY3JpcHRpb24uaXRhbGljKCkpOwotICAgIC8vIEZJWE1F OiBNYXAgYWxsIEZvbnRXZWlnaHQgdmFsdWVzIHRvIFFGb250IHdlaWdodHMuCi0gICAgaWYgKGRl c2NyaXB0aW9uLndlaWdodCgpID49IEZvbnRXZWlnaHQ2MDApIHsKLSAgICAgICAgbV9mb250LnNl dFdlaWdodChRRm9udDo6Qm9sZCk7Ci0gICAgICAgIG1fYm9sZCA9IHRydWU7Ci0gICAgfSBlbHNl Ci0gICAgICAgIG1fZm9udC5zZXRXZWlnaHQoUUZvbnQ6Ok5vcm1hbCk7CisKKyAgICBtX2ZvbnQu c2V0V2VpZ2h0KHRvUUZvbnRXZWlnaHQoZGVzY3JpcHRpb24ud2VpZ2h0KCkpKTsKKyAgICBtX2Jv bGQgPSBtX2ZvbnQuYm9sZCgpOwogCiAgICAgYm9vbCBzbWFsbENhcHMgPSBkZXNjcmlwdGlvbi5z bWFsbENhcHMoKTsKICAgICBtX2ZvbnQuc2V0Q2FwaXRhbGl6YXRpb24oc21hbGxDYXBzID8gUUZv bnQ6OlNtYWxsQ2FwcyA6IFFGb250OjpNaXhlZENhc2UpOwo= 33556 2009-07-27 11:07:04 -0700 2009-07-27 11:29:46 -0700 Revised Patch QFontWeightPatchRevised.patch text/plain 4303 mifenton ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YjMxMzA2Ni4uNjhlZDM5MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAwOS0wNy0yNCAgTWlrZSBGZW50b24g IDxtaWtlLmZlbnRvbkB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIG1hcHBpbmcgRm9udFdlaWdodCB0byBRRm9udDo6 V2VpZ2h0IHZhbHVlcyBhcyByZXF1ZXN0ZWQgdmlhIEZJWE1FLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc2NjMKKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3F0L0ZvbnRDYWNoZVF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvbnRQbGF0 Zm9ybURhdGFDYWNoZUtleTo6Rm9udFBsYXRmb3JtRGF0YUNhY2hlS2V5KToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UGxhdGZvcm1EYXRhLmg6CisgICAgICAgIChXZWJDb3Jl OjpGb250UGxhdGZvcm1EYXRhOjp0b1FGb250V2VpZ2h0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9xdC9Gb250UGxhdGZvcm1EYXRhUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YSk6CisKIDIwMDktMDctMjMgIFhhbiBMb3Bl eiAgPHhsb3BlekBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcmsgUm93ZS4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udENhY2hlUXQuY3Bw IGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250Q2FjaGVRdC5jcHAKaW5kZXggMzNl NWQ1MS4uNWQyOTM4OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9G b250Q2FjaGVRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250Q2Fj aGVRdC5jcHAKQEAgLTY1LDcgKzY1LDcgQEAgcHVibGljOgogICAgICAgICAsIG1faGFzaCgwKQog ICAgIHsKICAgICAgICAgLy8gRklYTUU6IE1hcCBhbGwgRm9udFdlaWdodCB2YWx1ZXMgdG8gUUZv bnQgd2VpZ2h0cyBpbiBGb250UGxhdGZvcm1EYXRhJ3MgY3RvciBhbmQgZm9sbG93IGl0IGhlcmUK LSAgICAgICAgaWYgKGRlc2NyaXB0aW9uLndlaWdodCgpID49IEZvbnRXZWlnaHQ2MDApCisgICAg ICAgIGlmIChGb250UGxhdGZvcm1EYXRhOjp0b1FGb250V2VpZ2h0KGRlc2NyaXB0aW9uLndlaWdo dCgpKSA+IFFGb250OjpOb3JtYWwpCiAgICAgICAgICAgICBtX2JvbGQgPSB0cnVlOwogCiAgICAg ICAgIGNvbnN0IEZvbnRGYW1pbHkqIGZhbWlseSA9ICZkZXNjcmlwdGlvbi5mYW1pbHkoKTsKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvRm9udFBsYXRmb3JtRGF0YS5o IGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UGxhdGZvcm1EYXRhLmgKaW5kZXgg YTBlMjQ4Yy4uZjZjNzdiNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9x dC9Gb250UGxhdGZvcm1EYXRhLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9G b250UGxhdGZvcm1EYXRhLmgKQEAgLTEsNiArMSw3IEBACiAvKgogICAgIENvcHlyaWdodCAoQykg MjAwOCBOb2tpYSBDb3Jwb3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlhcnkoLWllcykKICAgICBD b3B5cmlnaHQgKEMpIDIwMDggSG9sZ2VyIEhhbnMgUGV0ZXIgRnJleXRoZXIKKyAgICBDb3B5cmln aHQgKEMpIDIwMDkgVG9yY2ggTW9iaWxlIEluYy4gaHR0cDovL3d3dy50b3JjaG1vYmlsZS5jb20v CiAKICAgICBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1 dGUgaXQgYW5kL29yCiAgICAgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExp YnJhcnkgR2VuZXJhbCBQdWJsaWMKQEAgLTM5LDYgKzQwLDI3IEBAIHB1YmxpYzoKICAgICBGb250 UGxhdGZvcm1EYXRhKGNvbnN0IEZvbnREZXNjcmlwdGlvbiYsIGludCB3b3JkU3BhY2luZyA9IDAs IGludCBsZXR0ZXJTcGFjaW5nID0gMCk7CiAgICAgRm9udFBsYXRmb3JtRGF0YShjb25zdCBRRm9u dCYsIGJvb2wgYm9sZCk7CiAKKyAgICBzdGF0aWMgaW5saW5lIFFGb250OjpXZWlnaHQgdG9RRm9u dFdlaWdodChGb250V2VpZ2h0IGZvbnRXZWlnaHQpCisgICAgeworICAgICAgICBzd2l0Y2ggKGZv bnRXZWlnaHQpIHsKKyAgICAgICAgY2FzZSBGb250V2VpZ2h0MTAwOgorICAgICAgICBjYXNlIEZv bnRXZWlnaHQyMDA6CisgICAgICAgICAgICByZXR1cm4gUUZvbnQ6OkxpZ2h0OyAgLy8gUUZvbnQ6 OkxpZ2h0ID09IFdlaWdodCBvZiAyNQorICAgICAgICBjYXNlIEZvbnRXZWlnaHQ2MDA6CisgICAg ICAgICAgICByZXR1cm4gUUZvbnQ6OkRlbWlCb2xkOyAgLy8gUUZvbnQ6OkRlbWlCb2xkID09IFdl aWdodCBvZiA2MworICAgICAgICBjYXNlIEZvbnRXZWlnaHQ3MDA6CisgICAgICAgIGNhc2UgRm9u dFdlaWdodDgwMDoKKyAgICAgICAgICAgIHJldHVybiBRRm9udDo6Qm9sZDsgIC8vIFFGb250OjpC b2xkID09IFdlaWdodCBvZiA3NQorICAgICAgICBjYXNlIEZvbnRXZWlnaHQ5MDA6CisgICAgICAg ICAgICByZXR1cm4gUUZvbnQ6OkJsYWNrOyAgLy8gUUZvbnQ6OkJsYWNrID09IFdlaWdodCBvZiA4 NworICAgICAgICBjYXNlIEZvbnRXZWlnaHQzMDA6CisgICAgICAgIGNhc2UgRm9udFdlaWdodDQw MDoKKyAgICAgICAgY2FzZSBGb250V2VpZ2h0NTAwOgorICAgICAgICBkZWZhdWx0OgorICAgICAg ICAgICAgcmV0dXJuIFFGb250OjpOb3JtYWw7ICAvLyBRRm9udDo6Tm9ybWFsID09IFdlaWdodCBv ZiA1MAorICAgICAgICB9CisgICAgfQorCiAgICAgUUZvbnQgZm9udCgpIGNvbnN0IHsgcmV0dXJu IG1fZm9udDsgfQogICAgIGZsb2F0IHNpemUoKSBjb25zdCB7IHJldHVybiBtX3NpemU7IH0KICAg ICBRU3RyaW5nIGZhbWlseSgpIGNvbnN0IHsgcmV0dXJuIG1fZm9udC5mYW1pbHkoKTsgfQpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UGxhdGZvcm1EYXRhUXQu Y3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9Gb250UGxhdGZvcm1EYXRhUXQuY3Bw CmluZGV4IDJmMzcwZGMuLmY3NjBlMWQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvRm9udFBsYXRmb3JtRGF0YVF0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3F0L0ZvbnRQbGF0Zm9ybURhdGFRdC5jcHAKQEAgLTEsNSArMSw2IEBACiAvKgogICAg IENvcHlyaWdodCAoQykgMjAwOCBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlcgorICAgIENvcHly aWdodCAoQykgMjAwOSBUb3JjaCBNb2JpbGUgSW5jLiBodHRwOi8vd3d3LnRvcmNobW9iaWxlLmNv bS8KIAogICAgIFRoaXMgbGlicmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJp YnV0ZSBpdCBhbmQvb3IKICAgICBtb2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUg TGlicmFyeSBHZW5lcmFsIFB1YmxpYwpAQCAtNDAsMTIgKzQxLDkgQEAgRm9udFBsYXRmb3JtRGF0 YTo6Rm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGRlc2NyaXB0aW9uLCBp bnQgd29yZFMKICAgICBtX2ZvbnQuc2V0RmFtaWx5KGZhbWlseU5hbWUpOwogICAgIG1fZm9udC5z ZXRQaXhlbFNpemUocVJvdW5kKGRlc2NyaXB0aW9uLmNvbXB1dGVkU2l6ZSgpKSk7CiAgICAgbV9m b250LnNldEl0YWxpYyhkZXNjcmlwdGlvbi5pdGFsaWMoKSk7Ci0gICAgLy8gRklYTUU6IE1hcCBh bGwgRm9udFdlaWdodCB2YWx1ZXMgdG8gUUZvbnQgd2VpZ2h0cy4KLSAgICBpZiAoZGVzY3JpcHRp b24ud2VpZ2h0KCkgPj0gRm9udFdlaWdodDYwMCkgewotICAgICAgICBtX2ZvbnQuc2V0V2VpZ2h0 KFFGb250OjpCb2xkKTsKLSAgICAgICAgbV9ib2xkID0gdHJ1ZTsKLSAgICB9IGVsc2UKLSAgICAg ICAgbV9mb250LnNldFdlaWdodChRRm9udDo6Tm9ybWFsKTsKKworICAgIG1fZm9udC5zZXRXZWln aHQodG9RRm9udFdlaWdodChkZXNjcmlwdGlvbi53ZWlnaHQoKSkpOworICAgIG1fYm9sZCA9IG1f Zm9udC5ib2xkKCk7CiAKICAgICBib29sIHNtYWxsQ2FwcyA9IGRlc2NyaXB0aW9uLnNtYWxsQ2Fw cygpOwogICAgIG1fZm9udC5zZXRDYXBpdGFsaXphdGlvbihzbWFsbENhcHMgPyBRRm9udDo6U21h bGxDYXBzIDogUUZvbnQ6Ok1peGVkQ2FzZSk7Cg==