Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)

1 files changed, 57 insertions, 5 deletions

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp
index 837a9a1e5..06418613d 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp
@@ -33,9 +33,6 @@
 
 #include "WebKitPrivate.h"
 #include "WebKitSettingsPrivate.h"
-#include <WebKit2/WKAPICast.h>
-#include <WebKit2/WKString.h>
-#include <WebKit2/WKRetainPtr.h>
 #include <glib/gi18n-lib.h>
 #include <wtf/text/CString.h>
 
@@ -103,7 +100,8 @@ enum {
     PROP_ENABLE_TABS_TO_LINKS,
     PROP_ENABLE_DNS_PREFETCHING,
     PROP_ENABLE_CARET_BROWSING,
-    PROP_ENABLE_FULLSCREEN
+    PROP_ENABLE_FULLSCREEN,
+    PROP_PRINT_BACKGROUNDS
 };
 
 static void webKitSettingsSetProperty(GObject* object, guint propId, const GValue* value, GParamSpec* paramSpec)
@@ -201,6 +199,9 @@ static void webKitSettingsSetProperty(GObject* object, guint propId, const GValu
     case PROP_ENABLE_FULLSCREEN:
         webkit_settings_set_enable_fullscreen(settings, g_value_get_boolean(value));
         break;
+    case PROP_PRINT_BACKGROUNDS:
+        webkit_settings_set_print_backgrounds(settings, g_value_get_boolean(value));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
         break;
@@ -302,6 +303,9 @@ static void webKitSettingsGetProperty(GObject* object, guint propId, GValue* val
     case PROP_ENABLE_FULLSCREEN:
         g_value_set_boolean(value, webkit_settings_get_enable_fullscreen(settings));
         break;
+    case PROP_PRINT_BACKGROUNDS:
+        g_value_set_boolean(value, webkit_settings_get_print_backgrounds(settings));
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
         break;
@@ -751,6 +755,19 @@ static void webkit_settings_class_init(WebKitSettingsClass* klass)
                                                          FALSE,
                                                          readWriteConstructParamFlags));
 
+    /**
+     * WebKitSettings:print-backgrounds:
+     *
+     * Whether background images should be drawn during printing.
+     */
+    g_object_class_install_property(gObjectClass,
+                                    PROP_PRINT_BACKGROUNDS,
+                                    g_param_spec_boolean("print-backgrounds",
+                                                         _("Print Backgrounds"),
+                                                         _("Whether background images should be drawn during printing"),
+                                                         TRUE,
+                                                         readWriteConstructParamFlags));
+
     g_type_class_add_private(klass, sizeof(WebKitSettingsPrivate));
 }
 
@@ -1885,7 +1902,7 @@ gboolean webkit_settings_get_enable_fullscreen(WebKitSettings* settings)
 }
 
 /**
- * webkit_settings_set_enable_fullscreen
+ * webkit_settings_set_enable_fullscreen:
  * @settings: a #WebKitSettings
  * @enabled: Value to be set
  *
@@ -1903,3 +1920,38 @@ void webkit_settings_set_enable_fullscreen(WebKitSettings* settings, gboolean en
     WKPreferencesSetFullScreenEnabled(priv->preferences.get(), enabled);
     g_object_notify(G_OBJECT(settings), "enable-fullscreen");
 }
+
+/**
+ * webkit_settings_get_print_backgrounds:
+ * @settings: a #WebKitSettings
+ *
+ * Get the #WebKitSettings:print-backgrounds property.
+ *
+ * Returns: %TRUE If background images should be printed or %FALSE otherwise.
+ */
+gboolean webkit_settings_get_print_backgrounds(WebKitSettings* settings)
+{
+    g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
+
+    return WKPreferencesGetShouldPrintBackgrounds(settings->priv->preferences.get());
+}
+
+/**
+ * webkit_settings_set_print_backgrounds:
+ * @settings: a #WebKitSettings
+ * @print_backgrounds: Value to be set
+ *
+ * Set the #WebKitSettings:print-backgrounds property.
+ */
+void webkit_settings_set_print_backgrounds(WebKitSettings* settings, gboolean printBackgrounds)
+{
+    g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
+
+    WebKitSettingsPrivate* priv = settings->priv;
+    bool currentValue = WKPreferencesGetShouldPrintBackgrounds(priv->preferences.get());
+    if (currentValue == printBackgrounds)
+        return;
+
+    WKPreferencesSetShouldPrintBackgrounds(priv->preferences.get(), printBackgrounds);
+    g_object_notify(G_OBJECT(settings), "print-backgrounds");
+}