Changeset 100248 in webkit

Timestamp:

Nov 15, 2011, 1:05:33 AM (15 years ago)

Author:

mario@webkit.org

Message:

[GTK][WEBKIT2] Add enable-caret-browsing property to WebKitSettings
​https://bugs.webkit.org/show_bug.cgi?id=72267

Reviewed by Martin Robinson.

Allow getting and setting the 'enable-caret-browsing' property
through WebKitSettings.

• UIProcess/API/gtk/WebKitSettings.cpp:

(webKitSettingsSetProperty): Added property setter.
(webKitSettingsGetProperty): Added propery getter.
(webkit_settings_class_init): Install property.
(webkit_settings_get_enable_caret_browsing): Added.
(webkit_settings_set_enable_caret_browsing): Added.

• UIProcess/API/gtk/WebKitSettings.h: Expose new public APIs.
• UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Add new sections for gtk-doc generation.
• UIProcess/API/gtk/tests/TestWebKitSettings.cpp:

(testWebKitSettings): Added new API test.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitSettings.cpp (modified) (5 diffs)
• UIProcess/API/gtk/WebKitSettings.h (modified) (1 diff)
• UIProcess/API/gtk/docs/webkit2gtk-sections.txt (modified) (1 diff)
• UIProcess/API/gtk/tests/TestWebKitSettings.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-11-15  Mario Sanchez Prada  <msanchez@igalia.com>
+
+        [GTK][WEBKIT2] Add enable-caret-browsing property to WebKitSettings
+        https://bugs.webkit.org/show_bug.cgi?id=72267
+
+        Reviewed by Martin Robinson.
+
+        Allow getting and setting the 'enable-caret-browsing' property
+        through WebKitSettings.
+
+        * UIProcess/API/gtk/WebKitSettings.cpp:
+        (webKitSettingsSetProperty): Added property setter.
+        (webKitSettingsGetProperty): Added propery getter.
+        (webkit_settings_class_init): Install property.
+        (webkit_settings_get_enable_caret_browsing): Added.
+        (webkit_settings_set_enable_caret_browsing): Added.
+        * UIProcess/API/gtk/WebKitSettings.h: Expose new public APIs.
+        * UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Add new sections for gtk-doc generation.
+        * UIProcess/API/gtk/tests/TestWebKitSettings.cpp:
+        (testWebKitSettings): Added new API test.
+
 2011-11-14  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp

@@ -98 +98 @@
     PROP_MINIMUM_FONT_SIZE,
     PROP_DEFAULT_CHARSET,
+    PROP_ENABLE_CARET_BROWSING,
 };
 
@@ -174 +175 @@
         webkit_settings_set_default_charset(settings, g_value_get_string(value));
         break;
+    case PROP_ENABLE_CARET_BROWSING:
+        webkit_settings_set_enable_caret_browsing(settings, g_value_get_boolean(value));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
@@ -253 +257 @@
     case PROP_DEFAULT_CHARSET:
         g_value_set_string(value, webkit_settings_get_default_charset(settings));
+        break;
+    case PROP_ENABLE_CARET_BROWSING:
+        g_value_set_boolean(value, webkit_settings_get_enable_caret_browsing(settings));
         break;
     default:
@@ -604 +611 @@
                                                         readWriteConstructParamFlags));
 
+    /**
+     * WebKitSettings:enable-caret-browsing:
+     *
+     * Whether to enable accessibility enhanced keyboard navigation.
+     */
+    g_object_class_install_property(gObjectClass,
+                                    PROP_ENABLE_CARET_BROWSING,
+                                    g_param_spec_boolean("enable-caret-browsing",
+                                                         _("Enable Caret Browsing"),
+                                                         _("Whether to enable accessibility enhanced keyboard navigation"),
+                                                         FALSE,
+                                                         readWriteConstructParamFlags));
 
     g_type_class_add_private(klass, sizeof(WebKitSettingsPrivate));
@@ -1512 +1531 @@
     g_object_notify(G_OBJECT(settings), "default-charset");
 }
+
+/**
+ * webkit_settings_get_enable_caret_browsing:
+ * @settings: a #WebKitSettings
+ *
+ * Get the #WebKitSettings:enable-caret-browsing property.
+ *
+ * Returns: %TRUE If caret browsing is enabled or %FALSE otherwise.
+ */
+gboolean webkit_settings_get_enable_caret_browsing(WebKitSettings* settings)
+{
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
+
+    return WKPreferencesGetCaretBrowsingEnabled(settings->priv->preferences.get());
+}
+
+/**
+ * webkit_settings_set_enable_caret_browsing:
+ * @settings: a #WebKitSettings
+ * @enabled: Value to be set
+ *
+ * Set the #WebKitSettings:enable-caret-browsing property.
+ */
+void webkit_settings_set_enable_caret_browsing(WebKitSettings* settings, gboolean enabled)
+{
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
+
+    WebKitSettingsPrivate* priv = settings->priv;
+    bool currentValue = WKPreferencesGetCaretBrowsingEnabled(priv->preferences.get());
+    if (currentValue == enabled)
+        return;
+
+    WKPreferencesSetCaretBrowsingEnabled(priv->preferences.get(), enabled);
+    g_object_notify(G_OBJECT(settings), "enable-caret-browsing");
+}

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h

@@ -238 +238 @@
                                                                 const gchar* default_charset);
 
+WEBKIT_API gboolean
+webkit_settings_get_enable_caret_browsing                      (WebKitSettings* settings);
+
+WEBKIT_API void
+webkit_settings_set_enable_caret_browsing                      (WebKitSettings* settings,
+                                                                gboolean enabled);
+
 G_END_DECLS
 

trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt

@@ -204 +204 @@
 webkit_settings_get_default_charset
 webkit_settings_set_default_charset
+webkit_settings_get_enable_caret_browsing
+webkit_settings_set_enable_caret_browsing
 
 <SUBSECTION Standard>

trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp

@@ -158 +158 @@
     g_assert_cmpstr(webkit_settings_get_default_charset(settings), ==, "utf8");
 
+    // Caret browsing is disabled by default.
+    g_assert(!webkit_settings_get_enable_caret_browsing(settings));
+    webkit_settings_set_enable_caret_browsing(settings, TRUE);
+    g_assert(webkit_settings_get_enable_caret_browsing(settings));
+
     g_object_unref(G_OBJECT(settings));
 #endif