156850 2016-04-21 07:07:24 -0700 Fixed compilation with !ENABLE(SVG_FONTS). 2016-04-21 13:07:25 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 annulen webkit-unassigned commit-queue koivisto mcatanzaro mmaxfield ossy oldest_to_newest 1185770 0 annulen 2016-04-21 07:07:24 -0700 Fixed compilation with !ENABLE(SVG_FONTS). 1185771 1 276921 annulen 2016-04-21 07:09:46 -0700 Created attachment 276921 Patch 1185777 2 276921 ossy 2016-04-21 07:38:19 -0700 Comment on attachment 276921 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=276921&action=review > Source/WebCore/ChangeLog:15 > + (WebCore::FontCascade::drawGlyphBuffer): Deleted. Please remove "Deleted." It must be a prepare-changelog bug. > Source/WebCore/CMakeLists.txt:2864 > +if (ENABLE_SVG_FONTS) > + list(APPEND WebCore_SOURCES > + svg/SVGToOTFFontConversion.cpp > + ) > +endif () We prefer guarding source files to guarding build sytem when it is possible. Myles, is it OK to add ENABLE(SVG_FONTS) guard to SVGToOTFFontConversion.cpp? 1185821 3 mcatanzaro 2016-04-21 09:35:50 -0700 (In reply to comment #2) > We prefer guarding source files to guarding build sytem when it is possible. It's the opposite of what we've been doing recently. Maybe we should discuss this on webkit-dev? 1185826 4 ossy 2016-04-21 09:44:58 -0700 (In reply to comment #3) > (In reply to comment #2) > > We prefer guarding source files to guarding build sytem when it is possible. > > It's the opposite of what we've been doing recently. Maybe we should discuss > this on webkit-dev? What do you mean? I haven't seen any patch removing if guards from source file. Source files are almost always guarded properly, I can't see a good reason to break this good practice now. I think most of the build system guard is redundant. 1185831 5 annulen 2016-04-21 09:59:27 -0700 (In reply to comment #4) > (In reply to comment #3) > > (In reply to comment #2) > > > We prefer guarding source files to guarding build sytem when it is possible. > > > > It's the opposite of what we've been doing recently. Maybe we should discuss > > this on webkit-dev? > > What do you mean? I haven't seen any patch removing if guards from source > file. https://bugs.webkit.org/show_bug.cgi?id=155944 Though in case of TEXTURE_MAPPER there is no direct condition in build system, instead choice is made by inclusion (or not inclusion) of TextureMapper.cmake in PlatformXXX.cmake. > Source files are almost always guarded properly, I can't see a good reason > to break this good practice now. I think most of the build system guard > is redundant. What is good about guards in .cpp files? They add no information in most cases, and also slightly increase build time, not only because of having to compile empty files, but also extra time is needed to generate large ninja manifest, also ninja has to process more edges. 1185859 6 ossy 2016-04-21 11:39:24 -0700 It's easier to maintain if guards in sources which is platform independent. It's easier to add a new cpp to a simple source list than a super complex one for a person who don't work on cmake port at all. (Most of the WebKit developers.) If we make cmake build system more and more complex, I think Apple will break our build more often. I don't think if building emtpy files could increase the build time significantly. 1185874 7 276941 annulen 2016-04-21 12:09:13 -0700 Created attachment 276941 Patch 1185875 8 276941 mcatanzaro 2016-04-21 12:20:03 -0700 Comment on attachment 276941 Patch I guess I agree with Ossy, but we should still discuss this on webkit-dev because not everyone is currently on board with this. 1185892 9 276941 commit-queue 2016-04-21 13:07:21 -0700 Comment on attachment 276941 Patch Clearing flags on attachment: 276941 Committed r199830: <http://trac.webkit.org/changeset/199830> 1185893 10 commit-queue 2016-04-21 13:07:25 -0700 All reviewed patches have been landed. Closing bug. 276921 2016-04-21 07:09:46 -0700 2016-04-21 12:09:02 -0700 Patch bug-156850-20160421171007.patch text/plain 3733 annulen U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5NzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTU4MzJkYmNlYzY1YThm NTE5NzkwMzJkNmJiMDRjNTA5YWIwNTQwZC4uN2FkZjY2YjJiNDU4ZWYwODRkYzlkMmZlZGI0Mzcx MzYxYzJiZDJjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE2LTA0LTIxICBLb25z dGFudGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5ydT4KKworICAgICAgICBGaXhlZCBjb21w aWxhdGlvbiB3aXRoICFFTkFCTEUoU1ZHX0ZPTlRTKS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Njg1MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBuZWVkZWQuCisKKyAgICAgICAg KiBDTWFrZUxpc3RzLnR4dDoKKyAgICAgICAgKiBjc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udEZhY2VTb3VyY2U6OkNTU0ZvbnRGYWNlU291cmNlKToK KyAgICAgICAgKiBjc3MvQ1NTRm9udEZhY2VTb3VyY2UuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9Gb250Q2FzY2FkZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FzY2FkZTo6 ZHJhd0dseXBoQnVmZmVyKTogRGVsZXRlZC4KKwogMjAxNi0wNC0xOSAgQWxleCBDaHJpc3RlbnNl biAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIEJ1aWxkIGZpeCBhZnRlciBy MTk5NzM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzLnR4dCBiL1NvdXJj ZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0CmluZGV4IGYxODg2OTE0YWZmMjZhZGM0OTAyOWYyNjYw N2JhYjljYmZjYzE4ZTAuLjVhNTNjYTA3OWY2YWMyZDE3N2FhODUyM2QyNzdhNDIyNTcxODYyZDcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NNYWtlTGlzdHMudHh0CisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NNYWtlTGlzdHMudHh0CkBAIC0yNzgwLDcgKzI3ODAsNiBAQCBzZXQoV2ViQ29yZV9T T1VSQ0VTCiAgICAgc3ZnL1NWR1RleHRQYXRoRWxlbWVudC5jcHAKICAgICBzdmcvU1ZHVGV4dFBv c2l0aW9uaW5nRWxlbWVudC5jcHAKICAgICBzdmcvU1ZHVGl0bGVFbGVtZW50LmNwcAotICAgIHN2 Zy9TVkdUb09URkZvbnRDb252ZXJzaW9uLmNwcAogICAgIHN2Zy9TVkdUcmFuc2Zvcm0uY3BwCiAg ICAgc3ZnL1NWR1RyYW5zZm9ybURpc3RhbmNlLmNwcAogICAgIHN2Zy9TVkdUcmFuc2Zvcm1MaXN0 LmNwcApAQCAtMjg1OCw2ICsyODU3LDEyIEBAIHNldChXZWJDb3JlX1NPVVJDRVMKICAgICB4bWwv cGFyc2VyL1hNTERvY3VtZW50UGFyc2VyU2NvcGUuY3BwCiApCiAKK2lmIChFTkFCTEVfU1ZHX0ZP TlRTKQorICAgIGxpc3QoQVBQRU5EIFdlYkNvcmVfU09VUkNFUworICAgICAgICBzdmcvU1ZHVG9P VEZGb250Q29udmVyc2lvbi5jcHAKKyAgICApCitlbmRpZiAoKQorCiBpZiAoRU5BQkxFX0dBTUVQ QUQpCiAgICAgbGlzdChBUFBFTkQgV2ViQ29yZV9JTkNMVURFX0RJUkVDVE9SSUVTCiAgICAgICAg ICIke1dFQkNPUkVfRElSfS9Nb2R1bGVzL2dhbWVwYWQiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0Zv bnRGYWNlU291cmNlLmNwcAppbmRleCBkNDAyMjMxNjJjZjMzMWIzZjZjODBiYTg4N2E5YjFlZjZi NzhiZGFhLi41YzBlZjQ0MzZjNWI3ZjAyNjdlODBlODc0NDI0YTY1OTUwNjVjYjgxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZVNvdXJjZS5jcHAKQEAgLTczLDggKzczLDE0IEBAIENT U0ZvbnRGYWNlU291cmNlOjpDU1NGb250RmFjZVNvdXJjZShDU1NGb250RmFjZSYgb3duZXIsIGNv bnN0IFN0cmluZyYgZmFtaWx5TmFtCiAgICAgOiBtX2ZhbWlseU5hbWVPclVSSShmYW1pbHlOYW1l T3JVUkkpCiAgICAgLCBtX2ZvbnQoZm9udCkKICAgICAsIG1fZmFjZShvd25lcikKKyNpZiBFTkFC TEUoU1ZHX0ZPTlRTKQogICAgICwgbV9zdmdGb250RmFjZUVsZW1lbnQoZm9udEZhY2UpCisjZW5k aWYKIHsKKyNpZiAhRU5BQkxFKFNWR19GT05UUykKKyAgICBVTlVTRURfUEFSQU0oZm9udEZhY2Up OworI2VuZGlmCisKICAgICAvLyBUaGlzIG1heSBzeW5jaHJvbm91c2x5IGNhbGwgZm9udExvYWRl ZCgpLgogICAgIGlmIChtX2ZvbnQpCiAgICAgICAgIG1fZm9udC0+YWRkQ2xpZW50KHRoaXMpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlU291cmNlLmggYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuaAppbmRleCAyNTI2NmNjMzhmZTUxOWY4 MDM5NmNlYzFjZGE1YmNlNzdhMzZiZmI1Li5lMjNiMjY4ZjZmZWFiODg4N2FkNjkzZTI0MGQwYTJh MzEwOThlYjcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3Vy Y2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuaApAQCAtODEs NyArODEsOSBAQCBwcml2YXRlOgogCiAgICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gbV9nZW5lcmF0 ZWRPVEZCdWZmZXI7CiAKKyNpZiBFTkFCTEUoU1ZHX0ZPTlRTKQogICAgIFJlZlB0cjxTVkdGb250 RmFjZUVsZW1lbnQ+IG1fc3ZnRm9udEZhY2VFbGVtZW50OworI2VuZGlmCiAgICAgc3RkOjp1bmlx dWVfcHRyPEZvbnRDdXN0b21QbGF0Zm9ybURhdGE+IG1faW5Eb2N1bWVudEN1c3RvbVBsYXRmb3Jt RGF0YTsKIAogICAgIFN0YXR1cyBtX3N0YXR1cyB7IFN0YXR1czo6UGVuZGluZyB9OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENhc2NhZGUuY3BwCmluZGV4IDRl NWM5MzE4ZjY5MDE3Yjk3YzEyZTRmN2I0OTk1YmRjOGM0MDY5YzUuLjFmNjkwYmU3ZmQyZDc2ODQw NzI2OTY2OTBmNzBjYWRjMTQ2ZTRmNTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9Gb250Q2FzY2FkZS5jcHAKQEAgLTEyNzYsMTAgKzEyNzYsNiBAQCB2b2lkIEZv bnRDYXNjYWRlOjpkcmF3RW1waGFzaXNNYXJrc0ZvclNpbXBsZVRleHQoR3JhcGhpY3NDb250ZXh0 JiBjb250ZXh0LCBjb25zdAogCiB2b2lkIEZvbnRDYXNjYWRlOjpkcmF3R2x5cGhCdWZmZXIoR3Jh cGhpY3NDb250ZXh0JiBjb250ZXh0LCBjb25zdCBHbHlwaEJ1ZmZlciYgZ2x5cGhCdWZmZXIsIEZs b2F0UG9pbnQmIHBvaW50KSBjb25zdAogewotI2lmICFFTkFCTEUoU1ZHX0ZPTlRTKQotICAgIFVO VVNFRF9QQVJBTShydW4pOwotI2VuZGlmCi0KICAgICAvLyBEcmF3IGVhY2ggY29udGlndW91cyBy dW4gb2YgZ2x5cGhzIHRoYXQgdXNlIHRoZSBzYW1lIGZvbnQgZGF0YS4KICAgICBjb25zdCBGb250 KiBmb250RGF0YSA9IGdseXBoQnVmZmVyLmZvbnRBdCgwKTsKICAgICBGbG9hdFNpemUgb2Zmc2V0 ID0gZ2x5cGhCdWZmZXIub2Zmc2V0QXQoMCk7Cg== 276941 2016-04-21 12:09:13 -0700 2016-04-21 13:07:21 -0700 Patch bug-156850-20160421220934.patch text/plain 3666 annulen U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5NzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTU4MzJkYmNlYzY1YThm NTE5NzkwMzJkNmJiMDRjNTA5YWIwNTQwZC4uNDMyNTA1NWQ4NDg1MjI1ZTA5MWI2ZTU5MzhiNmQ0 ZTM5ZjA4YzRkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE2LTA0LTIxICBLb25z dGFudGluIFRva2FyZXYgIDxhbm51bGVuQHlhbmRleC5ydT4KKworICAgICAgICBGaXhlZCBjb21w aWxhdGlvbiB3aXRoICFFTkFCTEUoU1ZHX0ZPTlRTKS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Njg1MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBuZWVkZWQuCisKKyAgICAgICAg KiBjc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udEZh Y2VTb3VyY2U6OkNTU0ZvbnRGYWNlU291cmNlKToKKyAgICAgICAgQWRkZWQgbWlzc2luZyBFTkFC TEUoU1ZHX0ZPTlRTKSBndWFyZHMuCisgICAgICAgICogY3NzL0NTU0ZvbnRGYWNlU291cmNlLmg6 IERpdHRvLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcDogRGl0 dG8uCisgICAgICAgICogc3ZnL1NWR1RvT1RGRm9udENvbnZlcnNpb24uY3BwOgorICAgICAgICAo V2ViQ29yZTo6Rm9udENhc2NhZGU6OmRyYXdHbHlwaEJ1ZmZlcik6IERlbGV0ZWQgZXh0cmFuZW91 cworICAgICAgICAhRU5BQkxFKFNWR19GT05UUykgZ3VhcmQuCisKIDIwMTYtMDQtMTkgIEFsZXgg Q2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBCdWlsZCBm aXggYWZ0ZXIgcjE5OTczOApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRG YWNlU291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZVNvdXJjZS5jcHAK aW5kZXggZDQwMjIzMTYyY2YzMzFiM2Y2YzgwYmE4ODdhOWIxZWY2Yjc4YmRhYS4uNWMwZWY0NDM2 YzViN2YwMjY3ZTgwZTg3NDQyNGE2NTk1MDY1Y2I4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvY3NzL0NTU0ZvbnRGYWNlU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT Rm9udEZhY2VTb3VyY2UuY3BwCkBAIC03Myw4ICs3MywxNCBAQCBDU1NGb250RmFjZVNvdXJjZTo6 Q1NTRm9udEZhY2VTb3VyY2UoQ1NTRm9udEZhY2UmIG93bmVyLCBjb25zdCBTdHJpbmcmIGZhbWls eU5hbQogICAgIDogbV9mYW1pbHlOYW1lT3JVUkkoZmFtaWx5TmFtZU9yVVJJKQogICAgICwgbV9m b250KGZvbnQpCiAgICAgLCBtX2ZhY2Uob3duZXIpCisjaWYgRU5BQkxFKFNWR19GT05UUykKICAg ICAsIG1fc3ZnRm9udEZhY2VFbGVtZW50KGZvbnRGYWNlKQorI2VuZGlmCiB7CisjaWYgIUVOQUJM RShTVkdfRk9OVFMpCisgICAgVU5VU0VEX1BBUkFNKGZvbnRGYWNlKTsKKyNlbmRpZgorCiAgICAg Ly8gVGhpcyBtYXkgc3luY2hyb25vdXNseSBjYWxsIGZvbnRMb2FkZWQoKS4KICAgICBpZiAobV9m b250KQogICAgICAgICBtX2ZvbnQtPmFkZENsaWVudCh0aGlzKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZVNvdXJjZS5oIGIvU291cmNlL1dlYkNvcmUvY3NzL0NT U0ZvbnRGYWNlU291cmNlLmgKaW5kZXggMjUyNjZjYzM4ZmU1MTlmODAzOTZjZWMxY2RhNWJjZTc3 YTM2YmZiNS4uZTIzYjI2OGY2ZmVhYjg4ODdhZDY5M2UyNDBkMGEyYTMxMDk4ZWI3MSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlU291cmNlLmgKKysrIGIvU291cmNl L1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlU291cmNlLmgKQEAgLTgxLDcgKzgxLDkgQEAgcHJpdmF0 ZToKIAogICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IG1fZ2VuZXJhdGVkT1RGQnVmZmVyOwogCisj aWYgRU5BQkxFKFNWR19GT05UUykKICAgICBSZWZQdHI8U1ZHRm9udEZhY2VFbGVtZW50PiBtX3N2 Z0ZvbnRGYWNlRWxlbWVudDsKKyNlbmRpZgogICAgIHN0ZDo6dW5pcXVlX3B0cjxGb250Q3VzdG9t UGxhdGZvcm1EYXRhPiBtX2luRG9jdW1lbnRDdXN0b21QbGF0Zm9ybURhdGE7CiAKICAgICBTdGF0 dXMgbV9zdGF0dXMgeyBTdGF0dXM6OlBlbmRpbmcgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0ZvbnRDYXNjYWRlLmNwcAppbmRleCA0ZTVjOTMxOGY2OTAxN2I5N2Mx MmU0ZjdiNDk5NWJkYzhjNDA2OWM1Li4xZjY5MGJlN2ZkMmQ3Njg0MDcyNjk2NjkwZjcwY2FkYzE0 NmU0ZjU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250 Q2FzY2FkZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udENh c2NhZGUuY3BwCkBAIC0xMjc2LDEwICsxMjc2LDYgQEAgdm9pZCBGb250Q2FzY2FkZTo6ZHJhd0Vt cGhhc2lzTWFya3NGb3JTaW1wbGVUZXh0KEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QK IAogdm9pZCBGb250Q2FzY2FkZTo6ZHJhd0dseXBoQnVmZmVyKEdyYXBoaWNzQ29udGV4dCYgY29u dGV4dCwgY29uc3QgR2x5cGhCdWZmZXImIGdseXBoQnVmZmVyLCBGbG9hdFBvaW50JiBwb2ludCkg Y29uc3QKIHsKLSNpZiAhRU5BQkxFKFNWR19GT05UUykKLSAgICBVTlVTRURfUEFSQU0ocnVuKTsK LSNlbmRpZgotCiAgICAgLy8gRHJhdyBlYWNoIGNvbnRpZ3VvdXMgcnVuIG9mIGdseXBocyB0aGF0 IHVzZSB0aGUgc2FtZSBmb250IGRhdGEuCiAgICAgY29uc3QgRm9udCogZm9udERhdGEgPSBnbHlw aEJ1ZmZlci5mb250QXQoMCk7CiAgICAgRmxvYXRTaXplIG9mZnNldCA9IGdseXBoQnVmZmVyLm9m ZnNldEF0KDApOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1RvT1RGRm9udENv bnZlcnNpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1RvT1RGRm9udENvbnZlcnNpb24u Y3BwCmluZGV4IGRlMzIwMjY1NzY1OTBjZGE3ODk3ZWIxZTMyNDQwZjFhNWNmMjcxYjUuLmQwNzcz ZGM5ZTcxYTZjYjExZDkzYjg2ZDM0YzA2ZTEwMjQxNTc0YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3N2Zy9TVkdUb09URkZvbnRDb252ZXJzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9zdmcvU1ZHVG9PVEZGb250Q29udmVyc2lvbi5jcHAKQEAgLTI2LDYgKzI2LDggQEAKICNpbmNs dWRlICJjb25maWcuaCIKICNpbmNsdWRlICJTVkdUb09URkZvbnRDb252ZXJzaW9uLmgiCiAKKyNp ZiBFTkFCTEUoU1ZHX0ZPTlRTKQorCiAjaW5jbHVkZSAiQ1NTU3R5bGVEZWNsYXJhdGlvbi5oIgog I2luY2x1ZGUgIkVsZW1lbnRDaGlsZEl0ZXJhdG9yLmgiCiAjaW5jbHVkZSAiR2x5cGguaCIKQEAg LTE1OTMsMyArMTU5NSw1IEBAIE9wdGlvbmFsPFZlY3RvcjxjaGFyPj4gY29udmVydFNWR1RvT1RG Rm9udChjb25zdCBTVkdGb250RWxlbWVudCYgZWxlbWVudCkKIH0KIAogfQorCisjZW5kaWYgLy8g RU5BQkxFKFNWR19GT05UUykK