17299 2008-02-10 15:36:04 -0800 Patch providing fully-buildable Cairo-backed Win32 WebCore 2008-02-18 21:18:15 -0800 1 1 1 Unclassified WebKit WebCore Misc. 523.x (Safari 3) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 bfulgham webkit-unassigned aroben webkit oldest_to_newest 70153 0 bfulgham 2008-02-10 15:36:04 -0800 The attached patch updates a few spots in WebCore that are needed to build a Cairo-based Win32 WebCore. Additional patches are being provided for the WebKit portion of the changes. To be completely usable, this patch requires an updated WebCore.vcproj to build the Cairo-specific parts of WebCore. A separate bug is being created to complete this work, as some thought will need to be given to the means of supporting Cairo and CG in a single solution file. 70154 1 19051 bfulgham 2008-02-10 15:36:44 -0800 Created attachment 19051 Patch for Cairo support in WebCore. 70156 2 bfulgham 2008-02-10 15:44:21 -0800 Note that this bug is related to Bug #17300 (though it does not depend on its soution). 70169 3 19051 darin 2008-02-10 17:59:22 -0800 Comment on attachment 19051 Patch for Cairo support in WebCore. Patch looks good. Some small issues: #include "config.h" +#include "PlatformString.h" +#include "CSSValueKeywords.h" #include "RenderThemeWin.h" New includes should go in a separate group. See the <http://webkit.org/coding/coding-style.html> section called "#include statements". + cachedDesc->firstFamily().setFamily("Lucida Grande"); Are you sure that's the right choice? I don't think that font is included by default on Windows. 70260 4 webkit 2008-02-11 09:20:23 -0800 (In reply to comment #3) > + cachedDesc->firstFamily().setFamily("Lucida Grande"); > > Are you sure that's the right choice? I don't think that font is included by > default on Windows. > On Windows there is a similar font called Lucida Sans Unicode -> http://en.wikipedia.org/wiki/Lucida_Sans_Unicode 70266 5 19051 darin 2008-02-11 09:32:06 -0800 Comment on attachment 19051 Patch for Cairo support in WebCore. I'll just take this and tweak it and land it. 70267 6 bfulgham 2008-02-11 09:37:42 -0800 (In reply to comment #5) > (From update of attachment 19051 [edit]) > I'll just take this and tweak it and land it. > Oh, thanks! I was going to research the proper font to use; currently it doesn't really matter because the font rendering is getting hung up somewhere else. I'm trying to debug it today as time allows. 70268 7 19051 darin 2008-02-11 09:40:37 -0800 Comment on attachment 19051 Patch for Cairo support in WebCore. Committed revision 30143. 19051 2008-02-10 15:36:44 -0800 2008-02-11 09:40:37 -0800 Patch for Cairo support in WebCore. cairowin32.patch text/plain 6438 bfulgham SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDMwMTMw KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDgtMDIt MTAgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV0FSTklORzogTk8gVEVTVCBDQVNFUyBB RERFRCBPUiBDSEFOR0VECisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9JbWFn ZVNvdXJjZUNhaXJvLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZURlY29kZXIpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpw cmVwYXJlRm9yRHJhd2luZyk6CisgICAgICAgIChXZWJDb3JlOjpkb25lRHJhd2luZyk6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZVdpbjo6cGFpbnRCdXR0b24pOgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyVGhlbWVXaW46OnBhaW50VGV4dEZpZWxkKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclRoZW1lV2luOjpwYWludE1lbnVMaXN0QnV0dG9uKToKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlclRoZW1lV2luOjpzeXN0ZW1Gb250KToKKwogMjAwOC0wMi0xMCAgRGF2aWQgSHlhdHQg IDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGZvciBidWcgMTcwODIsIGNzc1J1bGVz IHNob3VsZCBiZSBsaXZlLgpJbmRleDogcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VTb3Vy Y2VDYWlyby5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VT b3VyY2VDYWlyby5jcHAJKHJldmlzaW9uIDMwMDk2KQorKysgcGxhdGZvcm0vZ3JhcGhpY3MvY2Fp cm8vSW1hZ2VTb3VyY2VDYWlyby5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM1LDcgKzM1LDkgQEAK ICNpbmNsdWRlICJQTkdJbWFnZURlY29kZXIuaCIKICNpbmNsdWRlICJCTVBJbWFnZURlY29kZXIu aCIKICNpbmNsdWRlICJJQ09JbWFnZURlY29kZXIuaCIKKyNpZiAhUExBVEZPUk0oV0lOKQogI2lu Y2x1ZGUgIlhCTUltYWdlRGVjb2Rlci5oIgorI2VuZGlmCiAKICNpbmNsdWRlIDxjYWlyby5oPgog CkBAIC03OCw5ICs4MCwxMSBAQCBJbWFnZURlY29kZXIqIGNyZWF0ZURlY29kZXIoY29uc3QgVmVj dG9yCiAgICAgICAgICFtZW1jbXAoY29udGVudHMsICJcMDAwXDAwMFwwMDJcMDAwIiwgNCkpCiAg ICAgICAgIHJldHVybiBuZXcgSUNPSW1hZ2VEZWNvZGVyKCk7CiAKKyNpZiAhUExBVEZPUk0oV0lO KQogICAgIC8vIFhCTXMgcmVxdWlyZSA4IGJ5dGVzIG9mIGluZm8uCiAgICAgaWYgKGxlbmd0aCA+ PSA4ICYmIHN0cm5jbXAoY29udGVudHMsICIjZGVmaW5lICIsIDgpID09IDApCiAgICAgICAgIHJl dHVybiBuZXcgWEJNSW1hZ2VEZWNvZGVyKCk7CisjZW5kaWYKIAogICAgIC8vIEdpdmUgdXAuIFdl IGRvbid0IGtub3cgd2hhdCB0aGUgaGVjayB0aGlzIGlzLgogICAgIHJldHVybiAwOwpJbmRleDog cmVuZGVyaW5nL1JlbmRlclRoZW1lV2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSByZW5kZXJpbmcvUmVu ZGVyVGhlbWVXaW4uY3BwCShyZXZpc2lvbiAzMDExOCkKKysrIHJlbmRlcmluZy9SZW5kZXJUaGVt ZVdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxLDYgKzIxLDggQEAKICAqLwogCiAjaW5jbHVk ZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUGxhdGZvcm1TdHJpbmcuaCIKKyNpbmNsdWRlICJDU1NW YWx1ZUtleXdvcmRzLmgiCiAjaW5jbHVkZSAiUmVuZGVyVGhlbWVXaW4uaCIKIAogI2luY2x1ZGUg PGNhaXJvLXdpbjMyLmg+CkBAIC0yMzAsMTQgKzIzMiwxNCBAQCBUaGVtZURhdGEgUmVuZGVyVGhl bWVXaW46OmdldFRoZW1lRGF0YShSCiB9CiAKIC8vIE1heSBuZWVkIHRvIGFkZCBzdHVmZiB0byB0 aGVzZSBsYXRlciwgc28ga2VlcCB0aGUgZ3JhcGhpY3MgY29udGV4dCByZXRyaWV2YWwvcmVsZWFz ZSBpbiBzb21lIGhlbHBlcnMuCi1zdGF0aWMgSERDIHByZXBhcmVGb3JEcmF3aW5nKEdyYXBoaWNz Q29udGV4dCogZykKK3N0YXRpYyBIREMgcHJlcGFyZUZvckRyYXdpbmcoR3JhcGhpY3NDb250ZXh0 KiBnLCBjb25zdCBJbnRSZWN0JiByKQogewotICAgIHJldHVybiBnLT5nZXRXaW5kb3dzQ29udGV4 dCgpOworICAgIHJldHVybiBnLT5nZXRXaW5kb3dzQ29udGV4dChyKTsKIH0KICAKLXN0YXRpYyB2 b2lkIGRvbmVEcmF3aW5nKEdyYXBoaWNzQ29udGV4dCogZywgSERDIGhkYykKK3N0YXRpYyB2b2lk IGRvbmVEcmF3aW5nKEdyYXBoaWNzQ29udGV4dCogZywgSERDIGhkYywgY29uc3QgSW50UmVjdCYg cikKIHsKLSAgICBnLT5yZWxlYXNlV2luZG93c0NvbnRleHQoaGRjKTsKKyAgICBnLT5yZWxlYXNl V2luZG93c0NvbnRleHQoaGRjLCByKTsKIH0KIAogYm9vbCBSZW5kZXJUaGVtZVdpbjo6cGFpbnRC dXR0b24oUmVuZGVyT2JqZWN0KiBvLCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW50SW5mbyYgaSwg Y29uc3QgSW50UmVjdCYgcikKQEAgLTI0Niw3ICsyNDgsNyBAQCBib29sIFJlbmRlclRoZW1lV2lu OjpwYWludEJ1dHRvbihSZW5kZXJPCiAgICAgVGhlbWVEYXRhIHRoZW1lRGF0YSA9IGdldFRoZW1l RGF0YShvKTsKIAogICAgIC8vIE5vdyBwYWludCB0aGUgYnV0dG9uLgotICAgIEhEQyBoZGMgPSBw cmVwYXJlRm9yRHJhd2luZyhpLmNvbnRleHQpOyAgCisgICAgSERDIGhkYyA9IHByZXBhcmVGb3JE cmF3aW5nKGkuY29udGV4dCwgcik7ICAKICAgICBSRUNUIHdpZGdldFJlY3QgPSByOwogICAgIGlm IChtX3RoZW1lRExMICYmICFtX2J1dHRvblRoZW1lKQogICAgICAgICBtX2J1dHRvblRoZW1lID0g b3BlblRoZW1lKDAsIEwiQnV0dG9uIik7CkBAIC0yNjYsNyArMjY4LDcgQEAgYm9vbCBSZW5kZXJU aGVtZVdpbjo6cGFpbnRCdXR0b24oUmVuZGVyTwogICAgICAgICAgICAgRHJhd0ZvY3VzUmVjdCho ZGMsICZ3aWRnZXRSZWN0KTsKICAgICAgICAgfQogICAgIH0KLSAgICBkb25lRHJhd2luZyhpLmNv bnRleHQsIGhkYyk7CisgICAgZG9uZURyYXdpbmcoaS5jb250ZXh0LCBoZGMsIHIpOwogCiAgICAg cmV0dXJuIGZhbHNlOwogfQpAQCAtMjkzLDcgKzI5NSw3IEBAIGJvb2wgUmVuZGVyVGhlbWVXaW46 OnBhaW50VGV4dEZpZWxkKFJlbmQKICAgICBUaGVtZURhdGEgdGhlbWVEYXRhID0gZ2V0VGhlbWVE YXRhKG8pOwogCiAgICAgLy8gTm93IHBhaW50IHRoZSB0ZXh0IGZpZWxkLgotICAgIEhEQyBoZGMg PSBwcmVwYXJlRm9yRHJhd2luZyhpLmNvbnRleHQpOworICAgIEhEQyBoZGMgPSBwcmVwYXJlRm9y RHJhd2luZyhpLmNvbnRleHQsIHIpOwogICAgIFJFQ1Qgd2lkZ2V0UmVjdCA9IHI7CiAgICAgaWYg KG1fdGhlbWVETEwgJiYgIW1fdGV4dEZpZWxkVGhlbWUpCiAgICAgICAgIG1fdGV4dEZpZWxkVGhl bWUgPSBvcGVuVGhlbWUoMCwgTCJFZGl0Iik7CkBAIC0zMDMsNyArMzA1LDcgQEAgYm9vbCBSZW5k ZXJUaGVtZVdpbjo6cGFpbnRUZXh0RmllbGQoUmVuZAogICAgICAgICBEcmF3RWRnZShoZGMsICZ3 aWRnZXRSZWN0LCBFREdFX1NVTktFTiwgQkZfUkVDVCB8IEJGX0FESlVTVCk7CiAgICAgICAgIEZp bGxSZWN0KGhkYywgJndpZGdldFJlY3QsIHJlaW50ZXJwcmV0X2Nhc3Q8SEJSVVNIPigoKHRoZW1l RGF0YS5tX2NsYXNzaWNTdGF0ZSAmIERGQ1NfSU5BQ1RJVkUpID8gQ09MT1JfQlRORkFDRSA6IENP TE9SX1dJTkRPVykgKyAxKSk7CiAgICAgfQotICAgIGRvbmVEcmF3aW5nKGkuY29udGV4dCwgaGRj KTsKKyAgICBkb25lRHJhd2luZyhpLmNvbnRleHQsIGhkYywgcik7CiAKICAgICByZXR1cm4gZmFs c2U7CiB9CkBAIC0zNDEsNyArMzQzLDcgQEAgYm9vbCBSZW5kZXJUaGVtZVdpbjo6cGFpbnRNZW51 TGlzdChSZW5kZQogCiBib29sIFJlbmRlclRoZW1lV2luOjpwYWludE1lbnVMaXN0QnV0dG9uKFJl bmRlck9iamVjdCogbywgY29uc3QgUmVuZGVyT2JqZWN0OjpQYWludEluZm8mIGksIGNvbnN0IElu dFJlY3QmIHIpCiB7Ci0gICAgSERDIGhkYyA9IHByZXBhcmVGb3JEcmF3aW5nKGkuY29udGV4dCk7 CisgICAgSERDIGhkYyA9IHByZXBhcmVGb3JEcmF3aW5nKGkuY29udGV4dCwgcik7CiAgICAgUkVD VCB3aWRnZXRSZWN0ID0gcjsKICAgICBpZiAobV90aGVtZURMTCAmJiAhbV9tZW51TGlzdFRoZW1l KQogICAgICAgICBtX21lbnVMaXN0VGhlbWUgPSBvcGVuVGhlbWUoMCwgTCJDb21ib2JveCIpOwpA QCAtMzQ5LDkgKzM1MSw1OSBAQCBib29sIFJlbmRlclRoZW1lV2luOjpwYWludE1lbnVMaXN0QnV0 dG9uCiAgICAgICAgIGRyYXdUaGVtZUJHKG1fbWVudUxpc3RUaGVtZSwgaGRjLCBDUF9EUk9QRE9X TkJVVFRPTiwgZGV0ZXJtaW5lU3RhdGUobyksICZ3aWRnZXRSZWN0LCBOVUxMKTsKICAgICBlbHNl CiAgICAgICAgIERyYXdGcmFtZUNvbnRyb2woaGRjLCAmd2lkZ2V0UmVjdCwgREZDX1NDUk9MTCwg REZDU19TQ1JPTExDT01CT0JPWCB8IGRldGVybWluZUNsYXNzaWNTdGF0ZShvKSk7Ci0gICAgZG9u ZURyYXdpbmcoaS5jb250ZXh0LCBoZGMpOworICAgIGRvbmVEcmF3aW5nKGkuY29udGV4dCwgaGRj LCByKTsKIAogICAgIHJldHVybiBmYWxzZTsKIH0KIAordm9pZCBSZW5kZXJUaGVtZVdpbjo6c3lz dGVtRm9udChpbnQgcHJvcElkLCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcmlwdGlvbikgY29u c3QKK3sKKyAgICBzdGF0aWMgRm9udERlc2NyaXB0aW9uIHN5c3RlbUZvbnQ7CisgICAgc3RhdGlj IEZvbnREZXNjcmlwdGlvbiBzbWFsbFN5c3RlbUZvbnQ7CisgICAgc3RhdGljIEZvbnREZXNjcmlw dGlvbiBtZW51Rm9udDsKKyAgICBzdGF0aWMgRm9udERlc2NyaXB0aW9uIGxhYmVsRm9udDsKKyAg ICBzdGF0aWMgRm9udERlc2NyaXB0aW9uIG1pbmlDb250cm9sRm9udDsKKyAgICBzdGF0aWMgRm9u dERlc2NyaXB0aW9uIHNtYWxsQ29udHJvbEZvbnQ7CisgICAgc3RhdGljIEZvbnREZXNjcmlwdGlv biBjb250cm9sRm9udDsKKworICAgIEZvbnREZXNjcmlwdGlvbiogY2FjaGVkRGVzYzsKKyAgICBm bG9hdCBmb250U2l6ZSA9IDA7CisgICAgc3dpdGNoIChwcm9wSWQpIHsKKyAgICAgICAgY2FzZSBD U1NfVkFMX1NNQUxMX0NBUFRJT046CisgICAgICAgICAgICBjYWNoZWREZXNjID0gJnNtYWxsU3lz dGVtRm9udDsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNlIENTU19WQUxfTUVOVToK KyAgICAgICAgICAgIGNhY2hlZERlc2MgPSAmbWVudUZvbnQ7CisgICAgICAgICAgICBicmVhazsK KyAgICAgICAgY2FzZSBDU1NfVkFMX1NUQVRVU19CQVI6CisgICAgICAgICAgICBjYWNoZWREZXNj ID0gJmxhYmVsRm9udDsKKyAgICAgICAgICAgIGlmICghbGFiZWxGb250LmlzQWJzb2x1dGVTaXpl KCkpCisgICAgICAgICAgICAgICAgZm9udFNpemUgPSAxMC4wZjsKKyAgICAgICAgICAgIGJyZWFr OworICAgICAgICBjYXNlIENTU19WQUxfX1dFQktJVF9NSU5JX0NPTlRST0w6CisgICAgICAgICAg ICBjYWNoZWREZXNjID0gJm1pbmlDb250cm9sRm9udDsKKyAgICAgICAgICAgIGJyZWFrOworICAg ICAgICBjYXNlIENTU19WQUxfX1dFQktJVF9TTUFMTF9DT05UUk9MOgorICAgICAgICAgICAgY2Fj aGVkRGVzYyA9ICZzbWFsbENvbnRyb2xGb250OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAg IGNhc2UgQ1NTX1ZBTF9fV0VCS0lUX0NPTlRST0w6CisgICAgICAgICAgICBjYWNoZWREZXNjID0g JmNvbnRyb2xGb250OworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGRlZmF1bHQ6CisgICAg ICAgICAgICBjYWNoZWREZXNjID0gJnN5c3RlbUZvbnQ7CisgICAgICAgICAgICBpZiAoIXN5c3Rl bUZvbnQuaXNBYnNvbHV0ZVNpemUoKSkKKyAgICAgICAgICAgICAgICBmb250U2l6ZSA9IDEzLjBm OworICAgIH0KKworICAgIGlmIChmb250U2l6ZSkgeworICAgICAgICBjYWNoZWREZXNjLT5zZXRJ c0Fic29sdXRlU2l6ZSh0cnVlKTsKKyAgICAgICAgY2FjaGVkRGVzYy0+c2V0R2VuZXJpY0ZhbWls eShGb250RGVzY3JpcHRpb246Ok5vRmFtaWx5KTsKKyAgICAgICAgY2FjaGVkRGVzYy0+Zmlyc3RG YW1pbHkoKS5zZXRGYW1pbHkoIkx1Y2lkYSBHcmFuZGUiKTsKKyAgICAgICAgY2FjaGVkRGVzYy0+ c2V0U3BlY2lmaWVkU2l6ZShmb250U2l6ZSk7CisgICAgICAgIGNhY2hlZERlc2MtPnNldEJvbGQo ZmFsc2UpOworICAgICAgICBjYWNoZWREZXNjLT5zZXRJdGFsaWMoZmFsc2UpOworICAgIH0KKyAg ICBmb250RGVzY3JpcHRpb24gPSAqY2FjaGVkRGVzYzsKIH0KKworfSAvLyBuYW1lc3BhY2UK