138924 2014-11-20 04:35:51 -0800 Fix the !ENABLE(SVG_FONTS) build after r176276 2014-11-20 13:45:49 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 138686 1 ossy mmaxfield commit-queue mmaxfield ossy simon.fraser oldest_to_newest 1050111 0 ossy 2014-11-20 04:35:51 -0800 build log: ../../Source/WebCore/css/CSSFontFaceSource.cpp:127:47: error: 'm_hasExternalSVGFont' was not declared in this scope ../../Source/WebCore/css/CSSFontFaceSource.cpp:130:103: error: 'm_hasExternalSVGFont' was not declared in this scope m_hasExternalSVGFont is declared inside ENABLE(SVG_FONTS) guard, but used unconditionally here. 1050112 1 ossy 2014-11-20 04:39:41 -0800 more build error after this change: ../../Source/WebCore/loader/cache/CachedResourceLoader.cpp:186:25: error: 'CachedSVGFont' was not declared in this scope ../../Source/WebCore/loader/cache/CachedResourceLoader.cpp:186:56: error: 'SVGFontResource' is not a member of 'WebCore::CachedResource' 1050219 2 241972 mmaxfield 2014-11-20 13:02:19 -0800 Created attachment 241972 Patch 1050220 3 241972 ossy 2014-11-20 13:08:34 -0800 Comment on attachment 241972 Patch Thanks, rs=me. 1050227 4 241972 commit-queue 2014-11-20 13:45:44 -0800 Comment on attachment 241972 Patch Clearing flags on attachment: 241972 Committed r176410: <http://trac.webkit.org/changeset/176410> 1050228 5 commit-queue 2014-11-20 13:45:49 -0800 All reviewed patches have been landed. Closing bug. 241972 2014-11-20 13:02:19 -0800 2014-11-20 13:45:44 -0800 Patch bug-138924-20141120130234.patch text/plain 2827 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTc2NDA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjYyYzU0YTdlMjRmYWE0 ZTg5ZTUxYWM1ZWY3Y2RjMmQ3ZGYzNGZkMi4uZTFlZTM4NzIyMjUwODM1M2UyNDY2YWU5MDAxYWYw MzI0MWI2ODAyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTExLTIwICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IHRoZSAh RU5BQkxFKFNWR19GT05UUykgYnVpbGQgYWZ0ZXIgcjE3NjI3NgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM4OTI0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2UgdGhlcmUg aXMgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogY3NzL0NTU0ZvbnRGYWNlU291cmNl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRGYWNlU291cmNlOjpnZXRGb250RGF0YSk6 CisgICAgICAgICogbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNhY2hlZFJlc291cmNlTG9hZGVyOjpyZXF1ZXN0Rm9udCk6CisKIDIwMTQt MTEtMTkgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIGEgd2F5 IHRvIG11dGUgYW4gQXVkaW9Db250ZXh0LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3Nz L0NTU0ZvbnRGYWNlU291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250RmFjZVNv dXJjZS5jcHAKaW5kZXggZGJlYTJkNjJkNzA0NTZlZjUzMzAzNjJiY2IxM2YzODdmYzlhMTFmMy4u ODM5NDY5NWRmZTcyMzkwMmU5ODIxMThiMjE5MThiM2QxY2FlNjIyMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlU291cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwCkBAIC0xMjQsMTAgKzEyNCwxNCBAQCBQYXNzUmVm UHRyPFNpbXBsZUZvbnREYXRhPiBDU1NGb250RmFjZVNvdXJjZTo6Z2V0Rm9udERhdGEoY29uc3Qg Rm9udERlc2NyaXB0aW9uJgogICAgIGlmIChpc0xvYWRlZCgpKSB7CiAgICAgICAgIGlmIChtX2Zv bnQpIHsKICAgICAgICAgICAgIC8vIENyZWF0ZSBuZXcgRm9udFBsYXRmb3JtRGF0YSBmcm9tIG91 ciBDR0ZvbnRSZWYsIHBvaW50IHNpemUgYW5kIEFUU0ZvbnRSZWYuCi0gICAgICAgICAgICBpZiAo IW1fZm9udC0+ZW5zdXJlQ3VzdG9tRm9udERhdGEobV9oYXNFeHRlcm5hbFNWR0ZvbnQpKQorICAg ICAgICAgICAgYm9vbCBoYXNFeHRlcm5hbFNWR0ZvbnQgPSBmYWxzZTsKKyNpZiBFTkFCTEUoU1ZH X0ZPTlRTKQorICAgICAgICAgICAgaGFzRXh0ZXJuYWxTVkdGb250ID0gbV9oYXNFeHRlcm5hbFNW R0ZvbnQ7CisjZW5kaWYKKyAgICAgICAgICAgIGlmICghbV9mb250LT5lbnN1cmVDdXN0b21Gb250 RGF0YShoYXNFeHRlcm5hbFNWR0ZvbnQpKQogICAgICAgICAgICAgICAgIHJldHVybiBudWxscHRy OwogCi0gICAgICAgICAgICBmb250RGF0YSA9IG1fZm9udC0+Z2V0Rm9udERhdGEoZm9udERlc2Ny aXB0aW9uLCBtX3N0cmluZywgc3ludGhldGljQm9sZCwgc3ludGhldGljSXRhbGljLCBtX2hhc0V4 dGVybmFsU1ZHRm9udCk7CisgICAgICAgICAgICBmb250RGF0YSA9IG1fZm9udC0+Z2V0Rm9udERh dGEoZm9udERlc2NyaXB0aW9uLCBtX3N0cmluZywgc3ludGhldGljQm9sZCwgc3ludGhldGljSXRh bGljLCBoYXNFeHRlcm5hbFNWR0ZvbnQpOwogICAgICAgICB9IGVsc2UgewogI2lmIEVOQUJMRShT VkdfRk9OVFMpCiAgICAgICAgICAgICAvLyBJbi1Eb2N1bWVudCBTVkcgRm9udHMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkUmVzb3VyY2VMb2FkZXIuY3BwCmlu ZGV4IDY4YzAyMmZmMGFjN2E0NmU5M2Q3NjY3NTc0YjJmMzJlMGRlMDYyMTQuLjM0ODhkZTQ3NWZk ZmMwODFiNWFjOTQ4MDRhZmYzN2FlMGExNTJmMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9jYWNoZS9DYWNoZWRSZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL2NhY2hlL0NhY2hlZFJlc291cmNlTG9hZGVyLmNwcApAQCAtMTgyLDggKzE4Miwx MiBAQCBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNoZWRJbWFnZT4gQ2FjaGVkUmVzb3VyY2VMb2Fk ZXI6OnJlcXVlc3RJbWFnZShDYWNoZWRSZXNvdQogCiBDYWNoZWRSZXNvdXJjZUhhbmRsZTxDYWNo ZWRGb250PiBDYWNoZWRSZXNvdXJjZUxvYWRlcjo6cmVxdWVzdEZvbnQoQ2FjaGVkUmVzb3VyY2VS ZXF1ZXN0JiByZXF1ZXN0LCBib29sIGlzU1ZHKQogeworI2lmIEVOQUJMRShTVkdfRk9OVFMpCiAg ICAgaWYgKGlzU1ZHKQogICAgICAgICByZXR1cm4gZG93bmNhc3Q8Q2FjaGVkU1ZHRm9udD4ocmVx dWVzdFJlc291cmNlKENhY2hlZFJlc291cmNlOjpTVkdGb250UmVzb3VyY2UsIHJlcXVlc3QpLmdl dCgpKTsKKyNlbHNlCisgICAgVU5VU0VEX1BBUkFNKGlzU1ZHKTsKKyNlbmRpZgogICAgIHJldHVy biBkb3duY2FzdDxDYWNoZWRGb250PihyZXF1ZXN0UmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2U6OkZv bnRSZXNvdXJjZSwgcmVxdWVzdCkuZ2V0KCkpOwogfQogCg==