24779 2009-03-24 11:22:15 -0700 Conditionalize CFNetwork-Specific Code in WebView 2009-03-24 13:57:24 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 bfulgham webkit-unassigned oldest_to_newest 114971 0 bfulgham 2009-03-24 11:22:15 -0700 WebView.cpp makes calls to various CFNetwork-specific routines that are not present in Windows builds based on other network backends. As a first step, add #if/def blocks around the two blocks of code that make CFNetwork calls. Later, cURL or Google network API calls can be added here. 114979 1 28893 bfulgham 2009-03-24 11:32:28 -0700 Created attachment 28893 Exclude CFNetwork-specific calls in non-Apple builds. 114980 2 28893 aroben 2009-03-24 11:35:50 -0700 Comment on attachment 28893 Exclude CFNetwork-specific calls in non-Apple builds. > +++ WebKit/win/WebView.cpp (working copy) > @@ -50,7 +50,9 @@ > #include "WebNotificationCenter.h" > #include "WebPreferences.h" > #pragma warning( push, 0 ) > +#if PLATFORM(CG) > #include <CoreGraphics/CGContext.h> > +#endif It would be better to move the conditionally-included headers down below the unconditionally-included headers. Each #if/#endif pair can form its own paragraph. > +#include <CoreFoundation/CoreFoundation.h> Should this be inside #if PLATFORM(CF)/#endif? r=me 114982 3 bfulgham 2009-03-24 11:40:52 -0700 (In reply to comment #2) > (From update of attachment 28893 [review]) > > +++ WebKit/win/WebView.cpp (working copy) > > @@ -50,7 +50,9 @@ > > #include "WebNotificationCenter.h" > > #include "WebPreferences.h" > > #pragma warning( push, 0 ) > > +#if PLATFORM(CG) > > #include <CoreGraphics/CGContext.h> > > +#endif > > It would be better to move the conditionally-included headers down below the > unconditionally-included headers. Each #if/#endif pair can form its own > paragraph. Will do. > > +#include <CoreFoundation/CoreFoundation.h> > > Should this be inside #if PLATFORM(CF)/#endif? Currently, all Windows builds use CoreFoundation, so if this was not included I'm not sure if anything would build. But it certainly won't hurt to add the check, and might help some future porter so I'll change it when I commit. > r=me > 115038 4 bfulgham 2009-03-24 13:57:24 -0700 Committed in @r41949. 28893 2009-03-24 11:32:28 -0700 2009-03-24 11:35:50 -0700 Exclude CFNetwork-specific calls in non-Apple builds. cfnetwork.patch text/plain 2493 bfulgham SW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vQ2hh bmdlTG9nCShyZXZpc2lvbiA0MTk0MykKKysrIFdlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMDMtMjQgIEJyZW50IEZ1bGdoYW0gIDxiZnVs Z2hhbUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNDc3OQor ICAgICAgICBDb25kaXRpb25hbGl6ZSBDRk5ldHdvcmstc3BlY2lmaWMgY29kZSBpbiBXZWJWaWV3 IHRvIHBlcm1pdAorICAgICAgICBzdXBwb3J0IGZvciBvdGhlciBuZXR3b3JrIGJhY2tlbmRzLgor CisgICAgICAgICogV2ViVmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3OjpzZXRDYWNoZU1vZGVs KTogQWRkIENGTkVUV09SSyBjaGVjayBhcm91bmQgQ0ZOZXR3b3JrCisgICAgICAgIHNwZWNpZmlj IGNhY2hlIGltcGxlbWVudGF0aW9uLgorICAgICAgICAodXBkYXRlU2hhcmVkU2V0dGluZ3NGcm9t UHJlZmVyZW5jZXNJZk5lZWRlZCk6IEFkZCBDRk5FVFdPUksKKyAgICAgICAgY2hlY2sgYXJvdW5k IHVzZSBvZiBDRkhUVFBDb29raWUgY29kZS4KKwogMjAwOS0wMy0yMyAgU2FtIFdlaW5pZyAgPHNh bUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCkluZGV4 OiBXZWJLaXQvd2luL1dlYlZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC93aW4vV2ViVmll dy5jcHAJKHJldmlzaW9uIDQxOTQzKQorKysgV2ViS2l0L3dpbi9XZWJWaWV3LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNTAsNyArNTAsOSBAQAogI2luY2x1ZGUgIldlYk5vdGlmaWNhdGlvbkNlbnRl ci5oIgogI2luY2x1ZGUgIldlYlByZWZlcmVuY2VzLmgiCiAjcHJhZ21hIHdhcm5pbmcoIHB1c2gs IDAgKQorI2lmIFBMQVRGT1JNKENHKQogI2luY2x1ZGUgPENvcmVHcmFwaGljcy9DR0NvbnRleHQu aD4KKyNlbmRpZgogI2luY2x1ZGUgPFdlYkNvcmUvQXBwbGljYXRpb25DYWNoZVN0b3JhZ2UuaD4K ICNpbmNsdWRlIDxXZWJDb3JlL0FYT2JqZWN0Q2FjaGUuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0JT dHJpbmcuaD4KQEAgLTEwNSwxMCArMTA3LDE1IEBACiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUv SW5pdGlhbGl6ZVRocmVhZGluZy5oPgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0pTTG9jay5o PgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0pTVmFsdWUuaD4KKworI2lmIFVTRShDRk5FVFdP UkspCiAjaW5jbHVkZSA8Q0ZOZXR3b3JrL0NGVVJMQ2FjaGVQcml2Lmg+CiAjaW5jbHVkZSA8Q0ZO ZXR3b3JrL0NGVVJMUHJvdG9jb2xQcml2Lmg+Ci0jaW5jbHVkZSA8Q29yZUZvdW5kYXRpb24vQ29y ZUZvdW5kYXRpb24uaD4KICNpbmNsdWRlIDxXZWJLaXRTeXN0ZW1JbnRlcmZhY2UvV2ViS2l0U3lz dGVtSW50ZXJmYWNlLmg+IAorI2VuZGlmCisKKyNpbmNsdWRlIDxDb3JlRm91bmRhdGlvbi9Db3Jl Rm91bmRhdGlvbi5oPgorCiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KICNpbmNsdWRlIDxkaW1t Lmg+CiAjaW5jbHVkZSA8b2xlYWNjLmg+CkBAIC0zNjYsNiArMzczLDcgQEAgdm9pZCBXZWJWaWV3 OjpyZW1vdmVGcm9tQWxsV2ViVmlld3NTZXQoKQogCiB2b2lkIFdlYlZpZXc6OnNldENhY2hlTW9k ZWwoV2ViQ2FjaGVNb2RlbCBjYWNoZU1vZGVsKQogeworI2lmIFVTRShDRk5FVFdPUkspCiAgICAg aWYgKHNfZGlkU2V0Q2FjaGVNb2RlbCAmJiBjYWNoZU1vZGVsID09IHNfY2FjaGVNb2RlbCkKICAg ICAgICAgcmV0dXJuOwogCkBAIC01NDEsNiArNTQ5LDcgQEAgdm9pZCBXZWJWaWV3OjpzZXRDYWNo ZU1vZGVsKFdlYkNhY2hlTW9kZQogICAgIHNfZGlkU2V0Q2FjaGVNb2RlbCA9IHRydWU7CiAgICAg c19jYWNoZU1vZGVsID0gY2FjaGVNb2RlbDsKICAgICByZXR1cm47CisjZW5kaWYKIH0KIAogV2Vi Q2FjaGVNb2RlbCBXZWJWaWV3OjpjYWNoZU1vZGVsKCkKQEAgLTQyMjcsOSArNDIzNiwxMSBAQCBI UkVTVUxUIHVwZGF0ZVNoYXJlZFNldHRpbmdzRnJvbVByZWZlcmVuCiAgICAgaWYgKEZBSUxFRCho cikpCiAgICAgICAgIHJldHVybiBocjsKIAorI2lmIFVTRShDRk5FVFdPUkspCiAgICAgLy8gU2V0 IGNvb2tpZSBzdG9yYWdlIGFjY2VwdCBwb2xpY3kKICAgICBpZiAoQ0ZIVFRQQ29va2llU3RvcmFn ZVJlZiBjb29raWVTdG9yYWdlID0gY3VycmVudENvb2tpZVN0b3JhZ2UoKSkKICAgICAgICAgQ0ZI VFRQQ29va2llU3RvcmFnZVNldENvb2tpZUFjY2VwdFBvbGljeShjb29raWVTdG9yYWdlLCBhY2Nl cHRQb2xpY3kpOworI2VuZGlmCiAKICAgICByZXR1cm4gU19PSzsKIH0K