154104 2016-02-11 03:26:28 -0800 Fix the !(ENABLE(SVG_FONTS) || ENABLE(SVG_OTF_CONVERTER)) build after r196322 2016-02-15 04:28:25 -0800 1 1 1 Unclassified WebKit New Bugs Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=154035 P2 Normal --- 153414 1 ossy ossy achristensen commit-queue darin koivisto mmaxfield ossy oldest_to_newest 1163730 0 ossy 2016-02-11 03:26:28 -0800 http://trac.webkit.org/changeset/196322 broke the !(ENABLE(SVG_FONTS) || ENABLE(SVG_OTF_CONVERTER)) build, because CSSFontFaceSource::CSSFontFaceSource:m_svgFontFaceElement is declared inside ifdef guards, but initialized uncionditionally in the init list of the constructor. 1163731 1 271055 ossy 2016-02-11 03:33:20 -0800 Created attachment 271055 Patch 1163733 2 ossy 2016-02-11 03:43:40 -0800 Or should we declare m_svgFontFaceElement unconditionally? ( similar to bug154035 ) 1163752 3 achristensen 2016-02-11 08:57:40 -0800 (In reply to comment #2) > Or should we declare m_svgFontFaceElement unconditionally? > ( similar to bug154035 ) I think that would be cleaner. 1163758 4 darin 2016-02-11 09:30:52 -0800 (In reply to comment #3) > (In reply to comment #2) > > Or should we declare m_svgFontFaceElement unconditionally? > > ( similar to bug154035 ) > I think that would be cleaner. I agree. 1163845 5 mmaxfield 2016-02-11 13:31:28 -0800 EWS was all green on http://trac.webkit.org/changeset/196322 :( 1164073 6 ossy 2016-02-12 02:02:53 -0800 (In reply to comment #4) > (In reply to comment #3) > > (In reply to comment #2) > > > Or should we declare m_svgFontFaceElement unconditionally? > > > ( similar to bug154035 ) > > I think that would be cleaner. > > I agree. I checked it in details, it's impossible. m_svgFontFaceElement has RefPtr<SVGFontFaceElement> type and SVGFontFaceElement class is defined inside ENABLE(SVG_FONTS) guard. To be able to use RefPtr<SVGFontFaceElement> type, we have to remove ENABLE(SVG_FONTS) guard from SVGFontFaceElement.h and I think transitionally all ENABLE(SVG_FONTS) guards everywhere. The question is if we want to support !ENABLE(SVG_FONTS) build or not. If yes, we should land my previously proposed patch. If not, we should remove all ENABLE(SVG_FONTS) guards. 1164074 7 271055 ossy 2016-02-12 02:03:39 -0800 Comment on attachment 271055 Patch r? again, maybe we would like to keep !ENABLE(SVG_FONTS) build configuration work. 1164199 8 mmaxfield 2016-02-12 10:44:36 -0800 (In reply to comment #6) > (In reply to comment #4) > > (In reply to comment #3) > > > (In reply to comment #2) > > > > Or should we declare m_svgFontFaceElement unconditionally? > > > > ( similar to bug154035 ) > > > I think that would be cleaner. > > > > I agree. > > I checked it in details, it's impossible. > > m_svgFontFaceElement has RefPtr<SVGFontFaceElement> type and > SVGFontFaceElement class is defined inside ENABLE(SVG_FONTS) guard. > > To be able to use RefPtr<SVGFontFaceElement> type, we have to > remove ENABLE(SVG_FONTS) guard from SVGFontFaceElement.h and > I think transitionally all ENABLE(SVG_FONTS) guards everywhere. > > The question is if we want to support !ENABLE(SVG_FONTS) build or not. > If yes, we should land my previously proposed patch. If not, we should > remove all ENABLE(SVG_FONTS) guards. FWIW, I am very close to enabling the SVG font converter on Windows, and I hope the remaining ports will be quick to follow. I hope to remove all the SVG font code (in favor of the converter) in a few weeks. 1164722 9 271055 commit-queue 2016-02-15 04:28:20 -0800 Comment on attachment 271055 Patch Clearing flags on attachment: 271055 Committed r196576: <http://trac.webkit.org/changeset/196576> 1164723 10 commit-queue 2016-02-15 04:28:25 -0800 All reviewed patches have been landed. Closing bug. 271055 2016-02-11 03:33:20 -0800 2016-02-15 04:28:20 -0800 Patch bug-154104-20160211123257.patch text/plain 1512 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2NDE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjg4ZWExZDM1ZGJjMWJl ZTlhYzVmZmZlYzQ3MzI3OTgyOWJjNWRkNC4uMzJlZGEzOWVmNTViMGI0MGZlOGFkNmEyMTQzNTYw YTQxOGVhZmM0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE2LTAyLTExICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IHRoZSAhKEVO QUJMRShTVkdfRk9OVFMpIHx8IEVOQUJMRShTVkdfT1RGX0NPTlZFUlRFUikpIGJ1aWxkIGFmdGVy IHIxOTYzMjIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE1NDEwNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogY3NzL0NTU0ZvbnRGYWNlU291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRG YWNlU291cmNlOjpDU1NGb250RmFjZVNvdXJjZSk6CisKIDIwMTYtMDItMTAgIFJ5YW4gSGFkZGFk ICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgVXBkYXRpbmcgYmluZGluZ3MgdGVz dCByZWZlcmVuY2UgZmlsZSBmb3IgSlNUZXN0RXZlbnRDb25zdHJ1Y3Rvci5jcHAgYWZ0ZXIgcjE5 NjQwMApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlU291cmNlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZVNvdXJjZS5jcHAKaW5kZXggMjBjNjNj ZWJkNTJkNDAyZTMwMjVhN2U0NDNiNGM0NjRlNmVhNDljOS4uNjNmMjY1MDYyZTY2ZWJlYjAyYTgz YTA3NDQwMjk3MDBkMGZjZjJkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0Zv bnRGYWNlU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3Vy Y2UuY3BwCkBAIC03Niw4ICs3NiwxNCBAQCBDU1NGb250RmFjZVNvdXJjZTo6Q1NTRm9udEZhY2VT b3VyY2UoQ1NTRm9udEZhY2UmIG93bmVyLCBjb25zdCBTdHJpbmcmIGZhbWlseU5hbQogICAgIDog bV9mYW1pbHlOYW1lT3JVUkkoZmFtaWx5TmFtZU9yVVJJKQogICAgICwgbV9mb250KGZvbnQpCiAg ICAgLCBtX2ZhY2Uob3duZXIpCisjaWYgRU5BQkxFKFNWR19GT05UUykgfHwgRU5BQkxFKFNWR19P VEZfQ09OVkVSVEVSKQogICAgICwgbV9zdmdGb250RmFjZUVsZW1lbnQoZm9udEZhY2UpCisjZW5k aWYKIHsKKyNpZiAhKEVOQUJMRShTVkdfRk9OVFMpIHx8IEVOQUJMRShTVkdfT1RGX0NPTlZFUlRF UikpCisgICAgVU5VU0VEX1BBUkFNKGZvbnRGYWNlKTsKKyNlbmRpZgorCiAgICAgLy8gVGhpcyBt YXkgc3luY2hyb25vdXNseSBjYWxsIGZvbnRMb2FkZWQoKS4KICAgICBpZiAobV9mb250KQogICAg ICAgICBtX2ZvbnQtPmFkZENsaWVudCh0aGlzKTsK