Changeset 109229 in webkit

Timestamp:

Feb 29, 2012, 10:45:14 AM (15 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Add zoom-text-only setting to WebKit2 GTK+ API
​https://bugs.webkit.org/show_bug.cgi?id=75249

Reviewed by Gustavo Noronha Silva.

To set whether zoom level of web view should affect only the text
or all page contents. It's disabled by default.

• UIProcess/API/gtk/WebKitSettings.cpp:

(webKitSettingsSetProperty):
(webKitSettingsGetProperty):
(webkit_settings_class_init): Add WebKitSettings:zoom-text-only
property.
(webkit_settings_set_zoom_text_only): Set
WebKitSettings:zoom-text-only.
(webkit_settings_get_zoom_text_only): Get
WebKitSettings:zoom-text-only.

• UIProcess/API/gtk/WebKitSettings.h:
• UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Add new

symbols.

• UIProcess/API/gtk/tests/TestWebKitSettings.cpp:

(testWebKitSettings):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitSettings.cpp (modified) (6 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 @@
+2012-02-29  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Add zoom-text-only setting to WebKit2 GTK+ API
+        https://bugs.webkit.org/show_bug.cgi?id=75249
+
+        Reviewed by Gustavo Noronha Silva.
+
+        To set whether zoom level of web view should affect only the text
+        or all page contents. It's disabled by default.
+
+        * UIProcess/API/gtk/WebKitSettings.cpp:
+        (webKitSettingsSetProperty):
+        (webKitSettingsGetProperty):
+        (webkit_settings_class_init): Add WebKitSettings:zoom-text-only
+        property.
+        (webkit_settings_set_zoom_text_only): Set
+        WebKitSettings:zoom-text-only.
+        (webkit_settings_get_zoom_text_only): Get
+        WebKitSettings:zoom-text-only.
+        * UIProcess/API/gtk/WebKitSettings.h:
+        * UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Add new
+        symbols.
+        * UIProcess/API/gtk/tests/TestWebKitSettings.cpp:
+        (testWebKitSettings):
+
 2012-02-29  Sergio Villar Senin  <svillar@igalia.com>
 

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

@@ -47 +47 @@
     CString pictographFontFamily;
     CString defaultCharset;
+    bool zoomTextOnly;
 };
 
@@ -104 +105 @@
     PROP_PRINT_BACKGROUNDS,
     PROP_ENABLE_WEBAUDIO,
-    PROP_ENABLE_WEBGL
+    PROP_ENABLE_WEBGL,
+    PROP_ZOOM_TEXT_ONLY
 };
 
@@ -211 +213 @@
         webkit_settings_set_enable_webgl(settings, g_value_get_boolean(value));
         break;
+    case PROP_ZOOM_TEXT_ONLY:
+        webkit_settings_set_zoom_text_only(settings, g_value_get_boolean(value));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
@@ -320 +325 @@
     case PROP_ENABLE_WEBGL:
         g_value_set_boolean(value, webkit_settings_get_enable_webgl(settings));
+        break;
+    case PROP_ZOOM_TEXT_ONLY:
+        g_value_set_boolean(value, webkit_settings_get_zoom_text_only(settings));
         break;
     default:
@@ -817 +825 @@
                                                          readWriteConstructParamFlags));
 
+    /**
+     * WebKitSettings:zoom-text-only:
+     *
+     * Whether #WebKitWebView:zoom-level affects only the
+     * text of the page or all the contents. Other contents containing text
+     * like form controls will be also affected by zoom factor when
+     * this property is enabled.
+     */
+    g_object_class_install_property(gObjectClass,
+                                    PROP_ZOOM_TEXT_ONLY,
+                                    g_param_spec_boolean("zoom-text-only",
+                                                         _("Zoom Text Only"),
+                                                         _("Whether zoom level of web view changes only the text size"),
+                                                         FALSE,
+                                                         readWriteConstructParamFlags));
+
     g_type_class_add_private(klass, sizeof(WebKitSettingsPrivate));
 }
@@ -2074 +2098 @@
     g_object_notify(G_OBJECT(settings), "enable-webgl");
 }
+
+/**
+ * webkit_settings_set_zoom_text_only:
+ * @settings: a #WebKitSettings
+ * @zoom_text_only: Value to be set
+ *
+ * Set the #WebKitSettings:zoom-text-only property.
+ */
+void webkit_settings_set_zoom_text_only(WebKitSettings* settings, gboolean zoomTextOnly)
+{
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
+
+    WebKitSettingsPrivate* priv = settings->priv;
+    if (priv->zoomTextOnly == zoomTextOnly)
+        return;
+
+    priv->zoomTextOnly = zoomTextOnly;
+    g_object_notify(G_OBJECT(settings), "zoom-text-only");
+}
+
+/**
+ * webkit_settings_get_zoom_text_only:
+ * @settings: a #WebKitSettings
+ *
+ * Get the #WebKitSettings:zoom-text-only property.
+ *
+ * Returns: %TRUE If zoom level of the view should only affect the text
+ *    or %FALSE if all view contents should be scaled.
+ */
+gboolean webkit_settings_get_zoom_text_only(WebKitSettings* settings)
+{
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
+
+    return settings->priv->zoomTextOnly;
+}
+

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

@@ -308 +308 @@
                                                                 gboolean        enabled);
 
+WEBKIT_API void
+webkit_settings_set_zoom_text_only                             (WebKitSettings *settings,
+                                                                gboolean        zoom_text_only);
+
+WEBKIT_API gboolean
+webkit_settings_get_zoom_text_only                             (WebKitSettings *settings);
+
 G_END_DECLS
 

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

@@ -222 +222 @@
 webkit_settings_get_enable_webgl
 webkit_settings_set_enable_webgl
+webkit_settings_get_zoom_text_only
+webkit_settings_set_zoom_text_only
 
 <SUBSECTION Standard>

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

@@ -200 +200 @@
     g_assert(webkit_settings_get_enable_webgl(settings));
 
+    // Zoom text only is disabled by default.
+    g_assert(!webkit_settings_get_zoom_text_only(settings));
+    webkit_settings_set_zoom_text_only(settings, TRUE);
+    g_assert(webkit_settings_get_zoom_text_only(settings));
+
     g_object_unref(G_OBJECT(settings));
 }