136327 2014-08-27 18:46:16 -0700 Initialization for some member variable of FontPlatformData 2015-01-23 02:33:34 -0800 1 1 1 Unclassified WebKit Text 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 byeongha.cho webkit-unassigned commit-queue mmaxfield oldest_to_newest 1031876 0 byeongha.cho 2014-08-27 18:46:16 -0700 There are initialization missing on FontPlatformData::FontPlatformData(const FontPlatformData& other, float size). This function is located on FontPlatformDataFreeType.cpp. I think m_fallbacks and m_scaledFont should be initialized on this creator. Because they are used as condition on FontPlatformData::operator= and FontPlatformData() is copying other to itself. 1031877 1 237278 byeongha.cho 2014-08-27 18:57:05 -0700 Created attachment 237278 Patch 1031896 2 237278 dbates 2014-08-27 21:14:07 -0700 Comment on attachment 237278 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=237278&action=review > Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp:229 > *this = other; I know you didn't write this, but this isn't a good idiom. That is, calling the assignment operator from inside a copy constructor isn't a good idiom because the former only applies to a fully initialized object and the latter initializes a new object. Instead we should extract the common code into a member function that is called from both the copy assignment and copy constructor. Notice that we also call the copy assignment operator from the default copy constructor: <http://trac.webkit.org/browser/trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp?rev=167768#L216>. 1032131 3 byeongha.cho 2014-08-29 03:02:18 -0700 You mean new function is needed for copying member variables like copyFontPlatformData() or something? But I think this patch is also needed in the case of using same copy function on assignment operator and copy constructor. Should we use different code between assignment op. and copy constructor?? 1032141 4 byeongha.cho 2014-08-29 04:25:30 -0700 You mean new function is needed for copying member variables like copyFontPlatformData() or something? But I think this patch is also needed in the case of using same copy function on assignment operator and copy constructor. Should we use different code between assignment op. and copy constructor?? 1062665 5 byeongha.cho 2015-01-20 00:27:21 -0800 I think idiom issue should be handled on another issue. Because, even though we add copy function for FontPlatformData, this patch is still needed. 1062966 6 237278 mmaxfield 2015-01-20 18:05:11 -0800 Comment on attachment 237278 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=237278&action=review > Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp:226 > + : m_fallbacks(0) > + , m_scaledFont(0) Please use nullptr. 1062968 7 237278 mmaxfield 2015-01-20 18:06:44 -0800 Comment on attachment 237278 Patch Please file an issue for refactoring common code between the copy constructor and copy assignment operator. 1063011 8 245052 byeongha.cho 2015-01-20 23:58:40 -0800 Created attachment 245052 Patch 1063012 9 byeongha.cho 2015-01-21 00:00:31 -0800 I have filed an issue for idiom. https://bugs.webkit.org/show_bug.cgi?id=140718 1063253 10 245108 byeongha.cho 2015-01-21 18:38:31 -0800 Created attachment 245108 Patch for landing 1063643 11 245108 gyuyoung.kim 2015-01-23 01:51:11 -0800 Comment on attachment 245108 Patch for landing LGTM. cq=me 1063644 12 245108 commit-queue 2015-01-23 02:33:30 -0800 Comment on attachment 245108 Patch for landing Clearing flags on attachment: 245108 Committed r179006: <http://trac.webkit.org/changeset/179006> 1063645 13 commit-queue 2015-01-23 02:33:34 -0800 All reviewed patches have been landed. Closing bug. 237278 2014-08-27 18:57:05 -0700 2015-01-20 23:58:32 -0800 Patch bug-136327-20140828105658.patch text/plain 1515 byeongha.cho U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwODIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGY2NDAzZDMwNDdjYzQ4 ODg1MTQ0MDc0NzY1MGNjYWQ1NDQxNTk4Yy4uZGY3ZmEyODU5OGU4M2M3NWY5NjQ0MmU5ZmIyYjE5 MDY4ODE3ZGJjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTA4LTI3ICBCeWVv bmdoYSBDaG8gIDxieWVvbmdoYS5jaG9Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgSW5pdGlhbGl6 YXRpb24gZm9yIHNvbWUgbWVtYmVyIHZhcmlhYmxlIG9mIEZvbnRQbGF0Zm9ybURhdGEKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjMyNworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4g VGhlcmUncyBubyBmdW5jdGlvbmFsIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKToKKwogMjAxNC0wNy0wNCAg QmVuamFtaW4gUG91bGFpbiAgPGJlbmphbWluQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQ1NTIEpJ VDogY29tcGlsZSA6aW4tcmFuZ2UgYW5kIDpvdXQtb2YtcmFuZ2UKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVl VHlwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250 UGxhdGZvcm1EYXRhRnJlZVR5cGUuY3BwCmluZGV4IDFkNGYyNGQzYTA4ZTFkNTQyZTMxMzQzZDc1 NDkyZDdkMmM4ZTE5ZjMuLjc0ODk0N2Y1MjRjNjIzZDA2OGZjMTk0YWUzZGJkY2VmNDk4NmFmNzUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBlL0Zv bnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVUeXBlLmNwcApAQCAtMjIyLDcg KzIyMiw5IEBAIEZvbnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEoY29uc3QgRm9udFBs YXRmb3JtRGF0YSYgb3RoZXIpCiB9CiAKIEZvbnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURh dGEoY29uc3QgRm9udFBsYXRmb3JtRGF0YSYgb3RoZXIsIGZsb2F0IHNpemUpCi0gICAgOiBtX2hh cmZCdXp6RmFjZShvdGhlci5tX2hhcmZCdXp6RmFjZSkKKyAgICA6IG1fZmFsbGJhY2tzKDApCisg ICAgLCBtX3NjYWxlZEZvbnQoMCkKKyAgICAsIG1faGFyZkJ1enpGYWNlKG90aGVyLm1faGFyZkJ1 enpGYWNlKQogewogICAgICp0aGlzID0gb3RoZXI7CiAK 245052 2015-01-20 23:58:40 -0800 2015-01-21 18:38:21 -0800 Patch bug-136327-20150121165847.patch text/plain 4009 byeongha.cho U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4Nzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWQxNjIxNjIwOTg0MzM3 ZGFkNWNlODZmNTVkOWE4MWRjMzIyNWU2MS4uYTU0MGQ3ZWE5ZWZlMjE0MTllNzIyYTlmNGIwMTVi OGRmOWNmMjllMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTAxLTIwICBCeWVv bmdoYSBDaG8gIDxieWVvbmdoYS5jaG9Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgSW5pdGlhbGl6 YXRpb24gZm9yIHNvbWUgbWVtYmVyIHZhcmlhYmxlIG9mIEZvbnRQbGF0Zm9ybURhdGEKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjMyNworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4g VGhlcmUncyBubyBmdW5jdGlvbmFsIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKToKKyAgICAgICAgKFdlYkNv cmU6OkZvbnRQbGF0Zm9ybURhdGE6Om9wZXJhdG9yPSk6CisgICAgICAgIChXZWJDb3JlOjpGb250 UGxhdGZvcm1EYXRhOjp+Rm9udFBsYXRmb3JtRGF0YSk6CisKIDIwMTUtMDEtMjAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBTaW1wbGlmeSBEaWFnbm9zdGljTG9n Z2luZ0NsaWVudCBjYWxsIHNpdGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9mcmVldHlwZS9Gb250UGxhdGZvcm1EYXRhRnJlZVR5cGUuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZyZWVU eXBlLmNwcAppbmRleCA2ZjY5YjA3OGY3OWY1ODY5MTRlNzU1Y2Q1YWQxZjEyZWE5Y2ViOTZmLi5k YTFmMmY5OGM3MTc1ZTJlZjUxZGZjNTdjZjJmNzE2ZWIwZjQzNGQzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250UGxhdGZvcm1EYXRhRnJl ZVR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0eXBl L0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHAKQEAgLTEyNywxMiArMTI3LDEyIEBAIHN0YXRp YyB2b2lkIHJvdGF0ZUNhaXJvTWF0cml4Rm9yVmVydGljYWxPcmllbnRhdGlvbihjYWlyb19tYXRy aXhfdCogbWF0cml4KQogCiBGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKEZjUGF0 dGVybiogcGF0dGVybiwgY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24pCiAg ICAgOiBtX3BhdHRlcm4ocGF0dGVybikKLSAgICAsIG1fZmFsbGJhY2tzKDApCisgICAgLCBtX2Zh bGxiYWNrcyhudWxscHRyKQogICAgICwgbV9zaXplKGZvbnREZXNjcmlwdGlvbi5jb21wdXRlZFBp eGVsU2l6ZSgpKQogICAgICwgbV9zeW50aGV0aWNCb2xkKGZhbHNlKQogICAgICwgbV9zeW50aGV0 aWNPYmxpcXVlKGZhbHNlKQogICAgICwgbV9maXhlZFdpZHRoKGZhbHNlKQotICAgICwgbV9zY2Fs ZWRGb250KDApCisgICAgLCBtX3NjYWxlZEZvbnQobnVsbHB0cikKICAgICAsIG1fb3JpZW50YXRp b24oZm9udERlc2NyaXB0aW9uLm9yaWVudGF0aW9uKCkpCiB7CiAgICAgUmVmUHRyPGNhaXJvX2Zv bnRfZmFjZV90PiBmb250RmFjZSA9IGFkb3B0UmVmKGNhaXJvX2Z0X2ZvbnRfZmFjZV9jcmVhdGVf Zm9yX3BhdHRlcm4obV9wYXR0ZXJuLmdldCgpKSk7CkBAIC0xNTYsMjQgKzE1NiwyNCBAQCBGb250 UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKEZjUGF0dGVybiogcGF0dGVybiwgY29uc3Qg Rm9udERlc2NyaXB0aW9uJiBmbwogfQogCiBGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1E YXRhKGZsb2F0IHNpemUsIGJvb2wgYm9sZCwgYm9vbCBpdGFsaWMpCi0gICAgOiBtX2ZhbGxiYWNr cygwKQorICAgIDogbV9mYWxsYmFja3MobnVsbHB0cikKICAgICAsIG1fc2l6ZShzaXplKQogICAg ICwgbV9zeW50aGV0aWNCb2xkKGJvbGQpCiAgICAgLCBtX3N5bnRoZXRpY09ibGlxdWUoaXRhbGlj KQogICAgICwgbV9maXhlZFdpZHRoKGZhbHNlKQotICAgICwgbV9zY2FsZWRGb250KDApCisgICAg LCBtX3NjYWxlZEZvbnQobnVsbHB0cikKICAgICAsIG1fb3JpZW50YXRpb24oSG9yaXpvbnRhbCkK IHsKICAgICAvLyBXZSBjYW5ub3QgY3JlYXRlIGEgc2NhbGVkIGZvbnQgaGVyZS4KIH0KIAogRm9u dFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShjYWlyb19mb250X2ZhY2VfdCogZm9udEZh Y2UsIGZsb2F0IHNpemUsIGJvb2wgYm9sZCwgYm9vbCBpdGFsaWMsIEZvbnRPcmllbnRhdGlvbiBv cmllbnRhdGlvbikKLSAgICA6IG1fZmFsbGJhY2tzKDApCisgICAgOiBtX2ZhbGxiYWNrcyhudWxs cHRyKQogICAgICwgbV9zaXplKHNpemUpCiAgICAgLCBtX3N5bnRoZXRpY0JvbGQoYm9sZCkKICAg ICAsIG1fc3ludGhldGljT2JsaXF1ZShpdGFsaWMpCiAgICAgLCBtX2ZpeGVkV2lkdGgoZmFsc2Up Ci0gICAgLCBtX3NjYWxlZEZvbnQoMCkKKyAgICAsIG1fc2NhbGVkRm9udChudWxscHRyKQogICAg ICwgbV9vcmllbnRhdGlvbihvcmllbnRhdGlvbikKIHsKICAgICBpbml0aWFsaXplV2l0aEZvbnRG YWNlKGZvbnRGYWNlKTsKQEAgLTIwMiw3ICsyMDIsNyBAQCBGb250UGxhdGZvcm1EYXRhJiBGb250 UGxhdGZvcm1EYXRhOjpvcGVyYXRvcj0oY29uc3QgRm9udFBsYXRmb3JtRGF0YSYgb3RoZXIpCiAg ICAgaWYgKG1fZmFsbGJhY2tzKSB7CiAgICAgICAgIEZjRm9udFNldERlc3Ryb3kobV9mYWxsYmFj a3MpOwogICAgICAgICAvLyBUaGlzIHdpbGwgYmUgcmUtY3JlYXRlZCBvbiBkZW1hbmQuCi0gICAg ICAgIG1fZmFsbGJhY2tzID0gMDsKKyAgICAgICAgbV9mYWxsYmFja3MgPSBudWxscHRyOwogICAg IH0KIAogICAgIGlmIChtX3NjYWxlZEZvbnQgJiYgbV9zY2FsZWRGb250ICE9IGhhc2hUYWJsZURl bGV0ZWRGb250VmFsdWUoKSkKQEAgLTIxNSwxNSArMjE1LDE3IEBAIEZvbnRQbGF0Zm9ybURhdGEm IEZvbnRQbGF0Zm9ybURhdGE6Om9wZXJhdG9yPShjb25zdCBGb250UGxhdGZvcm1EYXRhJiBvdGhl cikKIH0KIAogRm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250UGxh dGZvcm1EYXRhJiBvdGhlcikKLSAgICA6IG1fZmFsbGJhY2tzKDApCi0gICAgLCBtX3NjYWxlZEZv bnQoMCkKKyAgICA6IG1fZmFsbGJhY2tzKG51bGxwdHIpCisgICAgLCBtX3NjYWxlZEZvbnQobnVs bHB0cikKICAgICAsIG1faGFyZkJ1enpGYWNlKG90aGVyLm1faGFyZkJ1enpGYWNlKQogewogICAg ICp0aGlzID0gb3RoZXI7CiB9CiAKIEZvbnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURhdGEo Y29uc3QgRm9udFBsYXRmb3JtRGF0YSYgb3RoZXIsIGZsb2F0IHNpemUpCi0gICAgOiBtX2hhcmZC dXp6RmFjZShvdGhlci5tX2hhcmZCdXp6RmFjZSkKKyAgICA6IG1fZmFsbGJhY2tzKG51bGxwdHIp CisgICAgLCBtX3NjYWxlZEZvbnQobnVsbHB0cikKKyAgICAsIG1faGFyZkJ1enpGYWNlKG90aGVy Lm1faGFyZkJ1enpGYWNlKQogewogICAgICp0aGlzID0gb3RoZXI7CiAKQEAgLTIzNyw3ICsyMzks NyBAQCBGb250UGxhdGZvcm1EYXRhOjp+Rm9udFBsYXRmb3JtRGF0YSgpCiB7CiAgICAgaWYgKG1f ZmFsbGJhY2tzKSB7CiAgICAgICAgIEZjRm9udFNldERlc3Ryb3kobV9mYWxsYmFja3MpOwotICAg ICAgICBtX2ZhbGxiYWNrcyA9IDA7CisgICAgICAgIG1fZmFsbGJhY2tzID0gbnVsbHB0cjsKICAg ICB9CiAKICAgICBpZiAobV9zY2FsZWRGb250ICYmIG1fc2NhbGVkRm9udCAhPSBoYXNoVGFibGVE ZWxldGVkRm9udFZhbHVlKCkpCg== 245108 2015-01-21 18:38:31 -0800 2015-01-23 02:33:30 -0800 Patch for landing bug-136327-20150122113838.patch text/plain 4012 byeongha.cho U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4Nzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWQxNjIxNjIwOTg0MzM3 ZGFkNWNlODZmNTVkOWE4MWRjMzIyNWU2MS4uMmE3ZGQ3NWIyZGZkZTk3MDcyNDQxMDFlOWRiM2Ji NGQyMTg3ZWJiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTAxLTIwICBCeWVv bmdoYSBDaG8gIDxieWVvbmdoYS5jaG9Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgSW5pdGlhbGl6 YXRpb24gZm9yIHNvbWUgbWVtYmVyIHZhcmlhYmxlIG9mIEZvbnRQbGF0Zm9ybURhdGEKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjMyNworCisgICAg ICAgIFJldmlld2VkIGJ5IE15bGVzIEMuIE1heGZpZWxkLgorCisgICAgICAgIE5vIG5ldyB0ZXN0 cy4gVGhlcmUncyBubyBmdW5jdGlvbmFsIGNoYW5nZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2ZyZWV0eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKToKKyAgICAgICAgKFdl YkNvcmU6OkZvbnRQbGF0Zm9ybURhdGE6Om9wZXJhdG9yPSk6CisgICAgICAgIChXZWJDb3JlOjpG b250UGxhdGZvcm1EYXRhOjp+Rm9udFBsYXRmb3JtRGF0YSk6CisKIDIwMTUtMDEtMjAgIENocmlz IER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBTaW1wbGlmeSBEaWFnbm9zdGlj TG9nZ2luZ0NsaWVudCBjYWxsIHNpdGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250UGxhdGZvcm1EYXRhRnJlZVR5cGUuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZnJlZXR5cGUvRm9udFBsYXRmb3JtRGF0YUZy ZWVUeXBlLmNwcAppbmRleCA2ZjY5YjA3OGY3OWY1ODY5MTRlNzU1Y2Q1YWQxZjEyZWE5Y2ViOTZm Li5kYTFmMmY5OGM3MTc1ZTJlZjUxZGZjNTdjZjJmNzE2ZWIwZjQzNGQzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9mcmVldHlwZS9Gb250UGxhdGZvcm1EYXRh RnJlZVR5cGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2ZyZWV0 eXBlL0ZvbnRQbGF0Zm9ybURhdGFGcmVlVHlwZS5jcHAKQEAgLTEyNywxMiArMTI3LDEyIEBAIHN0 YXRpYyB2b2lkIHJvdGF0ZUNhaXJvTWF0cml4Rm9yVmVydGljYWxPcmllbnRhdGlvbihjYWlyb19t YXRyaXhfdCogbWF0cml4KQogCiBGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKEZj UGF0dGVybiogcGF0dGVybiwgY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHRpb24p CiAgICAgOiBtX3BhdHRlcm4ocGF0dGVybikKLSAgICAsIG1fZmFsbGJhY2tzKDApCisgICAgLCBt X2ZhbGxiYWNrcyhudWxscHRyKQogICAgICwgbV9zaXplKGZvbnREZXNjcmlwdGlvbi5jb21wdXRl ZFBpeGVsU2l6ZSgpKQogICAgICwgbV9zeW50aGV0aWNCb2xkKGZhbHNlKQogICAgICwgbV9zeW50 aGV0aWNPYmxpcXVlKGZhbHNlKQogICAgICwgbV9maXhlZFdpZHRoKGZhbHNlKQotICAgICwgbV9z Y2FsZWRGb250KDApCisgICAgLCBtX3NjYWxlZEZvbnQobnVsbHB0cikKICAgICAsIG1fb3JpZW50 YXRpb24oZm9udERlc2NyaXB0aW9uLm9yaWVudGF0aW9uKCkpCiB7CiAgICAgUmVmUHRyPGNhaXJv X2ZvbnRfZmFjZV90PiBmb250RmFjZSA9IGFkb3B0UmVmKGNhaXJvX2Z0X2ZvbnRfZmFjZV9jcmVh dGVfZm9yX3BhdHRlcm4obV9wYXR0ZXJuLmdldCgpKSk7CkBAIC0xNTYsMjQgKzE1NiwyNCBAQCBG b250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZvcm1EYXRhKEZjUGF0dGVybiogcGF0dGVybiwgY29u c3QgRm9udERlc2NyaXB0aW9uJiBmbwogfQogCiBGb250UGxhdGZvcm1EYXRhOjpGb250UGxhdGZv cm1EYXRhKGZsb2F0IHNpemUsIGJvb2wgYm9sZCwgYm9vbCBpdGFsaWMpCi0gICAgOiBtX2ZhbGxi YWNrcygwKQorICAgIDogbV9mYWxsYmFja3MobnVsbHB0cikKICAgICAsIG1fc2l6ZShzaXplKQog ICAgICwgbV9zeW50aGV0aWNCb2xkKGJvbGQpCiAgICAgLCBtX3N5bnRoZXRpY09ibGlxdWUoaXRh bGljKQogICAgICwgbV9maXhlZFdpZHRoKGZhbHNlKQotICAgICwgbV9zY2FsZWRGb250KDApCisg ICAgLCBtX3NjYWxlZEZvbnQobnVsbHB0cikKICAgICAsIG1fb3JpZW50YXRpb24oSG9yaXpvbnRh bCkKIHsKICAgICAvLyBXZSBjYW5ub3QgY3JlYXRlIGEgc2NhbGVkIGZvbnQgaGVyZS4KIH0KIAog Rm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShjYWlyb19mb250X2ZhY2VfdCogZm9u dEZhY2UsIGZsb2F0IHNpemUsIGJvb2wgYm9sZCwgYm9vbCBpdGFsaWMsIEZvbnRPcmllbnRhdGlv biBvcmllbnRhdGlvbikKLSAgICA6IG1fZmFsbGJhY2tzKDApCisgICAgOiBtX2ZhbGxiYWNrcyhu dWxscHRyKQogICAgICwgbV9zaXplKHNpemUpCiAgICAgLCBtX3N5bnRoZXRpY0JvbGQoYm9sZCkK ICAgICAsIG1fc3ludGhldGljT2JsaXF1ZShpdGFsaWMpCiAgICAgLCBtX2ZpeGVkV2lkdGgoZmFs c2UpCi0gICAgLCBtX3NjYWxlZEZvbnQoMCkKKyAgICAsIG1fc2NhbGVkRm9udChudWxscHRyKQog ICAgICwgbV9vcmllbnRhdGlvbihvcmllbnRhdGlvbikKIHsKICAgICBpbml0aWFsaXplV2l0aEZv bnRGYWNlKGZvbnRGYWNlKTsKQEAgLTIwMiw3ICsyMDIsNyBAQCBGb250UGxhdGZvcm1EYXRhJiBG b250UGxhdGZvcm1EYXRhOjpvcGVyYXRvcj0oY29uc3QgRm9udFBsYXRmb3JtRGF0YSYgb3RoZXIp CiAgICAgaWYgKG1fZmFsbGJhY2tzKSB7CiAgICAgICAgIEZjRm9udFNldERlc3Ryb3kobV9mYWxs YmFja3MpOwogICAgICAgICAvLyBUaGlzIHdpbGwgYmUgcmUtY3JlYXRlZCBvbiBkZW1hbmQuCi0g ICAgICAgIG1fZmFsbGJhY2tzID0gMDsKKyAgICAgICAgbV9mYWxsYmFja3MgPSBudWxscHRyOwog ICAgIH0KIAogICAgIGlmIChtX3NjYWxlZEZvbnQgJiYgbV9zY2FsZWRGb250ICE9IGhhc2hUYWJs ZURlbGV0ZWRGb250VmFsdWUoKSkKQEAgLTIxNSwxNSArMjE1LDE3IEBAIEZvbnRQbGF0Zm9ybURh dGEmIEZvbnRQbGF0Zm9ybURhdGE6Om9wZXJhdG9yPShjb25zdCBGb250UGxhdGZvcm1EYXRhJiBv dGhlcikKIH0KIAogRm9udFBsYXRmb3JtRGF0YTo6Rm9udFBsYXRmb3JtRGF0YShjb25zdCBGb250 UGxhdGZvcm1EYXRhJiBvdGhlcikKLSAgICA6IG1fZmFsbGJhY2tzKDApCi0gICAgLCBtX3NjYWxl ZEZvbnQoMCkKKyAgICA6IG1fZmFsbGJhY2tzKG51bGxwdHIpCisgICAgLCBtX3NjYWxlZEZvbnQo bnVsbHB0cikKICAgICAsIG1faGFyZkJ1enpGYWNlKG90aGVyLm1faGFyZkJ1enpGYWNlKQogewog ICAgICp0aGlzID0gb3RoZXI7CiB9CiAKIEZvbnRQbGF0Zm9ybURhdGE6OkZvbnRQbGF0Zm9ybURh dGEoY29uc3QgRm9udFBsYXRmb3JtRGF0YSYgb3RoZXIsIGZsb2F0IHNpemUpCi0gICAgOiBtX2hh cmZCdXp6RmFjZShvdGhlci5tX2hhcmZCdXp6RmFjZSkKKyAgICA6IG1fZmFsbGJhY2tzKG51bGxw dHIpCisgICAgLCBtX3NjYWxlZEZvbnQobnVsbHB0cikKKyAgICAsIG1faGFyZkJ1enpGYWNlKG90 aGVyLm1faGFyZkJ1enpGYWNlKQogewogICAgICp0aGlzID0gb3RoZXI7CiAKQEAgLTIzNyw3ICsy MzksNyBAQCBGb250UGxhdGZvcm1EYXRhOjp+Rm9udFBsYXRmb3JtRGF0YSgpCiB7CiAgICAgaWYg KG1fZmFsbGJhY2tzKSB7CiAgICAgICAgIEZjRm9udFNldERlc3Ryb3kobV9mYWxsYmFja3MpOwot ICAgICAgICBtX2ZhbGxiYWNrcyA9IDA7CisgICAgICAgIG1fZmFsbGJhY2tzID0gbnVsbHB0cjsK ICAgICB9CiAKICAgICBpZiAobV9zY2FsZWRGb250ICYmIG1fc2NhbGVkRm9udCAhPSBoYXNoVGFi bGVEZWxldGVkRm9udFZhbHVlKCkpCg==