Bug 96768 – [GTK] Don't use the C API internally in WebKitWebContext

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

[Carlos Garcia Campos]

Use the C++ classes instead.

[Carlos Garcia Campos]

Created attachment 164128 [details]
Patch

[Carlos Garcia Campos]

Created attachment 166480 [details]
Updated patch to apply on current git master

Some new patches broke this one.

[WebKit Review 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

[WebKit Review Bot]

Attachment 166480 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1
Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:23:  Alphabetical sorting problem.  [build/include_order] [4]
Total errors found: 1 in 7 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Mario Sanchez Prada]

Comment on attachment 166480 [details]
Updated patch to apply on current git master

View in context: https://bugs.webkit.org/attachment.cgi?id=166480&action=review

This patch looks good to me, in the context of the meta bug 9766.

>> Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:23
>> +#include "WebResourceCacheManagerProxy.h"
> 
> Alphabetical sorting problem.  [build/include_order] [4]

This doesn't look like a false positive.

> Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:167
> +    priv->geolocationProvider = WebKitGeolocationProvider::create(toAPI(priv->context->geolocationManagerProxy()));

I was about to comment on this, but I see you addressed the geolocation specific changes in bug 96778.

[Carlos Garcia Campos]

(In reply to comment #5)
> (From update of attachment 166480 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=166480&action=review
> 
> This patch looks good to me, in the context of the meta bug 9766.
> 
> >> Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:23
> >> +#include "WebResourceCacheManagerProxy.h"
> > 
> > Alphabetical sorting problem.  [build/include_order] [4]
> 
> This doesn't look like a false positive.

Yes, I will fix this before landing.

> > Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp:167
> > +    priv->geolocationProvider = WebKitGeolocationProvider::create(toAPI(priv->context->geolocationManagerProxy()));
> 
> I was about to comment on this, but I see you addressed the geolocation specific changes in bug 96778.

Yes, this bug is only about WebKitWebContext

[Martin Robinson]

Comment on attachment 166480 [details]
Updated patch to apply on current git master

View in context: https://bugs.webkit.org/attachment.cgi?id=166480&action=review

Looks good, but seems to violate one of the rules of the style guide. I don't see this as a huge issue, but it would be nice to follow the rule if it isn't too hard.

> Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h:36
> +using namespace WebKit;

The style guide doesn't seem to like namespace declarations in the global scope in headers, since it leaks into implementation files: http://www.webkit.org/coding/coding-style.html (number 1 for "using" Statements).

There are a couple things you can do to make your life easier here though:

1. Put the private methods in the WebKit namespace.
2. Use WebKit:: in the header and put using WebKit at the top of the files that include this file.

[Carlos Garcia Campos]

(In reply to comment #7)
> (From update of attachment 166480 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=166480&action=review
> 
> Looks good, but seems to violate one of the rules of the style guide. I don't see this as a huge issue, but it would be nice to follow the rule if it isn't too hard.
> 
> > Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h:36
> > +using namespace WebKit;
> 
> The style guide doesn't seem to like namespace declarations in the global scope in headers, since it leaks into implementation files: http://www.webkit.org/coding/coding-style.html (number 1 for "using" Statements).

I think this is a special case because it's not a C++ header, but a private header to add prototypes of some internal functions. 

> There are a couple things you can do to make your life easier here though:
> 
> 1. Put the private methods in the WebKit namespace.
> 2. Use WebKit:: in the header and put using WebKit at the top of the files that include this file.

Since we are already doing it, and all C API migration patches do it too, do you mind if I fix it all together afterwards?

[Martin Robinson]

(In reply to comment #8)

> Since we are already doing it, and all C API migration patches do it too, do you mind if I fix it all together afterwards?

Okay. I think it's probably okay in this case, especially since the style bot didn't complain. We should probably fix it later though.

[Martin Robinson]

Comment on attachment 166480 [details]
Updated patch to apply on current git master

Please fix the remaining style error before landing. :)

[Carlos Garcia Campos]

Committed r130621: <http://trac.webkit.org/changeset/130621>