[GTK][WK2] Fix build after r160104

• Component: WebKitGTK
• Status: RESOLVED FIXED

[Nick Diego Yamane (diegoyam)]

../../Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp: In function 'WebKitCookieManager* webkitCookieManagerCreate(WebKit::WebCookieManagerProxy*)':
../../Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp:108:77: error: cannot convert 'WKCookieManagerClient*' to 'const WKCookieManagerClientBase*' for argument '2' to 'void WKCookieManagerSetClient(WKCookieManagerRef, const WKCookieManagerClientBase*)'
     WKCookieManagerSetClient(toAPI(webCookieManager), &wkCookieManagerClient);
                                                                             ^
make[1]: *** [Source/WebKit2/UIProcess/API/gtk/libwebkit2gtk_3_0_la-WebKitCookieManager.lo] Error 1
make[1]: *** Waiting for unfinished jobs....
../../Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp: In function 'WebKitFaviconDatabase* webkitFaviconDatabaseCreate(WebKit::WebIconDatabase*)':
../../Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp:224:83: error: cannot convert 'WKIconDatabaseClient*' to 'const WKIconDatabaseClientBase*' for argument '2' to 'void WKIconDatabaseSetIconDatabaseClient(WKIconDatabaseRef, const WKIconDatabaseClientBase*)'
     WKIconDatabaseSetIconDatabaseClient(toAPI(iconDatabase), &wkIconDatabaseClient);
                                                                                   ^
make[1]: *** [Source/WebKit2/UIProcess/API/gtk/libwebkit2gtk_3_0_la-WebKitFaviconDatabase.lo] ErroFailed to run "['Tools/Scripts/build-webkit', '--release', '--gtk', '--update-gtk', '--no-webkit1', '--makeargs="-j8"']" exit_code: 2

Last 500 characters of output:
eContextMenuClientBase*' for argument '2' to 'void WKPageSetPageContextMenuClient(WKPageRef, const WKPageContextMenuClientBase*)'
     WKPageSetPageContextMenuClient(wkPage, &wkContextMenuClient);
                                                                ^
make[1]: *** [Source/WebKit2/UIProcess/API/gtk/libwebkit2gtk_3_0_la-WebKitContextMenuClient.lo] Error 1
make[1]: Leaving directory `/home/rego/ews/WebKit/WebKitBuild/Release'
make: *** [all] Error 2

Failed to build WebKit using 'make'!

Failed to run "['Tools/Scripts/build-webkit', '--release', '--gtk', '--update-gtk', '--no-webkit1', '--makeargs="-j8"']" exit_code: 2
r 1
../../Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp: In function 'void attachDownloadClientToContext(WebKitWebContext*)':
../../Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp:113:96: error: cannot convert 'WKContextDownloadClient*' to 'const WKContextDownloadClientBase*' for argument '2' to 'void WKContextSetDownloadClient(WKContextRef, const WKContextDownloadClientBase*)'
     WKContextSetDownloadClient(toAPI(webkitWebContextGetContext(webContext)), &wkDownloadClient);
                                                                                                ^
make[1]: *** [Source/WebKit2/UIProcess/API/gtk/libwebkit2gtk_3_0_la-WebKitDownloadClient.lo] Error 1
../../Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuClient.cpp: In function 'void attachContextMenuClientToView(WebKitWebView*)':
../../Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuClient.cpp:47:64: error: cannot convert 'WKPageContextMenuClient*' to 'const WKPageContextMenuClientBase*' for argument '2' to 'void WKPageSetPageContextMenuClient(WKPageRef, const WKPageContextMenuClientBase*)'
     WKPageSetPageContextMenuClient(wkPage, &wkContextMenuClient);
                                                                ^
make[1]: *** [Source/WebKit2/UIProcess/API/gtk/libwebkit2gtk_3_0_la-WebKitContextMenuClient.lo] Error 1
make[1]: Leaving directory `/home/rego/ews/WebKit/WebKitBuild/Release'
make: *** [all] Error 2

Failed to build WebKit using 'make'!

[Nick Diego Yamane (diegoyam)]

Created attachment 218434 [details]
Patch

[WebKit Commit Bot]

Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API

[Nick Diego Yamane (diegoyam)]

Created attachment 218442 [details]
Rebased patch

[WebKit Commit Bot]

Comment on attachment 218442 [details]
Rebased patch

Clearing flags on attachment: 218442

Committed r160125: <http://trac.webkit.org/changeset/160125>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.