140124 2015-01-06 07:32:34 -0800 Rename SimpleFontData::AdditionalFontData to SimpleFontData::SVGData 2015-01-06 11:22:12 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 135290 1 koivisto webkit-unassigned commit-queue d-r esprehn+autocc fmalita glenn gyuyoung.kim kondapallykalyan mmaxfield pdr schenney sergio oldest_to_newest 1059003 0 koivisto 2015-01-06 07:32:34 -0800 The current name is vague and confusing. 1059005 1 244061 koivisto 2015-01-06 07:45:40 -0800 Created attachment 244061 patch 1059033 2 244061 mmaxfield 2015-01-06 09:39:37 -0800 Comment on attachment 244061 patch View in context: https://bugs.webkit.org/attachment.cgi?id=244061&action=review > Source/WebCore/platform/graphics/SimpleFontData.h:179 > + bool isSVGFont() const { return !!m_svgData; } Is the !! necessary? Won't the bool cast be automatic? 1059038 3 244061 andersca 2015-01-06 09:41:38 -0800 Comment on attachment 244061 patch View in context: https://bugs.webkit.org/attachment.cgi?id=244061&action=review >> Source/WebCore/platform/graphics/SimpleFontData.h:179 >> + bool isSVGFont() const { return !!m_svgData; } > > Is the !! necessary? Won't the bool cast be automatic? It won't since the std::unique_ptr bool operator is explicit. 1059074 4 koivisto 2015-01-06 11:22:12 -0800 https://trac.webkit.org/r177975 244061 2015-01-06 07:45:40 -0800 2015-01-06 09:41:38 -0800 patch additionalfontdata-rename.patch text/plain 10685 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3Nzk1NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE1LTAxLTA2ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgU2ltcGxlRm9udERh dGE6OkFkZGl0aW9uYWxGb250RGF0YSB0byBTaW1wbGVGb250RGF0YTo6U1ZHRGF0YQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQwMTI0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGN1cnJlbnQgbmFt ZSBpcyB2YWd1ZSBhbmQgY29uZnVzaW5nIChhcyBBZGRpdGlvbmFsRm9udERhdGEgaXMgbm90IGEg Rm9udERhdGEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRm9udEdseXBocy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGb250R2x5cGhzOjpnbHlwaERhdGFGb3JDaGFyYWN0ZXIpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1NpbXBsZUZvbnREYXRhLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlNpbXBsZUZvbnREYXRhOjpTaW1wbGVGb250RGF0YSk6CisgICAgICAgIChXZWJD b3JlOjpTaW1wbGVGb250RGF0YTo6flNpbXBsZUZvbnREYXRhKToKKyAgICAgICAgKFdlYkNvcmU6 OmZpbGxHbHlwaFBhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OmNyZWF0 ZVNjYWxlZEZvbnREYXRhKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9TaW1wbGVGb250 RGF0YS5oOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlRm9udERhdGE6OndpZHRoRm9yR2x5cGgp OgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvU1ZHVGV4dExheW91dEVuZ2luZVNwYWNpbmcuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6U1ZHVGV4dExheW91dEVuZ2luZVNwYWNpbmc6OmNhbGN1bGF0 ZVNWR0tlcm5pbmcpOgorICAgICAgICAqIHJlbmRlcmluZy9zdmcvU1ZHVGV4dFJ1blJlbmRlcmlu Z0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c3ZnRm9udEFuZEZvbnRGYWNlRWxlbWVu dEZvckZvbnREYXRhKToKKyAgICAgICAgKiBzdmcvU1ZHRm9udERhdGEuaDoKKwogMjAxNS0wMS0w NiAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVzb2x2ZSBt aXJyb3JpbmcgYW5kIHZhcmlhbnQgaW4gRm9udCBpbnN0ZWFkIG9mIEZvbnRHbHlwaHMKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRHbHlwaHMuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRHbHlwaHMuY3BwCShy ZXZpc2lvbiAxNzc5NTcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250 R2x5cGhzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzYwLDcgKzM2MCw3IEBAIHN0YXRpYyBSZWZQ dHI8R2x5cGhQYWdlPiBnbHlwaFBhZ2VGcm9tRm8KICAgICByZXR1cm4gY29uc3RfY2FzdDxHbHlw aFBhZ2UqPihzaW1wbGVGb250RGF0YS0+Z2x5cGhQYWdlKHBhZ2VOdW1iZXIpKTsKIH0KIAotR2x5 cGhEYXRhIEZvbnRHbHlwaHM6OmdseXBoRGF0YUZvckNoYXJhY3RlciggVUNoYXIzMiBjLCBjb25z dCBGb250RGVzY3JpcHRpb24mIGRlc2NyaXB0aW9uLCBGb250RGF0YVZhcmlhbnQgdmFyaWFudCkK K0dseXBoRGF0YSBGb250R2x5cGhzOjpnbHlwaERhdGFGb3JDaGFyYWN0ZXIoVUNoYXIzMiBjLCBj b25zdCBGb250RGVzY3JpcHRpb24mIGRlc2NyaXB0aW9uLCBGb250RGF0YVZhcmlhbnQgdmFyaWFu dCkKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogICAgIEFTU0VSVCh2YXJpYW50ICE9 IEF1dG9WYXJpYW50KTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1Np bXBsZUZvbnREYXRhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9TaW1wbGVGb250RGF0YS5jcHAJKHJldmlzaW9uIDE3Nzk1MikKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1NpbXBsZUZvbnREYXRhLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNzYsOSArNzYsOSBAQCBTaW1wbGVGb250RGF0YTo6U2ltcGxlRm9udERhdGEoY29uc3Qg Rm9uCiAjZW5kaWYKIH0KIAotU2ltcGxlRm9udERhdGE6OlNpbXBsZUZvbnREYXRhKHN0ZDo6dW5p cXVlX3B0cjxBZGRpdGlvbmFsRm9udERhdGE+IGZvbnREYXRhLCBmbG9hdCBmb250U2l6ZSwgYm9v bCBzeW50aGV0aWNCb2xkLCBib29sIHN5bnRoZXRpY0l0YWxpYykKK1NpbXBsZUZvbnREYXRhOjpT aW1wbGVGb250RGF0YShzdGQ6OnVuaXF1ZV9wdHI8U1ZHRGF0YT4gc3ZnRGF0YSwgZmxvYXQgZm9u dFNpemUsIGJvb2wgc3ludGhldGljQm9sZCwgYm9vbCBzeW50aGV0aWNJdGFsaWMpCiAgICAgOiBt X3BsYXRmb3JtRGF0YShGb250UGxhdGZvcm1EYXRhKGZvbnRTaXplLCBzeW50aGV0aWNCb2xkLCBz eW50aGV0aWNJdGFsaWMpKQotICAgICwgbV9mb250RGF0YShXVEY6Om1vdmUoZm9udERhdGEpKQor ICAgICwgbV9zdmdEYXRhKFdURjo6bW92ZShzdmdEYXRhKSkKICAgICAsIG1fdHJlYXRBc0ZpeGVk UGl0Y2goZmFsc2UpCiAgICAgLCBtX2lzQ3VzdG9tRm9udCh0cnVlKQogICAgICwgbV9pc0xvYWRp bmcoZmFsc2UpCkBAIC05Myw3ICs5Myw3IEBAIFNpbXBsZUZvbnREYXRhOjpTaW1wbGVGb250RGF0 YShzdGQ6OnVuaXEKICAgICAsIG1fc2hvdWxkTm90QmVVc2VkRm9yQXJhYmljKGZhbHNlKQogI2Vu ZGlmCiB7Ci0gICAgbV9mb250RGF0YS0+aW5pdGlhbGl6ZUZvbnREYXRhKHRoaXMsIGZvbnRTaXpl KTsKKyAgICBtX3N2Z0RhdGEtPmluaXRpYWxpemVGb250RGF0YSh0aGlzLCBmb250U2l6ZSk7CiB9 CiAKIC8vIEVzdGltYXRlcyBvZiBhdmdDaGFyV2lkdGggYW5kIG1heENoYXJXaWR0aCBmb3IgcGxh dGZvcm1zIHRoYXQgZG9uJ3Qgc3VwcG9ydCBhY2Nlc3NpbmcgdGhlc2UgdmFsdWVzIGZyb20gdGhl IGZvbnQuCkBAIC0xNTQsNyArMTU0LDcgQEAgdm9pZCBTaW1wbGVGb250RGF0YTo6cGxhdGZvcm1H bHlwaEluaXQoKQogCiBTaW1wbGVGb250RGF0YTo6flNpbXBsZUZvbnREYXRhKCkKIHsKLSAgICBp ZiAoIW1fZm9udERhdGEpCisgICAgaWYgKCFpc1NWR0ZvbnQoKSkKICAgICAgICAgcGxhdGZvcm1E ZXN0cm95KCk7CiB9CiAKQEAgLTE3MSw4ICsxNzEsOCBAQCBjb25zdCBTaW1wbGVGb250RGF0YSYg U2ltcGxlRm9udERhdGE6OnNpCiBzdGF0aWMgYm9vbCBmaWxsR2x5cGhQYWdlKEdseXBoUGFnZSYg cGFnZVRvRmlsbCwgdW5zaWduZWQgb2Zmc2V0LCB1bnNpZ25lZCBsZW5ndGgsIFVDaGFyKiBidWZm ZXIsIHVuc2lnbmVkIGJ1ZmZlckxlbmd0aCwgY29uc3QgU2ltcGxlRm9udERhdGEqIGZvbnREYXRh KQogewogI2lmIEVOQUJMRShTVkdfRk9OVFMpCi0gICAgaWYgKFNpbXBsZUZvbnREYXRhOjpBZGRp dGlvbmFsRm9udERhdGEqIGFkZGl0aW9uYWxGb250RGF0YSA9IGZvbnREYXRhLT5mb250RGF0YSgp KQotICAgICAgICByZXR1cm4gYWRkaXRpb25hbEZvbnREYXRhLT5maWxsU1ZHR2x5cGhQYWdlKCZw YWdlVG9GaWxsLCBvZmZzZXQsIGxlbmd0aCwgYnVmZmVyLCBidWZmZXJMZW5ndGgsIGZvbnREYXRh KTsKKyAgICBpZiAoYXV0byogc3ZnRGF0YSA9IGZvbnREYXRhLT5zdmdEYXRhKCkpCisgICAgICAg IHJldHVybiBzdmdEYXRhLT5maWxsU1ZHR2x5cGhQYWdlKCZwYWdlVG9GaWxsLCBvZmZzZXQsIGxl bmd0aCwgYnVmZmVyLCBidWZmZXJMZW5ndGgsIGZvbnREYXRhKTsKICNlbmRpZgogICAgIGJvb2wg aGFzR2x5cGhzID0gcGFnZVRvRmlsbC5maWxsKG9mZnNldCwgbGVuZ3RoLCBidWZmZXIsIGJ1ZmZl ckxlbmd0aCwgZm9udERhdGEpOwogI2lmIEVOQUJMRShPUEVOVFlQRV9WRVJUSUNBTCkKQEAgLTQw NSw5ICs0MDUsOCBAQCBTaW1wbGVGb250RGF0YTo6RGVyaXZlZEZvbnREYXRhOjp+RGVyaXZlCiAK IFBhc3NSZWZQdHI8U2ltcGxlRm9udERhdGE+IFNpbXBsZUZvbnREYXRhOjpjcmVhdGVTY2FsZWRG b250RGF0YShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbiwgZmxvYXQgc2Nh bGVGYWN0b3IpIGNvbnN0CiB7Ci0gICAgLy8gRklYTUU6IFN1cHBvcnQgc2NhbGVkIGZvbnRzIHRo YXQgdXNlZCBBZGRpdGlvbmFsRm9udERhdGEuCi0gICAgaWYgKG1fZm9udERhdGEpCi0gICAgICAg IHJldHVybiAwOworICAgIGlmIChpc1NWR0ZvbnQoKSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7 CiAKICAgICByZXR1cm4gcGxhdGZvcm1DcmVhdGVTY2FsZWRGb250RGF0YShmb250RGVzY3JpcHRp b24sIHNjYWxlRmFjdG9yKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL1NpbXBsZUZvbnREYXRhLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvU2ltcGxlRm9udERhdGEuaAkocmV2aXNpb24gMTc3OTUyKQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxlRm9udERhdGEuaAkod29ya2luZyBjb3B5 KQpAQCAtNzAsMTUgKzcwLDE0IEBAIGVudW0gUGl0Y2ggeyBVbmtub3duUGl0Y2gsIEZpeGVkUGl0 Y2gsIFYKIAogY2xhc3MgU2ltcGxlRm9udERhdGEgZmluYWwgOiBwdWJsaWMgRm9udERhdGEgewog cHVibGljOgotICAgIGNsYXNzIEFkZGl0aW9uYWxGb250RGF0YSB7CisgICAgY2xhc3MgU1ZHRGF0 YSB7CiAgICAgICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogICAgIHB1YmxpYzoKLSAgICAg ICAgdmlydHVhbCB+QWRkaXRpb25hbEZvbnREYXRhKCkgeyB9CisgICAgICAgIHZpcnR1YWwgflNW R0RhdGEoKSB7IH0KIAogICAgICAgICB2aXJ0dWFsIHZvaWQgaW5pdGlhbGl6ZUZvbnREYXRhKFNp bXBsZUZvbnREYXRhKiwgZmxvYXQgZm9udFNpemUpID0gMDsKICAgICAgICAgdmlydHVhbCBmbG9h dCB3aWR0aEZvclNWR0dseXBoKEdseXBoLCBmbG9hdCBmb250U2l6ZSkgY29uc3QgPSAwOwogICAg ICAgICB2aXJ0dWFsIGJvb2wgZmlsbFNWR0dseXBoUGFnZShHbHlwaFBhZ2UqLCB1bnNpZ25lZCBv ZmZzZXQsIHVuc2lnbmVkIGxlbmd0aCwgVUNoYXIqIGJ1ZmZlciwgdW5zaWduZWQgYnVmZmVyTGVu Z3RoLCBjb25zdCBTaW1wbGVGb250RGF0YSopIGNvbnN0ID0gMDsKLSAgICAgICAgdmlydHVhbCBi b29sIGFwcGx5U1ZHR2x5cGhTZWxlY3Rpb24oV2lkdGhJdGVyYXRvciYsIEdseXBoRGF0YSYsIGJv b2wgbWlycm9yLCBpbnQgY3VycmVudENoYXJhY3RlciwgdW5zaWduZWQmIGFkdmFuY2VMZW5ndGgs IFN0cmluZyYgbm9ybWFsaXplZFNwYWNlc1N0cmluZ0NhY2hlKSBjb25zdCA9IDA7CiAgICAgfTsK IAogICAgIC8vIFVzZWQgdG8gY3JlYXRlIHBsYXRmb3JtIGZvbnRzLgpAQCAtODgsOSArODcsOSBA QCBwdWJsaWM6CiAgICAgfQogCiAgICAgLy8gVXNlZCB0byBjcmVhdGUgU1ZHIEZvbnRzLgotICAg IHN0YXRpYyBQYXNzUmVmUHRyPFNpbXBsZUZvbnREYXRhPiBjcmVhdGUoc3RkOjp1bmlxdWVfcHRy PEFkZGl0aW9uYWxGb250RGF0YT4gZm9udERhdGEsIGZsb2F0IGZvbnRTaXplLCBib29sIHN5bnRo ZXRpY0JvbGQsIGJvb2wgc3ludGhldGljSXRhbGljKQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPFNp bXBsZUZvbnREYXRhPiBjcmVhdGUoc3RkOjp1bmlxdWVfcHRyPFNWR0RhdGE+IHN2Z0RhdGEsIGZs b2F0IGZvbnRTaXplLCBib29sIHN5bnRoZXRpY0JvbGQsIGJvb2wgc3ludGhldGljSXRhbGljKQog ICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBTaW1wbGVGb250RGF0YShXVEY6Om1v dmUoZm9udERhdGEpLCBmb250U2l6ZSwgc3ludGhldGljQm9sZCwgc3ludGhldGljSXRhbGljKSk7 CisgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgU2ltcGxlRm9udERhdGEoV1RGOjptb3ZlKHN2 Z0RhdGEpLCBmb250U2l6ZSwgc3ludGhldGljQm9sZCwgc3ludGhldGljSXRhbGljKSk7CiAgICAg fQogCiAgICAgdmlydHVhbCB+U2ltcGxlRm9udERhdGEoKTsKQEAgLTE3Niw4ICsxNzUsOCBAQCBw dWJsaWM6CiAgICAgdm9pZCBkZXRlcm1pbmVQaXRjaCgpOwogICAgIFBpdGNoIHBpdGNoKCkgY29u c3QgeyByZXR1cm4gbV90cmVhdEFzRml4ZWRQaXRjaCA/IEZpeGVkUGl0Y2ggOiBWYXJpYWJsZVBp dGNoOyB9CiAKLSAgICBBZGRpdGlvbmFsRm9udERhdGEqIGZvbnREYXRhKCkgY29uc3QgeyByZXR1 cm4gbV9mb250RGF0YS5nZXQoKTsgfQotICAgIGJvb2wgaXNTVkdGb250KCkgY29uc3QgeyByZXR1 cm4gbV9mb250RGF0YSAhPSBudWxscHRyOyB9CisgICAgY29uc3QgU1ZHRGF0YSogc3ZnRGF0YSgp IGNvbnN0IHsgcmV0dXJuIG1fc3ZnRGF0YS5nZXQoKTsgfQorICAgIGJvb2wgaXNTVkdGb250KCkg Y29uc3QgeyByZXR1cm4gISFtX3N2Z0RhdGE7IH0KIAogICAgIHZpcnR1YWwgYm9vbCBpc0N1c3Rv bUZvbnQoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBtX2lzQ3VzdG9tRm9udDsgfQogICAgIHZp cnR1YWwgYm9vbCBpc0xvYWRpbmcoKSBjb25zdCBvdmVycmlkZSB7IHJldHVybiBtX2lzTG9hZGlu ZzsgfQpAQCAtMjE4LDcgKzIxNyw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgU2ltcGxlRm9u dERhdGEoY29uc3QgRm9udFBsYXRmb3JtRGF0YSYsIGJvb2wgaXNDdXN0b21Gb250ID0gZmFsc2Us IGJvb2wgaXNMb2FkaW5nID0gZmFsc2UsIGJvb2wgaXNUZXh0T3JpZW50YXRpb25GYWxsYmFjayA9 IGZhbHNlKTsKIAotICAgIFNpbXBsZUZvbnREYXRhKHN0ZDo6dW5pcXVlX3B0cjxBZGRpdGlvbmFs Rm9udERhdGE+LCBmbG9hdCBmb250U2l6ZSwgYm9vbCBzeW50aGV0aWNCb2xkLCBib29sIHN5bnRo ZXRpY0l0YWxpYyk7CisgICAgU2ltcGxlRm9udERhdGEoc3RkOjp1bmlxdWVfcHRyPFNWR0RhdGE+ LCBmbG9hdCBmb250U2l6ZSwgYm9vbCBzeW50aGV0aWNCb2xkLCBib29sIHN5bnRoZXRpY0l0YWxp Yyk7CiAKICAgICB2b2lkIHBsYXRmb3JtSW5pdCgpOwogICAgIHZvaWQgcGxhdGZvcm1HbHlwaElu aXQoKTsKQEAgLTI1MSw3ICsyNTAsNyBAQCBwcml2YXRlOgogICAgIGZsb2F0IG1fYXZnQ2hhcldp ZHRoOwogCiAgICAgRm9udFBsYXRmb3JtRGF0YSBtX3BsYXRmb3JtRGF0YTsKLSAgICBzdGQ6OnVu aXF1ZV9wdHI8QWRkaXRpb25hbEZvbnREYXRhPiBtX2ZvbnREYXRhOworICAgIHN0ZDo6dW5pcXVl X3B0cjxTVkdEYXRhPiBtX3N2Z0RhdGE7CiAKICAgICBtdXRhYmxlIFJlZlB0cjxHbHlwaFBhZ2U+ IG1fZ2x5cGhQYWdlWmVybzsKICAgICBtdXRhYmxlIEhhc2hNYXA8dW5zaWduZWQsIFJlZlB0cjxH bHlwaFBhZ2U+PiBtX2dseXBoUGFnZXM7CkBAIC0zNDgsOCArMzQ3LDggQEAgQUxXQVlTX0lOTElO RSBmbG9hdCBTaW1wbGVGb250RGF0YTo6d2lkdAogICAgIGlmICh3aWR0aCAhPSBjR2x5cGhTaXpl VW5rbm93bikKICAgICAgICAgcmV0dXJuIHdpZHRoOwogCi0gICAgaWYgKG1fZm9udERhdGEpCi0g ICAgICAgIHdpZHRoID0gbV9mb250RGF0YS0+d2lkdGhGb3JTVkdHbHlwaChnbHlwaCwgbV9wbGF0 Zm9ybURhdGEuc2l6ZSgpKTsKKyAgICBpZiAoaXNTVkdGb250KCkpCisgICAgICAgIHdpZHRoID0g bV9zdmdEYXRhLT53aWR0aEZvclNWR0dseXBoKGdseXBoLCBtX3BsYXRmb3JtRGF0YS5zaXplKCkp OwogI2lmIEVOQUJMRShPUEVOVFlQRV9WRVJUSUNBTCkKICAgICBlbHNlIGlmIChtX3ZlcnRpY2Fs RGF0YSkKICNpZiBVU0UoQ0cpIHx8IFVTRShDQUlSTykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zdmcvU1ZHVGV4dExheW91dEVuZ2luZVNwYWNpbmcuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHVGV4dExheW91dEVuZ2luZVNwYWNpbmcu Y3BwCShyZXZpc2lvbiAxNzc5NTUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc3ZnL1NW R1RleHRMYXlvdXRFbmdpbmVTcGFjaW5nLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTAsNyArNTAs NyBAQCBmbG9hdCBTVkdUZXh0TGF5b3V0RW5naW5lU3BhY2luZzo6Y2FsY3VsCiAgICAgQVNTRVJU KGZvbnREYXRhLmlzQ3VzdG9tRm9udCgpKTsKICAgICBBU1NFUlQoZm9udERhdGEuaXNTVkdGb250 KCkpOwogCi0gICAgY29uc3QgU1ZHRm9udERhdGEqIHN2Z0ZvbnREYXRhID0gc3RhdGljX2Nhc3Q8 Y29uc3QgU1ZHRm9udERhdGEqPihmb250RGF0YS5mb250RGF0YSgpKTsKKyAgICBhdXRvKiBzdmdG b250RGF0YSA9IHN0YXRpY19jYXN0PGNvbnN0IFNWR0ZvbnREYXRhKj4oZm9udERhdGEuc3ZnRGF0 YSgpKTsKICAgICBTVkdGb250RmFjZUVsZW1lbnQqIHN2Z0ZvbnRGYWNlID0gc3ZnRm9udERhdGEt PnN2Z0ZvbnRGYWNlRWxlbWVudCgpOwogICAgIEFTU0VSVChzdmdGb250RmFjZSk7CiAKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHVGV4dFJ1blJlbmRlcmluZ0NvbnRleHQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zdmcvU1ZHVGV4dFJ1 blJlbmRlcmluZ0NvbnRleHQuY3BwCShyZXZpc2lvbiAxNzc5NTUpCisrKyBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc3ZnL1NWR1RleHRSdW5SZW5kZXJpbmdDb250ZXh0LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNDMsNyArNDMsNyBAQCBzdGF0aWMgaW5saW5lIGNvbnN0IFNWR0ZvbnREYXRhKiBz dmdGb250CiAgICAgQVNTRVJUKGZvbnREYXRhLT5pc0N1c3RvbUZvbnQoKSk7CiAgICAgQVNTRVJU KGZvbnREYXRhLT5pc1NWR0ZvbnQoKSk7CiAKLSAgICBjb25zdCBTVkdGb250RGF0YSogc3ZnRm9u dERhdGEgPSBzdGF0aWNfY2FzdDxjb25zdCBTVkdGb250RGF0YSo+KGZvbnREYXRhLT5mb250RGF0 YSgpKTsKKyAgICBhdXRvKiBzdmdGb250RGF0YSA9IHN0YXRpY19jYXN0PGNvbnN0IFNWR0ZvbnRE YXRhKj4oZm9udERhdGEtPnN2Z0RhdGEoKSk7CiAKICAgICBmb250RmFjZSA9IHN2Z0ZvbnREYXRh LT5zdmdGb250RmFjZUVsZW1lbnQoKTsKICAgICBBU1NFUlQoZm9udEZhY2UpOwpJbmRleDogU291 cmNlL1dlYkNvcmUvc3ZnL1NWR0ZvbnREYXRhLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvc3ZnL1NWR0ZvbnREYXRhLmgJKHJldmlzaW9uIDE3Nzk1MikKKysrIFNvdXJjZS9XZWJDb3Jl L3N2Zy9TVkdGb250RGF0YS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw3ICsyOCw3IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKIGNsYXNzIFNWR0ZvbnRFbGVtZW50OwogY2xhc3MgU1ZHRm9udEZhY2VF bGVtZW50OwogCi1jbGFzcyBTVkdGb250RGF0YSA6IHB1YmxpYyBTaW1wbGVGb250RGF0YTo6QWRk aXRpb25hbEZvbnREYXRhIHsKK2NsYXNzIFNWR0ZvbnREYXRhIDogcHVibGljIFNpbXBsZUZvbnRE YXRhOjpTVkdEYXRhIHsKIHB1YmxpYzoKICAgICBleHBsaWNpdCBTVkdGb250RGF0YShTVkdGb250 RmFjZUVsZW1lbnQqKTsKICAgICB2aXJ0dWFsIH5TVkdGb250RGF0YSgpIHsgfQpAQCAtMzYsNyAr MzYsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIGluaXRpYWxpemVGb250RGF0YShTaW1w bGVGb250RGF0YSosIGZsb2F0IGZvbnRTaXplKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIGZsb2F0 IHdpZHRoRm9yU1ZHR2x5cGgoR2x5cGgsIGZsb2F0IGZvbnRTaXplKSBjb25zdCBvdmVycmlkZTsK ICAgICB2aXJ0dWFsIGJvb2wgZmlsbFNWR0dseXBoUGFnZShHbHlwaFBhZ2UqLCB1bnNpZ25lZCBv ZmZzZXQsIHVuc2lnbmVkIGxlbmd0aCwgVUNoYXIqIGJ1ZmZlciwgdW5zaWduZWQgYnVmZmVyTGVu Z3RoLCBjb25zdCBTaW1wbGVGb250RGF0YSopIGNvbnN0IG92ZXJyaWRlOwotICAgIHZpcnR1YWwg Ym9vbCBhcHBseVNWR0dseXBoU2VsZWN0aW9uKFdpZHRoSXRlcmF0b3ImLCBHbHlwaERhdGEmLCBi b29sIG1pcnJvciwgaW50IGN1cnJlbnRDaGFyYWN0ZXIsIHVuc2lnbmVkJiBhZHZhbmNlTGVuZ3Ro LCBTdHJpbmcmIG5vcm1hbGl6ZWRTcGFjZXNTdHJpbmdDYWNoZSkgY29uc3Qgb3ZlcnJpZGU7CisK KyAgICBib29sIGFwcGx5U1ZHR2x5cGhTZWxlY3Rpb24oV2lkdGhJdGVyYXRvciYsIEdseXBoRGF0 YSYsIGJvb2wgbWlycm9yLCBpbnQgY3VycmVudENoYXJhY3RlciwgdW5zaWduZWQmIGFkdmFuY2VM ZW5ndGgsIFN0cmluZyYgbm9ybWFsaXplZFNwYWNlc1N0cmluZ0NhY2hlKSBjb25zdDsKIAogICAg IFNWR0ZvbnRGYWNlRWxlbWVudCogc3ZnRm9udEZhY2VFbGVtZW50KCkgY29uc3QgeyByZXR1cm4g bV9zdmdGb250RmFjZUVsZW1lbnQ7IH0KIAo=