Bug 18468 – Cairo build does not work with CURL

• Status: RESOLVED
• Resolution: FIXED
• Component: Platform

[Daniel Zucker]

Some build fixes are needed to get the Cairo version to build with Curl.  This patch adds some header files to fix build problems, and adds stub functions for some required functions in WebCore::ResourceHandle.

[Daniel Zucker]

Created attachment 20512 [details]
Cairo Curl build fix

This patch has some build fixes required for Cairo Curl

[Adam Roben (:aroben)]

Comment on attachment 20512 [details]
Cairo Curl build fix

+#if PLATFORM(CF)
+#include <CoreFoundation/CoreFoundation.h>
+#include <WebKitSystemInterface/WebKitSystemInterface.h>
+#endif
 
Can you explain why these changes are needed? In particular I don't see a reason to ever include WebKitSystemInterface.h in another header file, since WebKitSystemInterface.h only declares functions, not types. Can we move these #includes to the source files that require them? If they're needed by this header, can we replace them with the appropriate forward declarations?

+++ WebCore/platform/network/curl/ResourceHandleCurl.cpp	(working copy)
@@ -176,4 +176,11 @@ void ResourceHandle::loadResourceSynchro
     response = syncLoader.resourceResponse();
 }
 
+//stubs needed for windows version
+void ResourceHandle::didReceiveAuthenticationChallenge(const AuthenticationChallenge&) {notImplemented();};
+void ResourceHandle::receivedCredential(const AuthenticationChallenge&, const Credential&) {notImplemented();};
+void ResourceHandle::receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&) {notImplemented();};
+void ResourceHandle::receivedCancellation(const AuthenticationChallenge&){notImplemented();};
+
+

Even though these are just stubs I think you should format them correctly. That way it'll be easier to see the changes when someone does implement them.

+++ WebKit/win/WebError.h	(working copy)
@@ -28,6 +28,8 @@
 
 #include "WebKit.h"
 
+#include <wtf/RetainPtr.h>
+

This #include should follow the WebCore #includes, to keep things in lexicographical order.

[Daniel Zucker]

With regard to the first comment, these lines:

+#if PLATFORM(CF)
+#include <CoreFoundation/CoreFoundation.h>
+#include <WebKitSystemInterface/WebKitSystemInterface.h>
+#endif

are required since we need to define CFDataRef for the compile to work.

If you prefer, the only thing I really need to include is "typedef const struct __CFData * CFDataRef;".  I thought it was cleaner to include the entire *.h file, but I can easily change.  I will upload a new patch shortly.

[Daniel Zucker]

Created attachment 20533 [details]
updated patch with changes suggested by aroben

Implemented all changes suggested by Aroben:
--replaced #includes with single required forward declaration
--moved #include <wtf/RetainPtr.h> as requested
--added proper formatting to stub functions

[Adam Roben (:aroben)]

Comment on attachment 20533 [details]
updated patch with changes suggested by aroben

r=me

[Matt Lilek]

Landed in r32442.