Bug 51394

Summary: [GTK] minimal build with --database fails
Product: WebKit Reporter: Philippe Normand <pnormand>
Component: WebKitGTKAssignee: Nobody <webkit-unassigned>
Status: RESOLVED FIXED    
Severity: Normal CC: eric
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: PC   
OS: OS X 10.5   
Attachments:
Description Flags
proposed patch eric: review+

Description Philippe Normand 2010-12-21 06:57:01 PST 
../../WebKit/gtk/webkit/webkitprivate.cpp: In function ‘void webkit_init()’:
../../WebKit/gtk/webkit/webkitprivate.cpp:137: error: ‘cacheStorage’ is not a member of ‘WebCore’
make[1]: *** [WebKit/gtk/webkit/libwebkitgtk_3_0_la-webkitprivate.lo] Error 1

cacheStorage usage there should be guarded with ENABLE(OFFLINE_WEB_APPLICATIONS) as in ApplicationCacheStorage.cpp where it is implemented.
Comment 1 Philippe Normand 2010-12-21 07:09:59 PST 
Created attachment 77109 [details]
proposed patch
Comment 2 Eric Seidel (no email) 2010-12-23 19:30:37 PST 
Comment on attachment 77109 [details]
proposed patch

OK.
Comment 3 Eric Seidel (no email) 2010-12-23 19:30:59 PST 
Does this need both DATABASE and OFFLINE_WEB_APPLICATIONS?
Comment 4 Philippe Normand 2010-12-24 01:05:22 PST 
(In reply to comment #3)
> Does this need both DATABASE and OFFLINE_WEB_APPLICATIONS?

Right webkit_set_web_database indeed needs DATABASE. Will fix up and commit, thanks for the review Eric!
Comment 5 Philippe Normand 2010-12-24 01:37:24 PST 
I'll guard the webkit_set_web_database_directory_path() call with ENABLE(DATABASE) and the cacheStorage() stuff with ENABLE(OFFLINE_WEB_APPLICATIONS)
Comment 6 Philippe Normand 2010-12-24 01:40:55 PST 
(In reply to comment #5)
> I'll guard the webkit_set_web_database_directory_path() call with ENABLE(DATABASE) and the cacheStorage() stuff with ENABLE(OFFLINE_WEB_APPLICATIONS)

Oh well ENABLE(DATABASE) is already checked in webkit_set_web_database_directory_path() code, so in the end I don't think it's needed in webkitprivate.cpp
Comment 7 Philippe Normand 2010-12-24 02:13:14 PST 
Committed r74620: <http://trac.webkit.org/changeset/74620>