Diff
Modified: trunk/LayoutTests/ChangeLog (108458 => 108459)
--- trunk/LayoutTests/ChangeLog 2012-02-22 08:54:57 UTC (rev 108458)
+++ trunk/LayoutTests/ChangeLog 2012-02-22 08:55:46 UTC (rev 108459)
@@ -1,3 +1,13 @@
+2012-02-22 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed, rolling out r107351.
+ http://trac.webkit.org/changeset/107351
+ https://bugs.webkit.org/show_bug.cgi?id=53600
+
+ Several issues introduced in WebKitGTK+ API
+
+ * platform/gtk/Skipped:
+
2012-02-22 Philippe Normand <[email protected]>
Unreviewed, GTK gardening.
Modified: trunk/LayoutTests/platform/gtk/Skipped (108458 => 108459)
--- trunk/LayoutTests/platform/gtk/Skipped 2012-02-22 08:54:57 UTC (rev 108458)
+++ trunk/LayoutTests/platform/gtk/Skipped 2012-02-22 08:55:46 UTC (rev 108459)
@@ -940,9 +940,35 @@
canvas/philip/tests/2d.pattern.paint.repeaty.coord1.html
canvas/philip/tests/2d.pattern.paint.repeaty.outside.html
-# This modal dialog test still fails because the blur event is not dispatched on the opener
-# window when running the modal dialog.
+# Tests that user modal dialogs fail in the DRT for some reason.
+# https://bugs.webkit.org/show_bug.cgi?id=53600
+fast/animation/request-animation-frame-during-modal.html
fast/events/show-modal-dialog-onblur-onfocus.html
+fast/events/scroll-event-during-modal-dialog.html
+fast/harness/show-modal-dialog.html
+inspector/console/console-long-eval-crash.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T10.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T11.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T2.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T2.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T4.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T4.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T6.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T6.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T8.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T8.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T10.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T11.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T1.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T1.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T3.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T3.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T5.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T5.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T7.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T7.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.1_T9.html
+sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.2_Eval_Code/S10.2.2_A1.2_T9.html
# pastes a space instead of a tab
# https://bugs.webkit.org/show_bug.cgi?id=38437
Modified: trunk/Source/WebKit/gtk/ChangeLog (108458 => 108459)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-02-22 08:54:57 UTC (rev 108458)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-02-22 08:55:46 UTC (rev 108459)
@@ -1,3 +1,21 @@
+2012-02-22 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed, rolling out r107351.
+ http://trac.webkit.org/changeset/107351
+ https://bugs.webkit.org/show_bug.cgi?id=53600
+
+ Several issues introduced in WebKitGTK+ API
+
+ * WebCoreSupport/ChromeClientGtk.cpp:
+ (WebKit::ChromeClient::ChromeClient):
+ (WebKit::ChromeClient::chromeDestroyed):
+ (WebKit::ChromeClient::canRunModal):
+ (WebKit::ChromeClient::runModal):
+ * WebCoreSupport/ChromeClientGtk.h:
+ (ChromeClient):
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_class_init):
+
2012-02-21 Philippe Normand <[email protected]>
Fix one more GTK+ unit test after r108278.
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp (108458 => 108459)
--- trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp 2012-02-22 08:54:57 UTC (rev 108458)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp 2012-02-22 08:55:46 UTC (rev 108459)
@@ -79,7 +79,6 @@
: m_webView(webView)
, m_adjustmentWatcher(webView)
, m_closeSoonTimer(0)
- , m_modalLoop(0)
, m_displayTimer(this, &ChromeClient::paint)
, m_lastDisplayTime(0)
, m_repaintSoonSourceId(0)
@@ -95,9 +94,6 @@
if (m_repaintSoonSourceId)
g_source_remove(m_repaintSoonSourceId);
- if (m_modalLoop)
- g_main_loop_quit(m_modalLoop);
-
delete this;
}
@@ -184,26 +180,13 @@
bool ChromeClient::canRunModal()
{
- return true;
+ notImplemented();
+ return false;
}
void ChromeClient::runModal()
{
- gboolean isHandled = false;
- g_signal_emit_by_name(m_webView, "run-modal-dialog", &isHandled);
- if (!isHandled)
- return;
-
- GMainContext* threadDefaultContext = g_main_context_ref_thread_default();
- g_main_context_acquire(threadDefaultContext);
-
- m_modalLoop = g_main_loop_new(threadDefaultContext, FALSE);
- g_main_loop_run(m_modalLoop);
- g_main_loop_unref(m_modalLoop);
- m_modalLoop = 0;
-
- g_main_context_release(threadDefaultContext);
- g_main_context_unref(threadDefaultContext);
+ notImplemented();
}
void ChromeClient::setToolbarsVisible(bool visible)
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h (108458 => 108459)
--- trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h 2012-02-22 08:54:57 UTC (rev 108458)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.h 2012-02-22 08:55:46 UTC (rev 108459)
@@ -177,7 +177,6 @@
GtkAdjustmentWatcher m_adjustmentWatcher;
KURL m_hoveredLinkURL;
unsigned int m_closeSoonTimer;
- GMainLoop* m_modalLoop;
Timer <ChromeClient> m_displayTimer;
Region m_dirtyRegion;
Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (108458 => 108459)
--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2012-02-22 08:54:57 UTC (rev 108458)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2012-02-22 08:55:46 UTC (rev 108459)
@@ -212,7 +212,6 @@
RESOURCE_LOAD_FINISHED,
RESOURCE_CONTENT_LENGTH_RECEIVED,
RESOURCE_LOAD_FAILED,
- RUN_MODAL_DIALOG,
LAST_SIGNAL
};
@@ -2744,27 +2743,6 @@
G_TYPE_POINTER);
/*
- * WebKitWebView::run-modal-dialog
- * @webView: the object which received the signal
- *
- * Invoked when the @webView should be run in the modal mode. This can be
- * avoided if FALSE is returned in the signal handler. Otherwise, the
- * @webView (or its toplevel window) should be made transient for its parent,
- * set as a modal window, and TRUE should be returned in the signal handler.
- * After that, a loop will be created and run until the @webView is closed
- * (i.e. its chrome is destroyed).
- *
- * Since: 1.7.6
- */
- webkit_web_view_signals[RESOURCE_LOAD_FAILED] = g_signal_new("run-modal-dialog",
- G_TYPE_FROM_CLASS(webViewClass),
- G_SIGNAL_RUN_LAST,
- 0,
- g_signal_accumulator_true_handled, NULL,
- webkit_marshal_BOOLEAN__VOID,
- G_TYPE_BOOLEAN, 0);
-
- /*
* implementations of virtual methods
*/
webViewClass->create_web_view = webkit_web_view_real_create_web_view;
Modified: trunk/Tools/ChangeLog (108458 => 108459)
--- trunk/Tools/ChangeLog 2012-02-22 08:54:57 UTC (rev 108458)
+++ trunk/Tools/ChangeLog 2012-02-22 08:55:46 UTC (rev 108459)
@@ -1,3 +1,19 @@
+2012-02-22 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed, rolling out r107351.
+ http://trac.webkit.org/changeset/107351
+ https://bugs.webkit.org/show_bug.cgi?id=53600
+
+ Several issues introduced in WebKitGTK+ API
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (createWebView):
+ * GtkLauncher/main.c:
+ (createWebViewCb):
+ (createBrowser):
+ (createWindow):
+ (main):
+
2012-02-21 Filip Pizlo <[email protected]>
JSC should be a triple-tier VM
Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (108458 => 108459)
--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-02-22 08:54:57 UTC (rev 108458)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-02-22 08:55:46 UTC (rev 108459)
@@ -957,15 +957,6 @@
return TRUE;
}
-static gboolean webViewRunModalDialog(WebKitWebView* view)
-{
- GtkWindow* viewTopLevel = GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(view)));
- gtk_window_set_transient_for(GTK_WINDOW(viewTopLevel), GTK_WINDOW(window));
- gtk_window_set_modal(GTK_WINDOW(viewTopLevel), TRUE);
-
- return TRUE;
-}
-
static void databaseQuotaExceeded(WebKitWebView* view, WebKitWebFrame* frame, WebKitWebDatabase *database)
{
ASSERT(view);
@@ -1291,7 +1282,6 @@
"signal::status-bar-text-changed", webViewStatusBarTextChanged, 0,
"signal::create-web-view", webViewCreate, 0,
"signal::close-web-view", webViewClose, 0,
- "signal::run-modal-dialog", webViewRunModalDialog, 0,
"signal::database-quota-exceeded", databaseQuotaExceeded, 0,
"signal::document-load-finished", webViewDocumentLoadFinished, 0,
"signal::geolocation-policy-decision-requested", geolocationPolicyDecisionRequested, 0,
Modified: trunk/Tools/GtkLauncher/main.c (108458 => 108459)
--- trunk/Tools/GtkLauncher/main.c 2012-02-22 08:54:57 UTC (rev 108458)
+++ trunk/Tools/GtkLauncher/main.c 2012-02-22 08:55:46 UTC (rev 108459)
@@ -33,7 +33,7 @@
static gint windowCount = 0;
-static GtkWidget* createWindow(WebKitWebView** outWebView, GtkWidget* openerWindow);
+static GtkWidget* createWindow(WebKitWebView** outWebView);
static void activateUriEntryCb(GtkWidget* entry, gpointer data)
{
@@ -105,7 +105,7 @@
createWebViewCb(WebKitWebView* webView, WebKitWebFrame* web_frame, GtkWidget* window)
{
WebKitWebView *newWebView;
- createWindow(&newWebView, window);
+ createWindow(&newWebView);
webkit_web_view_set_settings(newWebView, webkit_web_view_get_settings(webView));
return newWebView;
}
@@ -123,19 +123,8 @@
return TRUE;
}
-static gboolean runModalDialogCb(WebKitWebView* webView, GtkWidget* openerWindow)
+static GtkWidget* createBrowser(GtkWidget* window, GtkWidget* uriEntry, GtkWidget* statusbar, WebKitWebView* webView)
{
- if (!openerWindow)
- return FALSE;
-
- GtkWidget *window = gtk_widget_get_toplevel(GTK_WIDGET(webView));
- gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(openerWindow));
- gtk_window_set_modal(GTK_WINDOW(window), TRUE);
- return TRUE;
-}
-
-static GtkWidget* createBrowser(GtkWidget* window, GtkWidget* uriEntry, GtkWidget* statusbar, WebKitWebView* webView, GtkWidget* openerWindow)
-{
GtkWidget *scrolledWindow = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -148,7 +137,6 @@
g_signal_connect(webView, "create-web-view", G_CALLBACK(createWebViewCb), window);
g_signal_connect(webView, "web-view-ready", G_CALLBACK(webViewReadyCb), window);
g_signal_connect(webView, "close-web-view", G_CALLBACK(closeWebViewCb), window);
- g_signal_connect(webView, "run-modal-dialog", G_CALLBACK(runModalDialogCb), openerWindow);
return scrolledWindow;
}
@@ -202,7 +190,7 @@
return toolbar;
}
-static GtkWidget* createWindow(WebKitWebView** outWebView, GtkWidget* openerWindow)
+static GtkWidget* createWindow(WebKitWebView** outWebView)
{
WebKitWebView *webView;
GtkWidget *vbox;
@@ -226,7 +214,7 @@
#endif
statusbar = createStatusbar(webView);
gtk_box_pack_start(GTK_BOX(vbox), createToolbar(uriEntry, webView), FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox), createBrowser(window, uriEntry, statusbar, webView, openerWindow), TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(vbox), createBrowser(window, uriEntry, statusbar, webView), TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), statusbar, FALSE, FALSE, 0);
gtk_container_add(GTK_CONTAINER(window), vbox);
@@ -429,7 +417,7 @@
#endif
WebKitWebView *webView;
- GtkWidget *main_window = createWindow(&webView, 0);
+ GtkWidget *main_window = createWindow(&webView);
if (webkitSettings) {
webkit_web_view_set_settings(WEBKIT_WEB_VIEW(webView), webkitSettings);
