30011 2009-10-02 03:09:48 -0700 Fix build when SVG is not enabled 2009-10-02 11:03:02 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 laszlo.gombos webkit-unassigned bdakin commit-queue norbert.leser oldest_to_newest 151808 0 laszlo.gombos 2009-10-02 03:09:48 -0700 After r48989 there is a build failure when SVG support is disabled. 151810 1 40503 laszlo.gombos 2009-10-02 03:16:02 -0700 Created attachment 40503 1st try Move TextRenderingMode related functions out from the ENABLE(SVG) guard. 151897 2 40503 commit-queue 2009-10-02 11:02:58 -0700 Comment on attachment 40503 1st try Clearing flags on attachment: 40503 Committed r49029: <http://trac.webkit.org/changeset/49029> 151898 3 commit-queue 2009-10-02 11:03:02 -0700 All reviewed patches have been landed. Closing bug. 40503 2009-10-02 03:16:02 -0700 2009-10-02 11:02:58 -0700 1st try patch_30011.txt text/plain 3470 laszlo.gombos SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0OTAxNykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDktMTAtMDIgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21i b3NAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEJ1aWxkIGZpeCB3aGVuIFNWRyBpcyBub3QgZW5hYmxlZAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzAwMTEKKworICAgICAgICBNb3ZlIFRl eHRSZW5kZXJpbmdNb2RlIHJlbGF0ZWQgZnVuY3Rpb25zIG91dCBmcm9tCisgICAgICAgIHRoZSBF TkFCTEUoU1ZHKSBndWFyZC4KKworICAgICAgICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBp bmdzLmg6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZl VmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIFRl eHRSZW5kZXJpbmdNb2RlKToKKwogMjAwOS0xMC0wMiAgSmFubmUgS29za2luZW4gPGphbm5lLnAu a29za2luZW5AZGlnaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEhhdXNtYW5u LgpJbmRleDogV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaAkocmV2aXNpb24g NDkwMDcpCisrKyBXZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgJKHdvcmtp bmcgY29weSkKQEAgLTE4MzksNiArMTgzOSw0MiBAQCB0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmlt aXRpdmVWYWx1ZTo6b3BlCiAgICAgcmV0dXJuIEF1dG9TbW9vdGhpbmc7CiB9CiAKK3RlbXBsYXRl PD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NQcmltaXRpdmVWYWx1ZShUZXh0UmVuZGVy aW5nTW9kZSBlKQorICAgIDogbV90eXBlKENTU19JREVOVCkKK3sKKyAgICBzd2l0Y2ggKGUpIHsK KyAgICAgICAgY2FzZSBBdXRvVGV4dFJlbmRlcmluZzoKKyAgICAgICAgICAgIG1fdmFsdWUuaWRl bnQgPSBDU1NWYWx1ZUF1dG87CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSBPcHRp bWl6ZVNwZWVkOgorICAgICAgICAgICAgbV92YWx1ZS5pZGVudCA9IENTU1ZhbHVlT3B0aW1pemVz cGVlZDsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIE9wdGltaXplTGVnaWJpbGl0 eToKKyAgICAgICAgICAgIG1fdmFsdWUuaWRlbnQgPSBDU1NWYWx1ZU9wdGltaXplbGVnaWJpbGl0 eTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIEdlb21ldHJpY1ByZWNpc2lvbjoK KyAgICAgICAgICAgIG1fdmFsdWUuaWRlbnQgPSBDU1NWYWx1ZUdlb21ldHJpY3ByZWNpc2lvbjsK KyAgICAgICAgICAgIGJyZWFrOworICAgIH0KK30KKwordGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJp bWl0aXZlVmFsdWU6Om9wZXJhdG9yIFRleHRSZW5kZXJpbmdNb2RlKCkgY29uc3QKK3sKKyAgICBz d2l0Y2ggKG1fdmFsdWUuaWRlbnQpIHsKKyAgICAgICAgY2FzZSBDU1NWYWx1ZUF1dG86CisgICAg ICAgICAgICByZXR1cm4gQXV0b1RleHRSZW5kZXJpbmc7CisgICAgICAgIGNhc2UgQ1NTVmFsdWVP cHRpbWl6ZXNwZWVkOgorICAgICAgICAgICAgcmV0dXJuIE9wdGltaXplU3BlZWQ7CisgICAgICAg IGNhc2UgQ1NTVmFsdWVPcHRpbWl6ZWxlZ2liaWxpdHk6CisgICAgICAgICAgICByZXR1cm4gT3B0 aW1pemVMZWdpYmlsaXR5OworICAgICAgICBjYXNlIENTU1ZhbHVlR2VvbWV0cmljcHJlY2lzaW9u OgorICAgICAgICAgICAgcmV0dXJuIEdlb21ldHJpY1ByZWNpc2lvbjsKKyAgICAgICAgZGVmYXVs dDoKKyAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICAgICAgcmV0dXJu IEF1dG9UZXh0UmVuZGVyaW5nOworICAgIH0KK30KKwogI2lmIEVOQUJMRShTVkcpCiAKIHRlbXBs YXRlPD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NQcmltaXRpdmVWYWx1ZShMaW5lQ2Fw IGUpCkBAIC0yMjQyLDQyICsyMjc4LDYgQEAgdGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZl VmFsdWU6Om9wZQogICAgIH0KIH0KIAotdGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFs dWU6OkNTU1ByaW1pdGl2ZVZhbHVlKFRleHRSZW5kZXJpbmdNb2RlIGUpCi0gICAgOiBtX3R5cGUo Q1NTX0lERU5UKQotewotICAgIHN3aXRjaCAoZSkgewotICAgICAgICBjYXNlIEF1dG9UZXh0UmVu ZGVyaW5nOgotICAgICAgICAgICAgbV92YWx1ZS5pZGVudCA9IENTU1ZhbHVlQXV0bzsKLSAgICAg ICAgICAgIGJyZWFrOwotICAgICAgICBjYXNlIE9wdGltaXplU3BlZWQ6Ci0gICAgICAgICAgICBt X3ZhbHVlLmlkZW50ID0gQ1NTVmFsdWVPcHRpbWl6ZXNwZWVkOwotICAgICAgICAgICAgYnJlYWs7 Ci0gICAgICAgIGNhc2UgT3B0aW1pemVMZWdpYmlsaXR5OgotICAgICAgICAgICAgbV92YWx1ZS5p ZGVudCA9IENTU1ZhbHVlT3B0aW1pemVsZWdpYmlsaXR5OwotICAgICAgICAgICAgYnJlYWs7Ci0g ICAgICAgIGNhc2UgR2VvbWV0cmljUHJlY2lzaW9uOgotICAgICAgICAgICAgbV92YWx1ZS5pZGVu dCA9IENTU1ZhbHVlR2VvbWV0cmljcHJlY2lzaW9uOwotICAgICAgICAgICAgYnJlYWs7Ci0gICAg fQotfQotCi10ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6b3BlcmF0b3IgVGV4 dFJlbmRlcmluZ01vZGUoKSBjb25zdAotewotICAgIHN3aXRjaCAobV92YWx1ZS5pZGVudCkgewot ICAgICAgICBjYXNlIENTU1ZhbHVlQXV0bzoKLSAgICAgICAgICAgIHJldHVybiBBdXRvVGV4dFJl bmRlcmluZzsKLSAgICAgICAgY2FzZSBDU1NWYWx1ZU9wdGltaXplc3BlZWQ6Ci0gICAgICAgICAg ICByZXR1cm4gT3B0aW1pemVTcGVlZDsKLSAgICAgICAgY2FzZSBDU1NWYWx1ZU9wdGltaXplbGVn aWJpbGl0eToKLSAgICAgICAgICAgIHJldHVybiBPcHRpbWl6ZUxlZ2liaWxpdHk7Ci0gICAgICAg IGNhc2UgQ1NTVmFsdWVHZW9tZXRyaWNwcmVjaXNpb246Ci0gICAgICAgICAgICByZXR1cm4gR2Vv bWV0cmljUHJlY2lzaW9uOwotICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7Ci0gICAgICAgICAgICByZXR1cm4gQXV0b1RleHRSZW5kZXJpbmc7Ci0gICAg fQotfQotCiB0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZl VmFsdWUoRVdyaXRpbmdNb2RlIGUpCiAgICAgOiBtX3R5cGUoQ1NTX0lERU5UKQogewo=