Changeset 122113 in webkit

Timestamp:

Jul 9, 2012 10:24:55 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Add a setting to enable/disable page cache to WebKit2 GTK+ API
​https://bugs.webkit.org/show_bug.cgi?id=90773

Reviewed by Martin Robinson.

• UIProcess/API/gtk/WebKitSettings.cpp:

(webKitSettingsSetProperty):
(webKitSettingsGetProperty):
(webkit_settings_class_init):
(webkit_settings_get_enable_page_cache):
(webkit_settings_set_enable_page_cache):

• UIProcess/API/gtk/WebKitSettings.h:
• UIProcess/API/gtk/docs/webkit2gtk-sections.txt:
• 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-07-09  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Add a setting to enable/disable page cache to WebKit2 GTK+ API
+        https://bugs.webkit.org/show_bug.cgi?id=90773
+
+        Reviewed by Martin Robinson.
+
+        * UIProcess/API/gtk/WebKitSettings.cpp:
+        (webKitSettingsSetProperty):
+        (webKitSettingsGetProperty):
+        (webkit_settings_class_init):
+        (webkit_settings_get_enable_page_cache):
+        (webkit_settings_set_enable_page_cache):
+        * UIProcess/API/gtk/WebKitSettings.h:
+        * UIProcess/API/gtk/docs/webkit2gtk-sections.txt:
+        * UIProcess/API/gtk/tests/TestWebKitSettings.cpp:
+        (testWebKitSettings):
+
 2012-07-09  Sheriff Bot  <webkit.review.bot@gmail.com>
 

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

@@ -114 +114 @@
     PROP_MEDIA_PLAYBACK_ALLOWS_INLINE,
     PROP_DRAW_COMPOSITING_INDICATORS,
-    PROP_ENABLE_SITE_SPECIFIC_QUIRKS
+    PROP_ENABLE_SITE_SPECIFIC_QUIRKS,
+    PROP_ENABLE_PAGE_CACHE
 };
 
@@ -242 +243 @@
         webkit_settings_set_enable_site_specific_quirks(settings, g_value_get_boolean(value));
         break;
+    case PROP_ENABLE_PAGE_CACHE:
+        webkit_settings_set_enable_page_cache(settings, g_value_get_boolean(value));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
@@ -372 +376 @@
     case PROP_ENABLE_SITE_SPECIFIC_QUIRKS:
         g_value_set_boolean(value, webkit_settings_get_enable_site_specific_quirks(settings));
+        break;
+    case PROP_ENABLE_PAGE_CACHE:
+        g_value_set_boolean(value, webkit_settings_get_enable_page_cache(settings));
         break;
     default:
@@ -966 +973 @@
 
     /**
-     * WebKitSettings::enable-site-specific-quirks:
+     * WebKitSettings:enable-site-specific-quirks:
      *
      * Whether to turn on site-specific quirks. Turning this on will
@@ -983 +990 @@
                                                          readWriteConstructParamFlags));
 
+    /**
+     * WebKitSettings:enable-page-cache:
+     *
+     * Enable or disable the page cache. Disabling the page cache is
+     * generally only useful for special circumstances like low-memory
+     * scenarios or special purpose applications like static HTML
+     * viewers. This setting only controls the Page Cache, this cache
+     * is different than the disk-based or memory-based traditional
+     * resource caches, its point is to make going back and forth
+     * between pages much faster. For details about the different types
+     * of caches and their purposes see:
+     * http://webkit.org/blog/427/webkit-page-cache-i-the-basics/
+     */
+    g_object_class_install_property(gObjectClass,
+                                    PROP_ENABLE_PAGE_CACHE,
+                                    g_param_spec_boolean("enable-page-cache",
+                                                         _("Enable page cache"),
+                                                         _("Whether the page cache should be used"),
+                                                         TRUE,
+                                                         readWriteConstructParamFlags));
+
     g_type_class_add_private(klass, sizeof(WebKitSettingsPrivate));
 }
@@ -2493 +2521 @@
     g_object_notify(G_OBJECT(settings), "enable-site-specific-quirks");
 }
+
+/**
+ * webkit_settings_get_enable_page_cache:
+ * @settings: a #WebKitSettings
+ *
+ * Get the #WebKitSettings:enable-page-cache property.
+ *
+ * Returns: %TRUE if page cache enabled or %FALSE otherwise.
+ */
+gboolean webkit_settings_get_enable_page_cache(WebKitSettings* settings)
+{
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
+
+    return WKPreferencesGetPageCacheEnabled(settings->priv->preferences.get());
+}
+
+/**
+ * webkit_settings_set_enable_page_cache:
+ * @settings: a #WebKitSettings
+ * @enabled: Value to be set
+ *
+ * Set the #WebKitSettings:enable-page-cache property.
+ */
+void webkit_settings_set_enable_page_cache(WebKitSettings* settings, gboolean enabled)
+{
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
+
+    WebKitSettingsPrivate* priv = settings->priv;
+    bool currentValue = WKPreferencesGetPageCacheEnabled(priv->preferences.get());
+    if (currentValue == enabled)
+        return;
+
+    WKPreferencesSetPageCacheEnabled(priv->preferences.get(), enabled);
+    g_object_notify(G_OBJECT(settings), "enable-page-cache");
+}

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

@@ -356 +356 @@
                                                                 gboolean        enabled);
 
+WEBKIT_API gboolean
+webkit_settings_get_enable_page_cache                          (WebKitSettings *settings);
+
+WEBKIT_API void
+webkit_settings_set_enable_page_cache                          (WebKitSettings *settings,
+                                                                gboolean        enabled);
+
 G_END_DECLS
 

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

@@ -271 +271 @@
 webkit_settings_get_enable_site_specific_quirks
 webkit_settings_set_enable_site_specific_quirks
+webkit_settings_get_enable_page_cache
+webkit_settings_set_enable_page_cache
 
 <SUBSECTION Standard>

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

@@ -235 +235 @@
     g_assert(webkit_settings_get_enable_site_specific_quirks(settings));
 
+    // By default, page cache is enabled.
+    g_assert(webkit_settings_get_enable_page_cache(settings));
+    webkit_settings_set_enable_page_cache(settings, FALSE);
+    g_assert(!webkit_settings_get_enable_page_cache(settings));
+
     g_object_unref(G_OBJECT(settings));
 }