Modified: trunk/Source/WebKit2/ChangeLog (150157 => 150158)
--- trunk/Source/WebKit2/ChangeLog 2013-05-15 23:43:40 UTC (rev 150157)
+++ trunk/Source/WebKit2/ChangeLog 2013-05-16 00:12:43 UTC (rev 150158)
@@ -1,3 +1,28 @@
+2013-05-15 Arnaud Renevier <[email protected]>
+
+ [GTK] [WebKit2] enable displaying console.log messages to system console
+ https://bugs.webkit.org/show_bug.cgi?id=115578
+
+ Reviewed by Martin Robinson.
+
+ Add a setting to enable/disable displaying of page messages to system
+ console. Property is called enable-write-console-messages-to-stdout.
+ Getter API function is
+ webkit_settings_get_enable_write_console_messages_to_stdout
+ Setter API function is
+ webkit_settings_set_enable_write_console_messages_to_stdout
+
+ * UIProcess/API/gtk/WebKitSettings.cpp:
+ (webKitSettingsSetProperty):
+ (webKitSettingsGetProperty):
+ (webkit_settings_class_init):
+ (webkit_settings_get_enable_write_console_messages_to_stdout):
+ (webkit_settings_set_enable_write_console_messages_to_stdout):
+ * UIProcess/API/gtk/WebKitSettings.h:
+ * UIProcess/API/gtk/docs/webkit2gtk-sections.txt:
+ * UIProcess/API/gtk/tests/TestWebKitSettings.cpp:
+ (testWebKitSettings):
+
2013-05-08 Gavin Barraclough <[email protected]>
Process suppression should throttle scripted animations
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp (150157 => 150158)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2013-05-15 23:43:40 UTC (rev 150157)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp 2013-05-16 00:12:43 UTC (rev 150158)
@@ -133,7 +133,8 @@
PROP_ENABLE_PAGE_CACHE,
PROP_USER_AGENT,
PROP_ENABLE_SMOOTH_SCROLLING,
- PROP_ENABLE_ACCELERATED_2D_CANVAS
+ PROP_ENABLE_ACCELERATED_2D_CANVAS,
+ PROP_ENABLE_WRITE_CONSOLE_MESSAGES_TO_STDOUT
};
static void webKitSettingsSetProperty(GObject* object, guint propId, const GValue* value, GParamSpec* paramSpec)
@@ -279,6 +280,9 @@
case PROP_ENABLE_ACCELERATED_2D_CANVAS:
webkit_settings_set_enable_accelerated_2d_canvas(settings, g_value_get_boolean(value));
break;
+ case PROP_ENABLE_WRITE_CONSOLE_MESSAGES_TO_STDOUT:
+ webkit_settings_set_enable_write_console_messages_to_stdout(settings, g_value_get_boolean(value));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
break;
@@ -422,6 +426,9 @@
case PROP_ENABLE_ACCELERATED_2D_CANVAS:
g_value_set_boolean(value, webkit_settings_get_enable_accelerated_2d_canvas(settings));
break;
+ case PROP_ENABLE_WRITE_CONSOLE_MESSAGES_TO_STDOUT:
+ g_value_set_boolean(value, webkit_settings_get_enable_write_console_messages_to_stdout(settings));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, paramSpec);
break;
@@ -1096,6 +1103,23 @@
_("Whether to enable accelerated 2D canvas"),
FALSE,
readWriteConstructParamFlags));
+
+ /**
+ * WebKitSettings:enable-write-console-messages-to-stdout:
+ *
+ * Enable or disable writing console messages to stdout. These are messages
+ * sent to the console with console.log and related methods.
+ *
+ * Since: 2.2
+ */
+ g_object_class_install_property(gObjectClass,
+ PROP_ENABLE_WRITE_CONSOLE_MESSAGES_TO_STDOUT,
+ g_param_spec_boolean("enable-write-console-messages-to-stdout",
+ _("Write console messages on stdout"),
+ _("Whether to write console messages on stdout"),
+ FALSE,
+ readWriteConstructParamFlags));
+
}
WebPreferences* webkitSettingsGetPreferences(WebKitSettings* settings)
@@ -2719,3 +2743,43 @@
priv->preferences->setAccelerated2dCanvasEnabled(enabled);
g_object_notify(G_OBJECT(settings), "enable-accelerated-2d-canvas");
}
+
+/**
+ * webkit_settings_get_enable_write_console_messages_to_stdout:
+ * @settings: a #WebKitSettings
+ *
+ * Get the #WebKitSettings:enable-write-console-messages-to-stdout property.
+ *
+ * Returns: %TRUE if writing console messages to stdout is enabled or %FALSE
+ * otherwise.
+ *
+ * Since: 2.2
+ */
+gboolean webkit_settings_get_enable_write_console_messages_to_stdout(WebKitSettings* settings)
+{
+ g_return_val_if_fail(WEBKIT_IS_SETTINGS(settings), FALSE);
+
+ return settings->priv->preferences->logsPageMessagesToSystemConsoleEnabled();
+}
+
+/**
+ * webkit_settings_set_enable_write_console_messages_to_stdout:
+ * @settings: a #WebKitSettings
+ * @enabled: Value to be set
+ *
+ * Set the #WebKitSettings:enable-write-console-messages-to-stdout property.
+ *
+ * Since: 2.2
+ */
+void webkit_settings_set_enable_write_console_messages_to_stdout(WebKitSettings* settings, gboolean enabled)
+{
+ g_return_if_fail(WEBKIT_IS_SETTINGS(settings));
+
+ WebKitSettingsPrivate* priv = settings->priv;
+ bool currentValue = priv->preferences->logsPageMessagesToSystemConsoleEnabled();
+ if (currentValue == enabled)
+ return;
+
+ priv->preferences->setLogsPageMessagesToSystemConsoleEnabled(enabled);
+ g_object_notify(G_OBJECT(settings), "enable-write-console-messages-to-stdout");
+}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h (150157 => 150158)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h 2013-05-15 23:43:40 UTC (rev 150157)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitSettings.h 2013-05-16 00:12:43 UTC (rev 150158)
@@ -386,6 +386,13 @@
webkit_settings_set_enable_accelerated_2d_canvas (WebKitSettings *settings,
gboolean enabled);
+WEBKIT_API gboolean
+webkit_settings_get_enable_write_console_messages_to_stdout (WebKitSettings *settings);
+
+WEBKIT_API void
+webkit_settings_set_enable_write_console_messages_to_stdout (WebKitSettings *settings,
+ gboolean enabled);
+
G_END_DECLS
#endif /* WebKitSettings_h */
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt (150157 => 150158)
--- trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt 2013-05-15 23:43:40 UTC (rev 150157)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt 2013-05-16 00:12:43 UTC (rev 150158)
@@ -319,6 +319,8 @@
webkit_settings_set_enable_smooth_scrolling
webkit_settings_get_enable_accelerated_2d_canvas
webkit_settings_set_enable_accelerated_2d_canvas
+webkit_settings_get_enable_write_console_messages_to_stdout
+webkit_settings_set_enable_write_console_messages_to_stdout
<SUBSECTION Standard>
WebKitSettingsClass
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp (150157 => 150158)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp 2013-05-15 23:43:40 UTC (rev 150157)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp 2013-05-16 00:12:43 UTC (rev 150158)
@@ -253,6 +253,11 @@
webkit_settings_set_enable_accelerated_2d_canvas(settings, TRUE);
g_assert(webkit_settings_get_enable_accelerated_2d_canvas(settings));
+ // By default, writing of console messages to stdout is disabled.
+ g_assert(!webkit_settings_get_enable_write_console_messages_to_stdout(settings));
+ webkit_settings_set_enable_write_console_messages_to_stdout(settings, TRUE);
+ g_assert(webkit_settings_get_enable_write_console_messages_to_stdout(settings));
+
g_object_unref(G_OBJECT(settings));
}
