Bug 131531 – [cairo] Add GUniquePtrCairo and use it instead of OwnPtrCairo

• Status: RESOLVED
• Resolution: WONTFIX
• Component: New Bugs

[Jae Hyun Park]

Patch to follow.

[Jae Hyun Park]

Created attachment 229121 [details]
Patch

[Martin Robinson]

Comment on attachment 229121 [details]
Patch

It seems you are removing the FontConfig custom deleters and not replacing them.

[Jae Hyun Park]

(In reply to comment #2)
> (From update of attachment 229121 [details])
> It seems you are removing the FontConfig custom deleters and not replacing them.

Thanks for the review.

I could not find any piece of code that uses OwnPtr<FcObjectSet> or OwnPtr<FcFontSet>. So I thought it was deprecated and removed it.

Should I include that in my changelog? or should I include them in GUniquePtrCairo anyway in case someone uses in the future?

[Martin Robinson]

(In reply to comment #3)
 
> I could not find any piece of code that uses OwnPtr<FcObjectSet> or OwnPtr<FcFontSet>. So I thought it was deprecated and removed it.

Oh yes. It's probably a good idea to mention that in the ChangeLog.

> Should I include that in my changelog? or should I include them in GUniquePtrCairo anyway in case someone uses in the future?

That shouldn't be necessary.

[Martin Robinson]

Comment on attachment 229121 [details]
Patch

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

> Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp:-27
> -#include "RefPtrCairo.h"

I think by removing this line you break the RefPtr<FcPattern> instance below.

> Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp:32
> +#include <wtf/PassOwnPtr.h>

Including OwnPtr.h would be better, I think.

[Jae Hyun Park]

Created attachment 229344 [details]
Patch

[Jae Hyun Park]

(In reply to comment #5)
> (From update of attachment 229121 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=229121&action=review
> 
> > Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp:-27
> > -#include "RefPtrCairo.h"
> 
> I think by removing this line you break the RefPtr<FcPattern> instance below.
Fixed.

> 
> > Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp:32
> > +#include <wtf/PassOwnPtr.h>
> 
> Including OwnPtr.h would be better, I think.
Fixed.

I also included why FontConfig custom deleters were removed in the ChangeLog.

Thanks!

[Martin Robinson]

Comment on attachment 229344 [details]
Patch

One thing I'm wondering about now is whether the WinCairo port uses GUniuqePtr and GLib in general. If not, I don't think we can actually use it here. :/

[Martin Robinson]

Pinging a few WinCairo port maintainers.

[Jae Hyun Park]

Any updates from WinCairo port maintainers?

[Alex Christensen]

It is correct that WinCairo does not use glib, so relying on gio.h in GUniquePtr.h would break it.

[Alex Christensen]

Comment on attachment 229344 [details]
Patch

This would break the WinCairo port.