[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
ossy at webkit.org
ossy at webkit.org
Wed Dec 22 15:33:33 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 381e82612a07aa435a1fdc0fe6d7a07c8c08fa9d
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 8 11:58:57 2010 +0000
2010-11-08 Csaba Osztrogonac <ossy at webkit.org>
Unreviewed, rolling out r71466.
http://trac.webkit.org/changeset/71466
https://bugs.webkit.org/show_bug.cgi?id=48865
It broke layout tests on GTK bots.
* WebCoreSupport/ChromeClientGtk.cpp:
(WebKit::ChromeClient::closeWindowSoon):
* webkit/webkitprivate.h:
* webkit/webkitwebview.cpp:
(webkit_web_view_init):
(webkit_web_view_set_group_name):
2010-11-08 Csaba Osztrogonac <ossy at webkit.org>
Unreviewed, rolling out r71466.
http://trac.webkit.org/changeset/71466
https://bugs.webkit.org/show_bug.cgi?id=48865
It broke layout tests on GTK bots.
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(createWebView):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71510 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index ea8b042..9765c39 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-08 Csaba Osztrogonac <ossy at webkit.org>
+
+ Unreviewed, rolling out r71466.
+ http://trac.webkit.org/changeset/71466
+ https://bugs.webkit.org/show_bug.cgi?id=48865
+
+ It broke layout tests on GTK bots.
+
+ * WebCoreSupport/ChromeClientGtk.cpp:
+ (WebKit::ChromeClient::closeWindowSoon):
+ * webkit/webkitprivate.h:
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_init):
+ (webkit_web_view_set_group_name):
+
2010-11-07 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
index f330fca..e864ea7 100644
--- a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
@@ -255,6 +255,10 @@ void ChromeClient::closeWindowSoon()
if (isHandled)
return;
+
+ // FIXME: should we clear the frame group name here explicitly? Mac does it.
+ // But this gets cleared in Page's destructor anyway.
+ // webkit_web_view_set_group_name(m_webView, "");
}
bool ChromeClient::canTakeFocus(FocusDirection)
diff --git a/WebKit/gtk/webkit/webkitprivate.h b/WebKit/gtk/webkit/webkitprivate.h
index 7385677..3ac3563 100644
--- a/WebKit/gtk/webkit/webkitprivate.h
+++ b/WebKit/gtk/webkit/webkitprivate.h
@@ -388,6 +388,9 @@ extern "C" {
webkit_web_view_get_selected_text (WebKitWebView* web_view);
WEBKIT_API void
+ webkit_web_view_set_group_name(WebKitWebView* web_view, const gchar* group_name);
+
+ WEBKIT_API void
webkit_web_settings_add_extra_plugin_directory (WebKitWebView *web_view, const gchar* directory);
GSList*
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index f419ff7..314da16 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -3248,12 +3248,6 @@ static void webkit_web_view_init(WebKitWebView* webView)
pageClients.inspectorClient = new WebKit::InspectorClient(webView);
priv->corePage = new Page(pageClients);
- // Pages within a same session need to be linked together otherwise some functionalities such
- // as visited link coloration (across pages) and changing popup window location will not work.
- // To keep the default behavior simple (and because no PageGroup API exist in WebKitGTK at the
- // time of writing this comment), we simply set all the pages to the same group.
- priv->corePage->setGroupName("WebKitGTK");
-
// We also add a simple wrapper class to provide the public
// interface for the Web Inspector.
priv->webInspector = adoptPlatformRef(WEBKIT_WEB_INSPECTOR(g_object_new(WEBKIT_TYPE_WEB_INSPECTOR, NULL)));
@@ -4519,6 +4513,18 @@ void webkit_web_view_move_cursor(WebKitWebView* webView, GtkMovementStep step, g
g_signal_emit(webView, webkit_web_view_signals[MOVE_CURSOR], 0, step, count, &handled);
}
+void webkit_web_view_set_group_name(WebKitWebView* webView, const gchar* groupName)
+{
+ g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
+
+ WebKitWebViewPrivate* priv = webView->priv;
+
+ if (!priv->corePage)
+ return;
+
+ priv->corePage->setGroupName(String::fromUTF8(groupName));
+}
+
/**
* webkit_web_view_can_undo:
* @webView: a #WebKitWebView
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index cf231bb..1ae1a4e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-08 Csaba Osztrogonac <ossy at webkit.org>
+
+ Unreviewed, rolling out r71466.
+ http://trac.webkit.org/changeset/71466
+ https://bugs.webkit.org/show_bug.cgi?id=48865
+
+ It broke layout tests on GTK bots.
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (createWebView):
+
2010-11-08 Gabor Rapcsanyi <rgabor at inf.u-szeged.hu>
Reviewed by Csaba Osztrogonác.
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 5aa61e3..54acc49 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -69,6 +69,7 @@ extern guint webkit_web_frame_get_pending_unload_event_count(WebKitWebFrame* fra
extern void webkit_web_settings_add_extra_plugin_directory(WebKitWebView* view, const gchar* directory);
extern gchar* webkit_web_frame_get_response_mime_type(WebKitWebFrame* frame);
extern void webkit_web_frame_clear_main_frame_name(WebKitWebFrame* frame);
+extern void webkit_web_view_set_group_name(WebKitWebView* view, const gchar* groupName);
extern void webkit_reset_origin_access_white_lists();
}
@@ -999,6 +1000,10 @@ static WebKitWebView* createWebView()
DumpRenderTreeSupportGtk::setDumpRenderTreeModeEnabled(true);
+ // From bug 11756: Use a frame group name for all WebViews created by
+ // DumpRenderTree to allow testing of cross-page frame lookup.
+ webkit_web_view_set_group_name(view, "org.webkit.gtk.DumpRenderTree");
+
g_object_connect(G_OBJECT(view),
"signal::load-started", webViewLoadStarted, 0,
"signal::load-finished", webViewLoadFinished, 0,
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list