23253 2009-01-12 08:41:47 -0800 [Qt] Build fix after turning the fontCache to a singleton 2009-01-12 13:32:52 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jchaffraix jchaffraix ariya.hidayat oldest_to_newest 105331 0 jchaffraix 2009-01-12 08:41:47 -0800 After bug22861, I have broken the build (undefined reference to WebCore::fontCache()). This is an attempt to solve this following zecke's advice to avoid calling fontCache() for the Qt port. Patch forthcoming. 105333 1 26633 jchaffraix 2009-01-12 08:47:24 -0800 Created attachment 26633 Proposed build fix - guard the call against the Qt port 105354 2 26633 zecke 2009-01-12 12:11:00 -0800 Comment on attachment 26633 Proposed build fix - guard the call against the Qt port Sorry, my comment in irc was a bit misleading. There is a WebCore/platform/graphics/qt/FontCacheQt.cpp and it needs a fontCache() stub to return a dummy FontCache* instance. 105380 3 26646 jchaffraix 2009-01-12 13:16:59 -0800 Created attachment 26646 Build fix: Updated with zecke's comments 105381 4 26646 zecke 2009-01-12 13:24:56 -0800 Comment on attachment 26646 Build fix: Updated with zecke's comments looks good. 105382 5 jchaffraix 2009-01-12 13:32:52 -0800 Landed fix in r39832. 26633 2009-01-12 08:47:24 -0800 2009-01-12 13:16:59 -0800 Proposed build fix - guard the call against the Qt port BuildFixFontCache.diff text/plain 4595 jchaffraix SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzOTgyNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMDktMDEtMTIgIEp1bGllbiBDaGFmZnJhaXggIDxqY2hhZmZyYWl4 QHBsZXlvLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbUXRdIEJ1aWxkIGZpeCBhZnRlciB0dXJuaW5nIHRoZSBmb250Q2FjaGUgdG8gYSBzaW5n bGV0b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz MjUzCisKKyAgICAgICAgQXZvaWQgY2FsbHMgdG8gV2ViQ29yZTo6Zm9udENhY2hlKCkgYnkgcHJv dGVjdGluZyB0aGVtCisgICAgICAgIGFnYWluc3QgdGhlIFF0IHBvcnQuCisKKyAgICAgICAgKiBj c3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udEZhY2VT b3VyY2U6OmdldEZvbnREYXRhKToKKyAgICAgICAgKiBjc3MvQ1NTRm9udFNlbGVjdG9yLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRTZWxlY3Rvcjo6Q1NTRm9udFNlbGVjdG9yKToKKyAg ICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRTZWxlY3Rvcjo6fkNTU0ZvbnRTZWxlY3Rvcik6CisgICAg ICAgIChXZWJDb3JlOjpDU1NGb250U2VsZWN0b3I6OmFkZEZvbnRGYWNlUnVsZSk6CisgICAgICAg IChXZWJDb3JlOjpmb250RGF0YUZvckdlbmVyaWNGYW1pbHkpOgorICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL1NpbXBsZUZvbnREYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUZv bnREYXRhOjp+U2ltcGxlRm9udERhdGEpOgorCiAyMDA5LTAxLTEyICBBZGFtIFRyZWF0ICA8YWRh bS50cmVhdEB0b3JjaG1vYmlsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR2VvcmdlIFN0 YWlrb3MuCkluZGV4OiBXZWJDb3JlL2Nzcy9DU1NGb250RmFjZVNvdXJjZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9jc3MvQ1NTRm9udEZhY2VTb3VyY2UuY3BwCShyZXZpc2lvbiAzOTgyNikK KysrIFdlYkNvcmUvY3NzL0NTU0ZvbnRGYWNlU291cmNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTA3LDExICsxMDcsMTUgQEAgU2ltcGxlRm9udERhdGEqIENTU0ZvbnRGYWNlU291cmNlOjpnZXRG bwogI2Vsc2UKICAgICBpZiAoIW1fZm9udCkgewogI2VuZGlmCisjaWYgIVBMQVRGT1JNKFFUKQog ICAgICAgICBGb250UGxhdGZvcm1EYXRhKiBkYXRhID0gZm9udENhY2hlKCktPmdldENhY2hlZEZv bnRQbGF0Zm9ybURhdGEoZm9udERlc2NyaXB0aW9uLCBtX3N0cmluZyk7CiAgICAgICAgIFNpbXBs ZUZvbnREYXRhKiBmb250RGF0YSA9IGZvbnRDYWNoZSgpLT5nZXRDYWNoZWRGb250RGF0YShkYXRh KTsKIAogICAgICAgICAvLyBXZSdyZSBsb2NhbC4gSnVzdCByZXR1cm4gYSBTaW1wbGVGb250RGF0 YSBmcm9tIHRoZSBub3JtYWwgY2FjaGUuCiAgICAgICAgIHJldHVybiBmb250RGF0YTsKKyNlbHNl CisgICAgICAgIHJldHVybiAwOworI2VuZGlmCiAgICAgfQogCiAgICAgLy8gU2VlIGlmIHdlIGhh dmUgYSBtYXBwaW5nIGluIG91ciBGb250RGF0YSBjYWNoZS4KQEAgLTE3OCwxMSArMTgyLDEzIEBA IFNpbXBsZUZvbnREYXRhKiBDU1NGb250RmFjZVNvdXJjZTo6Z2V0Rm8KICAgICAgICAgLy8gS2lj ayBvZmYgdGhlIGxvYWQgbm93LgogICAgICAgICBpZiAoRG9jTG9hZGVyKiBkb2NMb2FkZXIgPSBm b250U2VsZWN0b3ItPmRvY0xvYWRlcigpKQogICAgICAgICAgICAgbV9mb250LT5iZWdpbkxvYWRJ Zk5lZWRlZChkb2NMb2FkZXIpOworI2lmICFQTEFURk9STShRVCkKICAgICAgICAgLy8gRklYTUU6 IG1fc3RyaW5nIGlzIGEgVVJMIHNvIGl0IG1ha2VzIG5vIHNlbnNlIHRvIHBhc3MgaXQgYXMgYSBm YW1pbHkgbmFtZS4KICAgICAgICAgRm9udFBsYXRmb3JtRGF0YSogdGVtcERhdGEgPSBmb250Q2Fj aGUoKS0+Z2V0Q2FjaGVkRm9udFBsYXRmb3JtRGF0YShmb250RGVzY3JpcHRpb24sIG1fc3RyaW5n KTsKICAgICAgICAgaWYgKCF0ZW1wRGF0YSkKICAgICAgICAgICAgIHRlbXBEYXRhID0gZm9udENh Y2hlKCktPmdldExhc3RSZXNvcnRGYWxsYmFja0ZvbnQoZm9udERlc2NyaXB0aW9uKTsKICAgICAg ICAgZm9udERhdGEuc2V0KG5ldyBTaW1wbGVGb250RGF0YSgqdGVtcERhdGEsIHRydWUsIHRydWUp KTsKKyNlbmRpZgogICAgIH0KIAogICAgIG1fZm9udERhdGFUYWJsZS5zZXQoaGFzaEtleSwgZm9u dERhdGEuZ2V0KCkpOwpJbmRleDogV2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwCShyZXZpc2lvbiAzOTgy NikKKysrIFdlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTY1LDEyICs2NSwxNiBAQCBDU1NGb250U2VsZWN0b3I6OkNTU0ZvbnRTZWxlY3RvcihEb2N1bWVu CiAgICAgLy8gc2VlbSB0byBiZSBhbnkgc3VjaCBndWFyYW50ZWUuCiAKICAgICBBU1NFUlQobV9k b2N1bWVudCk7CisjaWYgIVBMQVRGT1JNKFFUKQogICAgIGZvbnRDYWNoZSgpLT5hZGRDbGllbnQo dGhpcyk7CisjZW5kaWYKIH0KIAogQ1NTRm9udFNlbGVjdG9yOjp+Q1NTRm9udFNlbGVjdG9yKCkK IHsKKyNpZiAhUExBVEZPUk0oUVQpCiAgICAgZm9udENhY2hlKCktPnJlbW92ZUNsaWVudCh0aGlz KTsKKyNlbmRpZgogICAgIGRlbGV0ZUFsbFZhbHVlcyhtX2ZvbnRGYWNlcyk7CiAgICAgZGVsZXRl QWxsVmFsdWVzKG1fbG9jYWxseUluc3RhbGxlZEZvbnRGYWNlcyk7CiAgICAgZGVsZXRlQWxsVmFs dWVzKG1fZm9udHMpOwpAQCAtMzM4LDcgKzM0Miw5IEBAIHZvaWQgQ1NTRm9udFNlbGVjdG9yOjph ZGRGb250RmFjZVJ1bGUoY28KICAgICAgICAgICAgIFZlY3RvcjxSZWZQdHI8Q1NTRm9udEZhY2U+ ID4qIGZhbWlseUxvY2FsbHlJbnN0YWxsZWRGYWNlczsKIAogICAgICAgICAgICAgVmVjdG9yPHVu c2lnbmVkPiBsb2NhbGx5SW5zdGFsbGVkRm9udHNUcmFpdHNNYXNrczsKKyNpZiAhUExBVEZPUk0o UVQpCiAgICAgICAgICAgICBmb250Q2FjaGUoKS0+Z2V0VHJhaXRzSW5GYW1pbHkoZmFtaWx5TmFt ZSwgbG9jYWxseUluc3RhbGxlZEZvbnRzVHJhaXRzTWFza3MpOworI2VuZGlmCiAgICAgICAgICAg ICB1bnNpZ25lZCBudW1Mb2NhbGx5SW5zdGFsbGVkRmFjZXMgPSBsb2NhbGx5SW5zdGFsbGVkRm9u dHNUcmFpdHNNYXNrcy5zaXplKCk7CiAgICAgICAgICAgICBpZiAobnVtTG9jYWxseUluc3RhbGxl ZEZhY2VzKSB7CiAgICAgICAgICAgICAgICAgZmFtaWx5TG9jYWxseUluc3RhbGxlZEZhY2VzID0g bmV3IFZlY3RvcjxSZWZQdHI8Q1NTRm9udEZhY2U+ID47CkBAIC0zOTYsOCArNDAyLDEwIEBAIHN0 YXRpYyBGb250RGF0YSogZm9udERhdGFGb3JHZW5lcmljRmFtaWwKICAgICBlbHNlIGlmIChmYW1p bHlOYW1lID09ICItd2Via2l0LXN0YW5kYXJkIikKICAgICAgICAgZ2VuZXJpY0ZhbWlseSA9IHNl dHRpbmdzLT5zdGFuZGFyZEZvbnRGYW1pbHkoKTsKIAorI2lmICFQTEFURk9STShRVCkKICAgICBp ZiAoIWdlbmVyaWNGYW1pbHkuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gZm9udENhY2hlKCkt PmdldENhY2hlZEZvbnREYXRhKGZvbnRDYWNoZSgpLT5nZXRDYWNoZWRGb250UGxhdGZvcm1EYXRh KGZvbnREZXNjcmlwdGlvbiwgZ2VuZXJpY0ZhbWlseSkpOworI2VuZGlmCiAKICAgICByZXR1cm4g MDsKIH0KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxlRm9udERhdGEuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxlRm9udERhdGEu Y3BwCShyZXZpc2lvbiAzOTgyNikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU2ltcGxl Rm9udERhdGEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjIsMTEgKzEyMiwxMyBAQCB2b2lkIFNp bXBsZUZvbnREYXRhOjpwbGF0Zm9ybUdseXBoSW5pdCgpCiAKIFNpbXBsZUZvbnREYXRhOjp+U2lt cGxlRm9udERhdGEoKQogeworI2lmICFQTEFURk9STShRVCkKICAgICBpZiAoIWlzQ3VzdG9tRm9u dCgpKSB7CiAgICAgICAgIGlmIChtX3NtYWxsQ2Fwc0ZvbnREYXRhKQogICAgICAgICAgICAgZm9u dENhY2hlKCktPnJlbGVhc2VGb250RGF0YShtX3NtYWxsQ2Fwc0ZvbnREYXRhKTsKICAgICAgICAg R2x5cGhQYWdlVHJlZU5vZGU6OnBydW5lVHJlZUZvbnREYXRhKHRoaXMpOwogICAgIH0KKyNlbmRp ZgogCiAjaWYgRU5BQkxFKFNWR19GT05UUykKICAgICBpZiAoIW1fc3ZnRm9udERhdGEgfHwgIW1f c3ZnRm9udERhdGEtPnN2Z0ZvbnRGYWNlRWxlbWVudCgpKQo= 26646 2009-01-12 13:16:59 -0800 2009-01-12 13:24:56 -0800 Build fix: Updated with zecke's comments BuildFixFontCache-updated.diff text/plain 1369 jchaffraix SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzOTgzMCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDktMDEtMTIgIEp1bGllbiBDaGFmZnJhaXggIDxqY2hhZmZyYWl4 QHBsZXlvLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbUXRdIEJ1aWxkIGZpeCBhZnRlciB0dXJuaW5nIHRoZSBmb250Q2FjaGUgdG8gYSBzaW5n bGV0b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz MjUzCisKKyAgICAgICAgQWRkIGEgc3R1YiBpbXBsZW1lbnRhdGlvbiBmb3IgV2ViQ29yZTo6Zm9u dENhY2hlKCkgZXQgRm9udENhY2hlOjpGb250Q2FjaGUoKS4KKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL3F0L0ZvbnRDYWNoZVF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmZvbnRDYWNo ZSk6CisgICAgICAgIChXZWJDb3JlOjpGb250Q2FjaGU6OkZvbnRDYWNoZSk6CisKIDIwMDktMDEt MTIgIERpbWl0cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv cXQvRm9udENhY2hlUXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvRm9udENhY2hlUXQuY3BwCShyZXZpc2lvbiAzOTgyNikKKysrIFdlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvcXQvRm9udENhY2hlUXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNiw5ICsy NiwyMCBAQAogI2luY2x1ZGUgIkZvbnREZXNjcmlwdGlvbi5oIgogI2luY2x1ZGUgIkZvbnRQbGF0 Zm9ybURhdGEuaCIKICNpbmNsdWRlICJGb250LmgiCisjaW5jbHVkZSA8d3RmL1N0ZExpYkV4dHJh cy5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK0ZvbnRDYWNoZSogZm9udENhY2hlKCkKK3sK KyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKEZvbnRDYWNoZSwgZ2xvYmFsRm9udENhY2hlLCAoKSk7 CisgICAgcmV0dXJuICZnbG9iYWxGb250Q2FjaGU7Cit9CisKK0ZvbnRDYWNoZTo6Rm9udENhY2hl KCkKK3sKK30KKwogdm9pZCBGb250Q2FjaGU6OmdldFRyYWl0c0luRmFtaWx5KGNvbnN0IEF0b21p Y1N0cmluZyYgZmFtaWx5TmFtZSwgVmVjdG9yPHVuc2lnbmVkPiYgdHJhaXRzTWFza3MpCiB7CiB9 Cg==