[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
xan at webkit.org
xan at webkit.org
Fri Feb 26 22:21:07 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 1a976e446758f296c413d9a899843af5b98683ca
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Feb 16 12:54:05 2010 +0000
2010-02-16 Xan Lopez <xlopez at igalia.com>
Reviewed by Gustavo Noronha.
Bump version to 1.1.22 so we can depend on it in applications.
* configure.ac:
WebKit/gtk:
2010-02-16 Xan Lopez <xlopez at igalia.com>
Reviewed by Gustavo Noronha.
Add a new WebKitWebSettings setting, 'auto-resize-window', set to
FALSE by default, that when enabled will apply any resizes or
moves done by a page through various DOM methods (moveTo,
resizeTo, moveBy, resizeBy).
* WebCoreSupport/ChromeClientGtk.cpp:
* webkit/webkitwebsettings.cpp:
(webkit_web_settings_class_init):
(webkit_web_settings_set_property):
(webkit_web_settings_get_property):
(webkit_web_settings_copy):
WebKitTools:
2010-02-16 Xan Lopez <xlopez at igalia.com>
Reviewed by Gustavo Noronha.
Enable 'auto-resize-window' in our DRT.
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54818 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 046188c..9a70337 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-16 Xan Lopez <xlopez at igalia.com>
+
+ Reviewed by Gustavo Noronha.
+
+ Bump version to 1.1.22 so we can depend on it in applications.
+
+ * configure.ac:
+
2010-02-12 Simon Hausmann <simon.hausmann at nokia.com>
Reviewed by Holger Freyther.
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index d237387..d808bd0 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,19 @@
+2010-02-16 Xan Lopez <xlopez at igalia.com>
+
+ Reviewed by Gustavo Noronha.
+
+ Add a new WebKitWebSettings setting, 'auto-resize-window', set to
+ FALSE by default, that when enabled will apply any resizes or
+ moves done by a page through various DOM methods (moveTo,
+ resizeTo, moveBy, resizeBy).
+
+ * WebCoreSupport/ChromeClientGtk.cpp:
+ * webkit/webkitwebsettings.cpp:
+ (webkit_web_settings_class_init):
+ (webkit_web_settings_set_property):
+ (webkit_web_settings_get_property):
+ (webkit_web_settings_copy):
+
2010-02-15 Emilio Pozuelo Monfort <pochu27 at gmail.com>
Reviewed by Gustavo Noronha Silva.
diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
index 8ea8991..feffadb 100644
--- a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
@@ -88,6 +88,23 @@ void ChromeClient::setWindowRect(const FloatRect& rect)
"width", intrect.width(),
"height", intrect.height(),
NULL);
+
+ gboolean autoResizeWindow;
+ WebKitWebSettings* settings = webkit_web_view_get_settings(m_webView);
+ g_object_get(settings, "auto-resize-window", &autoResizeWindow, NULL);
+
+ if (!autoResizeWindow)
+ return;
+
+ GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(m_webView));
+#if GTK_CHECK_VERSION(2, 18, 0)
+ if (gtk_widget_is_toplevel(window)) {
+#else
+ if (GTK_WIDGET_TOPLEVEL(window)) {
+#endif
+ gtk_window_move(GTK_WINDOW(window), intrect.x(), intrect.y());
+ gtk_window_resize(GTK_WINDOW(window), intrect.width(), intrect.height());
+ }
}
FloatRect ChromeClient::pageRect()
diff --git a/WebKit/gtk/webkit/webkitwebsettings.cpp b/WebKit/gtk/webkit/webkitwebsettings.cpp
index 1e2f8cc..631a1ab 100644
--- a/WebKit/gtk/webkit/webkitwebsettings.cpp
+++ b/WebKit/gtk/webkit/webkitwebsettings.cpp
@@ -103,6 +103,7 @@ struct _WebKitWebSettingsPrivate {
gboolean enable_default_context_menu;
gboolean enable_site_specific_quirks;
gboolean enable_page_cache;
+ gboolean auto_resize_window;
};
#define WEBKIT_WEB_SETTINGS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), WEBKIT_TYPE_WEB_SETTINGS, WebKitWebSettingsPrivate))
@@ -147,7 +148,8 @@ enum {
PROP_TAB_KEY_CYCLES_THROUGH_ELEMENTS,
PROP_ENABLE_DEFAULT_CONTEXT_MENU,
PROP_ENABLE_SITE_SPECIFIC_QUIRKS,
- PROP_ENABLE_PAGE_CACHE
+ PROP_ENABLE_PAGE_CACHE,
+ PROP_AUTO_RESIZE_WINDOW
};
// Create a default user agent string
@@ -759,6 +761,27 @@ static void webkit_web_settings_class_init(WebKitWebSettingsClass* klass)
FALSE,
flags));
+ /**
+ * WebKitWebSettings:auto-resize-window:
+ *
+ * Web pages can request to modify the size and position of the
+ * window containing the #WebKitWebView through various DOM methods
+ * (resizeTo, moveTo, resizeBy, moveBy). By default WebKit will not
+ * honor this requests, but you can set this property to %TRUE if
+ * you'd like it to do so. If you wish to handle this manually, you
+ * can connect to the notify signal for the
+ * #WebKitWebWindowFeatures of your #WebKitWebView.
+ *
+ * Since: 1.1.22
+ */
+ g_object_class_install_property(gobject_class,
+ PROP_AUTO_RESIZE_WINDOW,
+ g_param_spec_boolean("auto-resize-window",
+ _("Auto Resize Window"),
+ _("Automatically resize the toplevel window when a page requests it"),
+ FALSE,
+ flags));
+
g_type_class_add_private(klass, sizeof(WebKitWebSettingsPrivate));
}
@@ -967,6 +990,9 @@ static void webkit_web_settings_set_property(GObject* object, guint prop_id, con
case PROP_ENABLE_PAGE_CACHE:
priv->enable_page_cache = g_value_get_boolean(value);
break;
+ case PROP_AUTO_RESIZE_WINDOW:
+ priv->auto_resize_window = g_value_get_boolean(value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
@@ -1093,6 +1119,9 @@ static void webkit_web_settings_get_property(GObject* object, guint prop_id, GVa
case PROP_ENABLE_PAGE_CACHE:
g_value_set_boolean(value, priv->enable_page_cache);
break;
+ case PROP_AUTO_RESIZE_WINDOW:
+ g_value_set_boolean(value, priv->auto_resize_window);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
@@ -1162,6 +1191,7 @@ WebKitWebSettings* webkit_web_settings_copy(WebKitWebSettings* web_settings)
"enable-default-context-menu", priv->enable_default_context_menu,
"enable-site-specific-quirks", priv->enable_site_specific_quirks,
"enable-page-cache", priv->enable_page_cache,
+ "auto-resize-window", priv->auto_resize_window,
NULL));
return copy;
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 43167bc..4f79559 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-16 Xan Lopez <xlopez at igalia.com>
+
+ Reviewed by Gustavo Noronha.
+
+ Enable 'auto-resize-window' in our DRT.
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (resetDefaultsToConsistentValues):
+
2010-02-15 Martin Robinson <mrobinson at webkit.org>
Reviewed by Darin Adler.
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 39430cf..897645f 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -335,6 +335,7 @@ static void resetDefaultsToConsistentValues()
"minimum-font-size", 1,
"enable-caret-browsing", FALSE,
"enable-page-cache", FALSE,
+ "auto-resize-window", TRUE,
NULL);
webkit_web_frame_clear_main_frame_name(mainFrame);
diff --git a/configure.ac b/configure.ac
index d46da24..3b1ddd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.59)
m4_define([webkit_major_version], [1])
m4_define([webkit_minor_version], [1])
-m4_define([webkit_micro_version], [21])
+m4_define([webkit_micro_version], [22])
# This is the version we'll be using as part of our User-Agent string
# e.g., AppleWebKit/$(webkit_user_agent_version) ...
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list