[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
eric at webkit.org
eric at webkit.org
Thu Oct 29 20:47:48 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit b60b41206a166e2eac251809daae91748a07aadc
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 19 17:25:37 2009 +0000
2009-10-19 Zan Dobersek <zandobersek at gmail.com>
Reviewed by Gustavo Noronha.
Enable tests that pass when DOM pasting is allowed.
* platform/gtk/Skipped:
2009-10-19 Zan Dobersek <zandobersek at gmail.com>
Reviewed by Gustavo Noronha.
Add a settings to allow DOM pastes to be performed.
* webkit/webkitwebsettings.cpp:
(webkit_web_settings_class_init):
(webkit_web_settings_set_property):
(webkit_web_settings_get_property):
(webkit_web_settings_copy):
* webkit/webkitwebview.cpp:
(webkit_web_view_update_settings):
(webkit_web_view_settings_notify):
2009-10-19 Zan Dobersek <zandobersek at gmail.com>
Reviewed by Gustavo Noronha.
Enable DOM pasting when running layout tests.
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49791 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4c99b4a..aefbe0a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-19 Zan Dobersek <zandobersek at gmail.com>
+
+ Reviewed by Gustavo Noronha.
+
+ Enable tests that pass when DOM pasting is allowed.
+
+ * platform/gtk/Skipped:
+
2009-10-19 Eric Carlson <eric.carlson at apple.com>
Reviewed by Simon Fraser.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 6e823f2..abaf772 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -716,7 +716,6 @@ editing/deleting/skip-virama-001.html
editing/deleting/smart-editing-disabled.html
editing/deleting/type-delete-after-quote-2.html
editing/execCommand/4128080-2.html
-editing/execCommand/5939887.html
editing/execCommand/copy-without-selection.html
editing/execCommand/createLink.html
editing/execCommand/enabling-and-selection-2.html
@@ -747,13 +746,9 @@ editing/inserting/5994480-2.html
editing/inserting/insert-thai-characters-001.html
editing/inserting/space-after-removeformat.html
editing/inserting/typing-tab-designmode.html
-editing/pasteboard/19644-1.html
-editing/pasteboard/19644-2.html
editing/pasteboard/4744008.html
-editing/pasteboard/4922709.html
editing/pasteboard/5368833.html
editing/pasteboard/5665299.html
-editing/pasteboard/5761530-1.html
editing/pasteboard/5780697-2.html
editing/pasteboard/copy-in-password-field.html
editing/pasteboard/copy-paste-float.html
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 618a4d6..69511ae 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,18 @@
+2009-10-19 Zan Dobersek <zandobersek at gmail.com>
+
+ Reviewed by Gustavo Noronha.
+
+ Add a settings to allow DOM pastes to be performed.
+
+ * webkit/webkitwebsettings.cpp:
+ (webkit_web_settings_class_init):
+ (webkit_web_settings_set_property):
+ (webkit_web_settings_get_property):
+ (webkit_web_settings_copy):
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_update_settings):
+ (webkit_web_view_settings_notify):
+
2009-10-19 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Unreviewed. Make WebKitHitTestResult actually appear in the
diff --git a/WebKit/gtk/webkit/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp
index 44d15ab..89c5233 100644
--- a/WebKit/gtk/webkit/webkitwebsettings.cpp
+++ b/WebKit/gtk/webkit/webkitwebsettings.cpp
@@ -97,6 +97,7 @@ struct _WebKitWebSettingsPrivate {
WebKitEditingBehavior editing_behavior;
gboolean enable_universal_access_from_file_uris;
gboolean enable_web_sockets;
+ gboolean enable_dom_paste;
};
#define WEBKIT_WEB_SETTINGS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_SETTINGS, WebKitWebSettingsPrivate))
@@ -137,7 +138,8 @@ enum {
PROP_ENABLE_OFFLINE_WEB_APPLICATION_CACHE,
PROP_EDITING_BEHAVIOR,
PROP_ENABLE_UNIVERSAL_ACCESS_FROM_FILE_URIS,
- PROP_ENABLE_WEB_SOCKETS
+ PROP_ENABLE_WEB_SOCKETS,
+ PROP_ENABLE_DOM_PASTE
};
// Create a default user agent string
@@ -667,6 +669,22 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass)
FALSE,
flags));
+ /**
+ * WebKitWebSettings:enable-dom-paste
+ *
+ * Whether to enable DOM paste. If set to %TRUE, document.execCommand("Paste")
+ * will correctly execute and paste content of the clipboard.
+ *
+ * Since: 1.1.16
+ */
+ g_object_class_install_property(gobject_class,
+ PROP_ENABLE_DOM_PASTE,
+ g_param_spec_boolean("enable-dom-paste",
+ _("Enable DOM paste"),
+ _("Whether to enable DOM paste"),
+ FALSE,
+ flags));
+
g_type_class_add_private(klass, sizeof(WebKitWebSettingsPrivate));
}
@@ -863,6 +881,9 @@ static void webkit_web_settings_set_property(GObject* object, guint prop_id, con
case PROP_ENABLE_WEB_SOCKETS:
priv->enable_web_sockets = g_value_get_boolean(value);
break;
+ case PROP_ENABLE_DOM_PASTE:
+ priv->enable_dom_paste = g_value_get_boolean(value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
@@ -977,6 +998,9 @@ static void webkit_web_settings_get_property(GObject* object, guint prop_id, GVa
case PROP_ENABLE_WEB_SOCKETS:
g_value_set_boolean(value, priv->enable_web_sockets);
break;
+ case PROP_ENABLE_DOM_PASTE:
+ g_value_set_boolean(value, priv->enable_dom_paste);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
@@ -1042,6 +1066,7 @@ WebKitWebSettings* webkit_web_settings_copy(WebKitWebSettings* web_settings)
"editing-behavior", priv->editing_behavior,
"enable-universal-access-from-file-uris", priv->enable_universal_access_from_file_uris,
"enable-web-sockets", priv->enable_web_sockets,
+ "enable-dom-paste", priv->enable_dom_paste,
NULL));
return copy;
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index fb2bf35..8e5e575 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -2392,7 +2392,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView)
enableScripts, enablePlugins, enableDeveloperExtras, resizableTextAreas,
enablePrivateBrowsing, enableCaretBrowsing, enableHTML5Database, enableHTML5LocalStorage,
enableXSSAuditor, javascriptCanOpenWindows, enableOfflineWebAppCache,
- enableUniversalAccessFromFileURI, enableWebSockets;
+ enableUniversalAccessFromFileURI, enableWebSockets, enableDOMPaste;
WebKitEditingBehavior editingBehavior;
@@ -2422,6 +2422,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView)
"editing-behavior", &editingBehavior,
"enable-universal-access-from-file-uris", &enableUniversalAccessFromFileURI,
"enable-web-sockets", &enableWebSockets,
+ "enable-dom-paste", &enableDOMPaste,
NULL);
settings->setDefaultTextEncodingName(defaultEncoding);
@@ -2451,6 +2452,7 @@ static void webkit_web_view_update_settings(WebKitWebView* webView)
#if ENABLE(WEB_SOCKETS)
settings->setExperimentalWebSocketsEnabled(enableWebSockets);
#endif
+ settings->setDOMPasteAllowed(enableDOMPaste);
g_free(defaultEncoding);
g_free(cursiveFontFamily);
@@ -2541,6 +2543,8 @@ static void webkit_web_view_settings_notify(WebKitWebSettings* webSettings, GPar
else if (name == g_intern_string("enable-web-sockets"))
settings->setExperimentalWebSocketsEnabled(g_value_get_boolean(&value));
#endif
+ else if (name == g_intern_string("enable-dom-paste"))
+ settings->setDOMPasteAllowed(g_value_get_boolean(&value));
else if (!g_object_class_find_property(G_OBJECT_GET_CLASS(webSettings), name))
g_warning("Unexpected setting '%s'", name);
g_value_unset(&value);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f17a8eb..3ed8cd2 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-19 Zan Dobersek <zandobersek at gmail.com>
+
+ Reviewed by Gustavo Noronha.
+
+ Enable DOM pasting when running layout tests.
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (resetDefaultsToConsistentValues):
+
2009-10-18 Kenneth Rohde Christiansen <kenneth at webkit.org>
Reviewed by Simon Hausmann.
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index a6d7762..cf86b30 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -320,6 +320,7 @@ static void resetDefaultsToConsistentValues()
"enable-universal-access-from-file-uris", TRUE,
"enable-scripts", TRUE,
"enable-web-sockets", TRUE,
+ "enable-dom-paste", TRUE,
"default-font-family", "Times",
"monospace-font-family", "Courier",
"serif-font-family", "Times",
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list