23492 2009-01-22 20:18:58 -0800 Separating the WebKitSystemInterface Calls 2009-01-23 17:23:52 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 1 bfulgham webkit-unassigned oldest_to_newest 106684 0 bfulgham 2009-01-22 20:18:58 -0800 The Safari build of WebKit relies on a few font and network-related functions that ship in a standalone library (WebKitSystemInterface). Since this library may not be redistributed, provide alternative implementation for external WebKit users. This patch creates temporary link stubs for these functions. 106687 1 26954 bfulgham 2009-01-22 20:26:54 -0800 Created attachment 26954 Exclude WebKitSystemInterface calls in non-Apple builds 106796 2 26954 darin 2009-01-23 14:00:08 -0800 Comment on attachment 26954 Exclude WebKitSystemInterface calls in non-Apple builds > #include <CoreFoundation/CoreFoundation.h> > +#if PLATFORM(CG) > #include <CoreGraphics/CoreGraphics.h> > +#endif > #include <shlobj.h> > #include <shfolder.h> > #include <tchar.h> > +#if PLATFORM(CG) > #include <WebKitSystemInterface/WebKitSystemInterface.h> > +#endif > #include <wtf/HashMap.h> > #include <wtf/OwnArrayPtr.h> Preferred WebKit style is to put all unconditional includes at the top of the file in one section, then put the conditional includes in a separate block, sorted separately. > +// Link stubs for non-Safari clients > +#if !PLATFORM(CG) > +static void wkSetFontSmoothingLevel(int smoothingLevel) { notImplemented(); } > +static void wkSetFontSmoothingContrast(float contrast) { notImplemented(); } > +#endif Why are these stubs needed? These are CG-specific calls. I think we should instead have #if at the call sites. Since there's only one call to each function, it seems straightforward to do it that way instead. I don't think that non-Core-Graphics versions of this will have calls with this same design, so I don't think we should have link stubs for them. > #include <CoreFoundation/CFString.h> > +#if PLATFORM(CG) > #include <WebKitSystemInterface/WebKitSystemInterface.h> > +#endif > #include <wtf/RetainPtr.h> Same comment here. > > +// Link stubs for non-Safari clients > +#if !PLATFORM(CG) > +#include <WebCore/NotImplemented.h> > +static void wkAddFontsAtPath(CFStringRef) { notImplemented(); } > +#endif Same comment here. I don't think you need a stub for this Core Graphics function call. You just need to put #if PLATFORM(CG) around the part of the WebTextRenderer::registerPrivateFont function that creates a CFStringRef and calls wkAddFontsAtPath. I'm going to say review-, because I'd prefer not to create "stubs" unless there's some real value there. 106803 3 26983 bfulgham 2009-01-23 14:31:55 -0800 Created attachment 26983 Remove calls to WebKitSystemInterface functions Revised to address Darin's comments. 106813 4 26983 darin 2009-01-23 15:58:01 -0800 Comment on attachment 26983 Remove calls to WebKitSystemInterface functions > + https://bugs.webkit.org/show_bug.cgi?id=23492 > + Exclude calls to WebKitSystemInterface functions since they > + are not available outside of the Apple build of WebKit. Since they are not needed if you're not using Core Graphics. The issue here isn't "Apple build of WebKit", it's "not calling CoreGraphics functions when not using CoreGraphics". > +#if PLATFORM(CG) > #include <CoreGraphics/CoreGraphics.h> > +#include <WebKitSystemInterface/WebKitSystemInterface.h> > +#endif > #include <shlobj.h> > #include <shfolder.h> > #include <tchar.h> > -#include <WebKitSystemInterface/WebKitSystemInterface.h> > #include <wtf/HashMap.h> > #include <wtf/OwnArrayPtr.h> The PLATFORM(CG) part should go in its own separate paragraph, after the other includes and separate by a blank line. Sorry I wasn't clear on this before. r=me 106825 5 bfulgham 2009-01-23 17:23:52 -0800 Landed in r40203 26954 2009-01-22 20:26:54 -0800 2009-01-23 14:31:55 -0800 Exclude WebKitSystemInterface calls in non-Apple builds stubs.patch text/plain 2811 bfulgham SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiA0MDE0OSkKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMDEtMjIgIEJyZW50IEZ1bGdoYW0gIDxiZnVs Z2hhbUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDkyCisg ICAgICAgIFByb3ZpZGUgbGluayBzdHVicyBmb3IgV2ViS2l0U3lzdGVtSW50ZXJmYWNlIGltcGxl bWVudGF0aW9ucworICAgICAgICB0aGF0IGFyZSBub3QgYXZhaWxhYmxlIG91dHNpZGUgb2YgdGhl IEFwcGxlIGJ1aWxkIG9mIFdlYktpdC4KKworICAgICAgICAqIFdlYlByZWZlcmVuY2VzLmNwcDog Q3JlYXRlIGxpbmsgc3R1YnMgZm9yIFdlYktpdFN5c3RlbUludGVyZmFjZQorICAgICAgICAod2tT ZXRGb250U21vb3RoaW5nTGV2ZWwpOiBOZXcgc3R1Yi4KKyAgICAgICAgKHdrU2V0Rm9udFNtb290 aGluZ0NvbnRyYXN0KTogTmV3IHN0dWIuCisgICAgICAgICogV2ViVGV4dFJlbmRlcmVyLmNwcDog Q3JlYXRlIGxpbmsgc3R1YnMgZm9yIFdlYktpdFN5c3RlbUludGVyZmFjZS4KKyAgICAgICAgKHdr QWRkRm9udHNBdFBhdGgpOiBOZXcgc3R1Yi4KKwogMjAwOS0wMS0yMiAgRXJpYyBSb21hbiAgPGVy b21hbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCklu ZGV4OiBXZWJLaXQvd2luL1dlYlByZWZlcmVuY2VzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQv d2luL1dlYlByZWZlcmVuY2VzLmNwcAkocmV2aXNpb24gNDAwODEpCisrKyBXZWJLaXQvd2luL1dl YlByZWZlcmVuY2VzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzYsMTcgKzM2LDIyIEBACiAjaW5j bHVkZSA8V2ViQ29yZS9DU3RyaW5nLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9GaWxlU3lzdGVtLmg+ CiAjaW5jbHVkZSA8V2ViQ29yZS9Gb250Lmg+CisjaW5jbHVkZSA8V2ViQ29yZS9Ob3RJbXBsZW1l bnRlZC5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUGxhdGZvcm1TdHJpbmcuaD4KICNpbmNsdWRlIDxX ZWJDb3JlL1N0cmluZ0hhc2guaD4KICNpbmNsdWRlICJXZWJMb2NhbGl6YWJsZVN0cmluZ3MuaCIK ICNwcmFnbWEgd2FybmluZyggcG9wICkKIAogI2luY2x1ZGUgPENvcmVGb3VuZGF0aW9uL0NvcmVG b3VuZGF0aW9uLmg+CisjaWYgUExBVEZPUk0oQ0cpCiAjaW5jbHVkZSA8Q29yZUdyYXBoaWNzL0Nv cmVHcmFwaGljcy5oPgorI2VuZGlmCiAjaW5jbHVkZSA8c2hsb2JqLmg+CiAjaW5jbHVkZSA8c2hm b2xkZXIuaD4KICNpbmNsdWRlIDx0Y2hhci5oPgorI2lmIFBMQVRGT1JNKENHKQogI2luY2x1ZGUg PFdlYktpdFN5c3RlbUludGVyZmFjZS9XZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaD4KKyNlbmRpZgog I2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5jbHVkZSA8d3RmL093bkFycmF5UHRyLmg+CiAK QEAgLTk1LDYgKzEwMCwxMiBAQCBzdGF0aWMgYm9vbCBib29sZWFuVmFsdWVGb3JQcmVmZXJlbmNl c1ZhCiAgICAgcmV0dXJuIG51bWJlclZhbHVlRm9yUHJlZmVyZW5jZXNWYWx1ZTxpbnQ+KHZhbHVl KTsKIH0KIAorLy8gTGluayBzdHVicyBmb3Igbm9uLVNhZmFyaSBjbGllbnRzCisjaWYgIVBMQVRG T1JNKENHKQorc3RhdGljIHZvaWQgd2tTZXRGb250U21vb3RoaW5nTGV2ZWwoaW50IHNtb290aGlu Z0xldmVsKSB7IG5vdEltcGxlbWVudGVkKCk7IH0KK3N0YXRpYyB2b2lkIHdrU2V0Rm9udFNtb290 aGluZ0NvbnRyYXN0KGZsb2F0IGNvbnRyYXN0KSB7IG5vdEltcGxlbWVudGVkKCk7IH0KKyNlbmRp ZgorCiAvLyBXZWJQcmVmZXJlbmNlcyAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKIHN0YXRpYyBDRkRpY3Rpb25hcnlSZWYg ZGVmYXVsdFNldHRpbmdzOwpJbmRleDogV2ViS2l0L3dpbi9XZWJUZXh0UmVuZGVyZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYktpdC93aW4vV2ViVGV4dFJlbmRlcmVyLmNwcAkocmV2aXNpb24gNDAw ODEpCisrKyBXZWJLaXQvd2luL1dlYlRleHRSZW5kZXJlci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTMyLDkgKzMyLDE4IEBACiAjaW5jbHVkZSAiV2ViS2l0RExMLmgiCiAKICNpbmNsdWRlIDxDb3Jl Rm91bmRhdGlvbi9DRlN0cmluZy5oPgorI2lmIFBMQVRGT1JNKENHKQogI2luY2x1ZGUgPFdlYktp dFN5c3RlbUludGVyZmFjZS9XZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaD4KKyNlbmRpZgogI2luY2x1 ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KIAorLy8gTGluayBzdHVicyBmb3Igbm9uLVNhZmFyaSBjbGll bnRzCisjaWYgIVBMQVRGT1JNKENHKQorI2luY2x1ZGUgPFdlYkNvcmUvTm90SW1wbGVtZW50ZWQu aD4KK3N0YXRpYyB2b2lkIHdrQWRkRm9udHNBdFBhdGgoQ0ZTdHJpbmdSZWYpIHsgbm90SW1wbGVt ZW50ZWQoKTsgfQorI2VuZGlmCisKKwogV2ViVGV4dFJlbmRlcmVyKiBXZWJUZXh0UmVuZGVyZXI6 OmNyZWF0ZUluc3RhbmNlKCkKIHsKICAgICBXZWJUZXh0UmVuZGVyZXIqIGluc3RhbmNlID0gbmV3 IFdlYlRleHRSZW5kZXJlcjsK 26983 2009-01-23 14:31:55 -0800 2009-01-23 15:58:01 -0800 Remove calls to WebKitSystemInterface functions remove.patch text/plain 2778 bfulgham SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiA0MDE4NikKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMDEtMjMgIEJyZW50IEZ1bGdoYW0gIDxiZnVs Z2hhbUBnbWFpbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDkyCisg ICAgICAgIEV4Y2x1ZGUgY2FsbHMgdG8gV2ViS2l0U3lzdGVtSW50ZXJmYWNlIGZ1bmN0aW9ucyBz aW5jZSB0aGV5CisgICAgICAgIGFyZSBub3QgYXZhaWxhYmxlIG91dHNpZGUgb2YgdGhlIEFwcGxl IGJ1aWxkIG9mIFdlYktpdC4KKworICAgICAgICAqIFdlYlByZWZlcmVuY2VzLmNwcDoKKyAgICAg ICAgKFdlYlByZWZlcmVuY2VzOjpzZXRGb250U21vb3RoaW5nKTogCisgICAgICAgIChXZWJQcmVm ZXJlbmNlczo6c2V0Rm9udFNtb290aGluZ0NvbnRyYXN0KToKKyAgICAgICAgKiBXZWJUZXh0UmVu ZGVyZXIuY3BwOgorICAgICAgICAoV2ViVGV4dFJlbmRlcmVyOjpyZWdpc3RlclByaXZhdGVGb250 KToKKwogMjAwOS0wMS0yMiAgRXJpYyBSb21hbiAgPGVyb21hbkBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBXZWJLaXQvd2luL1dlYlByZWZl cmVuY2VzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvd2luL1dlYlByZWZlcmVuY2VzLmNwcAko cmV2aXNpb24gNDAxODYpCisrKyBXZWJLaXQvd2luL1dlYlByZWZlcmVuY2VzLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDIsMTEgKzQyLDEzIEBACiAjcHJhZ21hIHdhcm5pbmcoIHBvcCApCiAKICNp bmNsdWRlIDxDb3JlRm91bmRhdGlvbi9Db3JlRm91bmRhdGlvbi5oPgorI2lmIFBMQVRGT1JNKENH KQogI2luY2x1ZGUgPENvcmVHcmFwaGljcy9Db3JlR3JhcGhpY3MuaD4KKyNpbmNsdWRlIDxXZWJL aXRTeXN0ZW1JbnRlcmZhY2UvV2ViS2l0U3lzdGVtSW50ZXJmYWNlLmg+CisjZW5kaWYKICNpbmNs dWRlIDxzaGxvYmouaD4KICNpbmNsdWRlIDxzaGZvbGRlci5oPgogI2luY2x1ZGUgPHRjaGFyLmg+ Ci0jaW5jbHVkZSA8V2ViS2l0U3lzdGVtSW50ZXJmYWNlL1dlYktpdFN5c3RlbUludGVyZmFjZS5o PgogI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5jbHVkZSA8d3RmL093bkFycmF5UHRyLmg+ CiAKQEAgLTk3Nyw3ICs5NzksOSBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYlByZWZl cmVuY2VzCiAgICAgc2V0SW50ZWdlclZhbHVlKENGU1RSKFdlYktpdEZvbnRTbW9vdGhpbmdUeXBl UHJlZmVyZW5jZUtleSksIHNtb290aGluZ1R5cGUpOwogICAgIGlmIChzbW9vdGhpbmdUeXBlID09 IEZvbnRTbW9vdGhpbmdUeXBlV2luZG93cykKICAgICAgICAgc21vb3RoaW5nVHlwZSA9IEZvbnRT bW9vdGhpbmdUeXBlTWVkaXVtOworI2lmIFBMQVRGT1JNKENHKQogICAgIHdrU2V0Rm9udFNtb290 aGluZ0xldmVsKChpbnQpc21vb3RoaW5nVHlwZSk7CisjZW5kaWYKICAgICByZXR1cm4gU19PSzsK IH0KIApAQCAtOTkyLDcgKzk5Niw5IEBAIEhSRVNVTFQgU1RETUVUSE9EQ0FMTFRZUEUgV2ViUHJl ZmVyZW5jZXMKICAgICAvKiBbaW5dICovIGZsb2F0IGNvbnRyYXN0KQogewogICAgIHNldEZsb2F0 VmFsdWUoQ0ZTVFIoV2ViS2l0Rm9udFNtb290aGluZ0NvbnRyYXN0UHJlZmVyZW5jZUtleSksIGNv bnRyYXN0KTsKKyNpZiBQTEFURk9STShDRykKICAgICB3a1NldEZvbnRTbW9vdGhpbmdDb250cmFz dChjb250cmFzdCk7CisjZW5kaWYKICAgICByZXR1cm4gU19PSzsKIH0KIApJbmRleDogV2ViS2l0 L3dpbi9XZWJUZXh0UmVuZGVyZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vV2ViVGV4 dFJlbmRlcmVyLmNwcAkocmV2aXNpb24gNDAxODYpCisrKyBXZWJLaXQvd2luL1dlYlRleHRSZW5k ZXJlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyLDcgKzMyLDkgQEAKICNpbmNsdWRlICJXZWJL aXRETEwuaCIKIAogI2luY2x1ZGUgPENvcmVGb3VuZGF0aW9uL0NGU3RyaW5nLmg+CisjaWYgUExB VEZPUk0oQ0cpCiAjaW5jbHVkZSA8V2ViS2l0U3lzdGVtSW50ZXJmYWNlL1dlYktpdFN5c3RlbUlu dGVyZmFjZS5oPgorI2VuZGlmCiAjaW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgogCiBXZWJUZXh0 UmVuZGVyZXIqIFdlYlRleHRSZW5kZXJlcjo6Y3JlYXRlSW5zdGFuY2UoKQpAQCAtOTAsNiArOTIs OCBAQCBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYlRleHRSZW5kZXJlCiAgICAgICAgIHJl dHVybiBFX0ZBSUw7CiAKICAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IHN0cmluZyhBZG9wdENG LCBDRlN0cmluZ0NyZWF0ZVdpdGhDaGFyYWN0ZXJzKDAsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3Qg VW5pQ2hhcio+KGZvbnRGaWxlUGF0aCksIHN0YXRpY19jYXN0PENGSW5kZXg+KHdjc2xlbihmb250 RmlsZVBhdGgpKSkpOworI2lmIFBMQVRGT1JNKENHKQogICAgIHdrQWRkRm9udHNBdFBhdGgoc3Ry aW5nLmdldCgpKTsKKyNlbmRpZgogICAgIHJldHVybiBTX09LOwogfQoK