[Webkit-unassigned] [Bug 68996] [GTK][WEBKIT2] Add Font and Encoding properties to WebKitWebSettings.

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=68996





--- Comment #6 from Carlos Garcia Campos <cgarcia at igalia.com>  2011-09-28 08:50:36 PST ---
(From update of attachment 109023)
View in context: https://bugs.webkit.org/attachment.cgi?id=109023&action=review

> Source/WebKit2/UIProcess/API/gtk/WebKitWebSettings.cpp:42
> +static gchar* WKStringGetCString(WKStringRef stringRef)
> +{
> +    gchar* buffer = static_cast<gchar *>(g_malloc0(WKStringGetLength(stringRef) + 1));
> +    WKStringGetUTF8CString(stringRef, buffer, WKStringGetLength(stringRef) + 1);
> +    WKRelease(stringRef);
> +    return buffer;
> +}

Use toImpl(string)->utf8().data() instead.

> Source/WebKit2/UIProcess/API/gtk/WebKitWebSettings.cpp:54
> +    gchar* defaultFontFamily;
> +    gchar* monospaceFontFamily;
> +    gchar* serifFontFamily;
> +    gchar* sansSerifFontFamily;
> +    gchar* cursiveFontFamily;
> +    gchar* fantasyFontFamily;
> +    gchar* pictographFontFamily;
> +    gchar* defaultEncoding;

Use GOwnPtr<char> for these.

> Source/WebKit2/UIProcess/API/gtk/WebKitWebSettings.cpp:87
> +    ~_WebKitWebSettingsPrivate()
> +    {
> +        if(defaultFontFamily)
> +            g_free(defaultFontFamily);
> +        if(monospaceFontFamily)
> +            g_free(monospaceFontFamily);
> +        if(serifFontFamily)
> +            g_free(serifFontFamily);
> +        if(sansSerifFontFamily)
> +            g_free(sansSerifFontFamily);
> +        if(cursiveFontFamily)
> +            g_free(cursiveFontFamily);
> +        if(fantasyFontFamily)
> +            g_free(fantasyFontFamily);
> +        if(pictographFontFamily)
> +            g_free(pictographFontFamily);
> +        if(defaultEncoding)
> +            g_free(defaultEncoding);

You don't need this when using GOwnPtr

> Source/WebKit2/UIProcess/API/gtk/WebKitWebSettings.cpp:305
> +static void webkitWebSettingsFinalize(GObject* gObject)
> +{
> +    WEBKIT_WEB_SETTINGS(gObject)->priv->~_WebKitWebSettingsPrivate();
> +    G_OBJECT_CLASS(webkit_web_settings_parent_class)->finalize(gObject);
> +}
> +

We don't need this either.

> Source/WebKit2/UIProcess/API/gtk/WebKitWebSettings.cpp:676
> +/*
> +static char* WKStringGetCString(WKStringRef string)
> +{
> +    size_t length = WKStringGetMaximumUTF8CStringSize(string);
> +    char *buffer = (char *) g_malloc(length);
> +    WKStringGetUTF8CString(string, buffer, length);
> +    return buffer;
> +}
> +*/
> +

I guess you forgot to remove this.

> Source/WebKit2/UIProcess/API/gtk/WebKitWebSettings.cpp:1218
> +    if (g_ascii_strcasecmp(priv->defaultFontFamily, defaultFontFamily) == 0)
> +        return;

Use if (!g_ascii_strcasecmp(priv->defaultFontFamily, defaultFontFamily)) instead.

> Source/WebKit2/UIProcess/API/gtk/WebKitWebSettings.cpp:1263
> +    if (g_ascii_strcasecmp(priv->monospaceFontFamily, monospaceFontFamily) == 0)
> +        return;

Ditto.

> Source/WebKit2/UIProcess/API/gtk/WebKitWebSettings.cpp:1314
> +    g_object_notify(G_OBJECT(settings), "serif-font-family");

Check here settings actually changed before emitting notify

> Source/WebKit2/UIProcess/API/gtk/WebKitWebSettings.cpp:1357
> +    g_object_notify(G_OBJECT(settings), "sans-serif-font-family");

Ditto.

> Source/WebKit2/UIProcess/API/gtk/WebKitWebSettings.cpp:1400
> +    g_object_notify(G_OBJECT(settings), "cursive-font-family");

Ditto.

> Source/WebKit2/UIProcess/API/gtk/WebKitWebSettings.cpp:1443
> +    g_object_notify(G_OBJECT(settings), "fantasy-font-family");

Ditto.

> Source/WebKit2/UIProcess/API/gtk/WebKitWebSettings.cpp:1486
> +    g_object_notify(G_OBJECT(settings), "pictograph-font-family");

Ditto.

> Source/WebKit2/UIProcess/API/gtk/WebKitWebSettings.cpp:1651
> +    g_object_notify(G_OBJECT(settings), "default-encoding");

Ditto.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.