Diff
Modified: trunk/LayoutTests/ChangeLog (90177 => 90178)
--- trunk/LayoutTests/ChangeLog 2011-06-30 23:08:11 UTC (rev 90177)
+++ trunk/LayoutTests/ChangeLog 2011-06-30 23:09:50 UTC (rev 90178)
@@ -1,3 +1,15 @@
+2011-06-27 Diego Gonzalez <[email protected]>
+
+ Reviewed by Antonio Gomes.
+
+ [Qt] DRT: Provide LayoutTestController::setDefersLoading and ::goBack support
+ https://bugs.webkit.org/show_bug.cgi?id=63489
+
+ Unskipped:
+ loader/navigation-while-deferring-loads.html
+
+ * platform/qt/Skipped:
+
2011-06-30 Alan Stearns <[email protected]>
Reviewed by Tony Chang.
Modified: trunk/LayoutTests/platform/qt/Skipped (90177 => 90178)
--- trunk/LayoutTests/platform/qt/Skipped 2011-06-30 23:08:11 UTC (rev 90177)
+++ trunk/LayoutTests/platform/qt/Skipped 2011-06-30 23:09:50 UTC (rev 90178)
@@ -2495,9 +2495,6 @@
http/tests/inspector/network/download.html
http/tests/inspector/network/x-frame-options-deny.html
-# Unskip after implementing LayoutTestController::setDefersLoading and ::goBack.
-loader/navigation-while-deferring-loads.html
-
# [Qt]fast/events/remove-target-in-mouseup* tests fail
# https://bugs.webkit.org/show_bug.cgi?id=60833
fast/events/remove-target-in-mouseup-deep.html
Modified: trunk/Source/WebKit/qt/ChangeLog (90177 => 90178)
--- trunk/Source/WebKit/qt/ChangeLog 2011-06-30 23:08:11 UTC (rev 90177)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-06-30 23:09:50 UTC (rev 90178)
@@ -1,3 +1,18 @@
+2011-06-27 Diego Gonzalez <[email protected]>
+
+ Reviewed by Antonio Gomes.
+
+ [Qt] DRT: Provide LayoutTestController::setDefersLoading and ::goBack support
+ https://bugs.webkit.org/show_bug.cgi?id=63489
+
+ Unskipped:
+ loader/navigation-while-deferring-loads.html
+
+ * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+ (DumpRenderTreeSupportQt::setDefersLoading):
+ (DumpRenderTreeSupportQt::goBack):
+ * WebCoreSupport/DumpRenderTreeSupportQt.h:
+
2011-06-30 Fabrizio Machado <[email protected]>
Reviewed by Benjamin Poulain.
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (90177 => 90178)
--- trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2011-06-30 23:08:11 UTC (rev 90177)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2011-06-30 23:09:50 UTC (rev 90178)
@@ -990,6 +990,20 @@
return res;
}
+void DumpRenderTreeSupportQt::setDefersLoading(QWebPage* page, bool flag)
+{
+ Page* corePage = QWebPagePrivate::core(page);
+ if (corePage)
+ corePage->setDefersLoading(flag);
+}
+
+void DumpRenderTreeSupportQt::goBack(QWebPage* page)
+{
+ Page* corePage = QWebPagePrivate::core(page);
+ if (corePage)
+ corePage->goBack();
+}
+
// API Candidate?
QString DumpRenderTreeSupportQt::responseMimeType(QWebFrame* frame)
{
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h (90177 => 90178)
--- trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h 2011-06-30 23:08:11 UTC (rev 90177)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h 2011-06-30 23:09:50 UTC (rev 90178)
@@ -214,6 +214,9 @@
static void injectInternalsObject(QWebFrame*);
static void setInteractiveFormValidationEnabled(QWebPage*, bool);
+
+ static void setDefersLoading(QWebPage*, bool flag);
+ static void goBack(QWebPage*);
};
#endif
Modified: trunk/Tools/ChangeLog (90177 => 90178)
--- trunk/Tools/ChangeLog 2011-06-30 23:08:11 UTC (rev 90177)
+++ trunk/Tools/ChangeLog 2011-06-30 23:09:50 UTC (rev 90178)
@@ -1,3 +1,18 @@
+2011-06-27 Diego Gonzalez <[email protected]>
+
+ Reviewed by Antonio Gomes.
+
+ [Qt] DRT: Provide LayoutTestController::setDefersLoading and ::goBack support
+ https://bugs.webkit.org/show_bug.cgi?id=63489
+
+ Unskipped:
+ loader/navigation-while-deferring-loads.html
+
+ * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+ (LayoutTestController::goBack):
+ (LayoutTestController::setDefersLoading):
+ * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
2011-06-30 Adam Barth <[email protected]>
Reviewed by Dirk Pranke.
Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (90177 => 90178)
--- trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp 2011-06-30 23:08:11 UTC (rev 90177)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp 2011-06-30 23:09:50 UTC (rev 90178)
@@ -201,6 +201,7 @@
m_drt->layoutTestController()->setFrameFlatteningEnabled(false);
m_drt->layoutTestController()->setSmartInsertDeleteEnabled(true);
m_drt->layoutTestController()->setSelectTrailingWhitespaceEnabled(false);
+ m_drt->layoutTestController()->setDefersLoading(false);
// globalSettings must be reset explicitly.
m_drt->layoutTestController()->setXSSAuditorEnabled(false);
Modified: trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (90177 => 90178)
--- trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp 2011-06-30 23:08:11 UTC (rev 90177)
+++ trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp 2011-06-30 23:09:50 UTC (rev 90178)
@@ -414,6 +414,16 @@
DumpRenderTreeSupportQt::setFrameFlatteningEnabled(m_drt->webPage(), enabled);
}
+void LayoutTestController::goBack()
+{
+ DumpRenderTreeSupportQt::goBack(m_drt->webPage());
+}
+
+void LayoutTestController::setDefersLoading(bool flag)
+{
+ DumpRenderTreeSupportQt::setDefersLoading(m_drt->webPage(), flag);
+}
+
void LayoutTestController::setAllowUniversalAccessFromFileURLs(bool enabled)
{
m_drt->webPage()->settings()->setAttribute(QWebSettings::LocalContentCanAccessRemoteUrls, enabled);
Modified: trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h (90177 => 90178)
--- trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h 2011-06-30 23:08:11 UTC (rev 90177)
+++ trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.h 2011-06-30 23:09:50 UTC (rev 90178)
@@ -146,7 +146,6 @@
void closeWebInspector();
void evaluateInWebInspector(long callId, const QString& script);
void removeAllVisitedLinks();
-
void setMediaType(const QString& type);
void setFrameFlatteningEnabled(bool enable);
void setAllowUniversalAccessFromFileURLs(bool enable);
@@ -270,6 +269,8 @@
void syncLocalStorage();
QString layerTreeAsText();
void setTextDirection(const QString& directionName);
+ void goBack();
+ void setDefersLoading(bool);
private slots:
void processWork();
