Diff
Modified: trunk/LayoutTests/ChangeLog (116145 => 116146)
--- trunk/LayoutTests/ChangeLog 2012-05-04 19:44:47 UTC (rev 116145)
+++ trunk/LayoutTests/ChangeLog 2012-05-04 19:45:03 UTC (rev 116146)
@@ -1,3 +1,16 @@
+2012-05-04 Sudarsana Nagineni <[email protected]>
+
+ [GTK] DRT needs an implementation of LayoutTestController::setDefersLoading and ::goBack
+ https://bugs.webkit.org/show_bug.cgi?id=85134
+
+ Reviewed by Martin Robinson.
+
+ Unskip loader/navigation-while-deferring-loads.html and disable
+ loader/load-defer-resume-crash.html as it triggers an assertion
+ failure.
+
+ * platform/gtk/test_expectations.txt:
+
2012-05-04 Andy Estes <[email protected]>
REGRESSION (r116009): image no longer visible on fast/block/float/float-not-removed-from-next-sibling4.html
Modified: trunk/LayoutTests/platform/gtk/test_expectations.txt (116145 => 116146)
--- trunk/LayoutTests/platform/gtk/test_expectations.txt 2012-05-04 19:44:47 UTC (rev 116145)
+++ trunk/LayoutTests/platform/gtk/test_expectations.txt 2012-05-04 19:45:03 UTC (rev 116146)
@@ -1127,9 +1127,6 @@
// HTTP 204 (No Content) should be ignored
BUGWK60206 : http/tests/navigation/response204.html = FAIL
-// Unskip after implementing LayoutTestController::setDefersLoading and ::goBack.
-BUGWKGTK : loader/navigation-while-deferring-loads.html = FAIL
-
BUGWK61118 : fullscreen/full-screen-keyboard-enabled.html = FAIL
BUGWK61118 : fullscreen/full-screen-element-stack.html = FAIL
BUGWK61118 : fullscreen/full-screen-restrictions.html = FAIL
Modified: trunk/Source/WebKit/gtk/ChangeLog (116145 => 116146)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-05-04 19:44:47 UTC (rev 116145)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-05-04 19:45:03 UTC (rev 116146)
@@ -1,3 +1,17 @@
+2012-05-04 Sudarsana Nagineni <[email protected]>
+
+ [GTK] DRT needs an implementation of LayoutTestController::setDefersLoading and ::goBack
+ https://bugs.webkit.org/show_bug.cgi?id=85134
+
+ Reviewed by Martin Robinson.
+
+ Add support for setDefersLoading in DumpRenderTreeSupportGtk.
+
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::setDefersLoading):
+ * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+ (DumpRenderTreeSupportGtk):
+
2012-05-04 Martin Robinson <[email protected]>
Fix the GTK+ debug build after the r116114.
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (116145 => 116146)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-05-04 19:44:47 UTC (rev 116145)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-05-04 19:45:03 UTC (rev 116146)
@@ -609,6 +609,11 @@
return true;
}
+void DumpRenderTreeSupportGtk::setDefersLoading(WebKitWebView* webView, bool defers)
+{
+ core(webView)->setDefersLoading(defers);
+}
+
void DumpRenderTreeSupportGtk::setSmartInsertDeleteEnabled(WebKitWebView* webView, bool enabled)
{
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h (116145 => 116146)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2012-05-04 19:44:47 UTC (rev 116145)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2012-05-04 19:45:03 UTC (rev 116146)
@@ -93,6 +93,7 @@
static void setMinimumTimerInterval(WebKitWebView*, double);
static void rectangleForSelection(WebKitWebFrame*, cairo_rectangle_int_t*);
static void scalePageBy(WebKitWebView*, float, float, float);
+ static void setDefersLoading(WebKitWebView*, bool);
static void setSmartInsertDeleteEnabled(WebKitWebView*, bool);
// Accessibility
Modified: trunk/Tools/ChangeLog (116145 => 116146)
--- trunk/Tools/ChangeLog 2012-05-04 19:44:47 UTC (rev 116145)
+++ trunk/Tools/ChangeLog 2012-05-04 19:45:03 UTC (rev 116146)
@@ -1,3 +1,20 @@
+2012-05-04 Sudarsana Nagineni <[email protected]>
+
+ [GTK] DRT needs an implementation of LayoutTestController::setDefersLoading and ::goBack
+ https://bugs.webkit.org/show_bug.cgi?id=85134
+
+ Reviewed by Martin Robinson.
+
+ Add missing implementation setDefersLoading and goBack to GTK's
+ LayoutTestController so that the test case rely on these methods
+ can be enabled.
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (resetDefaultsToConsistentValues):
+ * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+ (LayoutTestController::goBack):
+ (LayoutTestController::setDefersLoading):
+
2012-05-04 Kristóf Kosztyó <[email protected]>
[Qt][NRWT] Run each DRT in it's own xvfb
Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (116145 => 116146)
--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-05-04 19:44:47 UTC (rev 116145)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-05-04 19:45:03 UTC (rev 116146)
@@ -449,6 +449,7 @@
webkit_icon_database_set_path(webkit_get_icon_database(), 0);
DumpRenderTreeSupportGtk::setSelectTrailingWhitespaceEnabled(false);
DumpRenderTreeSupportGtk::setSmartInsertDeleteEnabled(webView, true);
+ DumpRenderTreeSupportGtk::setDefersLoading(webView, false);
if (axController)
axController->resetToConsistentState();
Modified: trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp (116145 => 116146)
--- trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp 2012-05-04 19:44:47 UTC (rev 116145)
+++ trunk/Tools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp 2012-05-04 19:45:03 UTC (rev 116146)
@@ -752,12 +752,14 @@
void LayoutTestController::goBack()
{
- // FIXME: implement to enable loader/navigation-while-deferring-loads.html
+ WebKitWebView* webView = webkit_web_frame_get_web_view(mainFrame);
+ webkit_web_view_go_back(webView);
}
-void LayoutTestController::setDefersLoading(bool)
+void LayoutTestController::setDefersLoading(bool defers)
{
- // FIXME: implement to enable loader/navigation-while-deferring-loads.html
+ WebKitWebView* webView = webkit_web_frame_get_web_view(mainFrame);
+ DumpRenderTreeSupportGtk::setDefersLoading(webView, defers);
}
void LayoutTestController::setAppCacheMaximumSize(unsigned long long size)
