Diff
Modified: trunk/LayoutTests/ChangeLog (90783 => 90784)
--- trunk/LayoutTests/ChangeLog 2011-07-11 21:52:14 UTC (rev 90783)
+++ trunk/LayoutTests/ChangeLog 2011-07-11 22:00:11 UTC (rev 90784)
@@ -1,3 +1,12 @@
+2011-07-11 Yi Shen <yi.4.s...@nokia.com>
+
+ [Qt] Unreviewed rollout 90779 which may fail the layout-test.
+
+ * loader/load-defer-resume-crash-expected.txt: Removed.
+ * loader/load-defer-resume-crash.html: Removed.
+ * loader/resources/images.html: Removed.
+ * platform/chromium/test_expectations.txt:
+
2011-07-11 Jessie Berlin <jber...@apple.com>
WebKitTestRunner needs an implementation of layoutTestController.setDefersLoading.
Deleted: trunk/LayoutTests/loader/load-defer-resume-crash-expected.txt (90783 => 90784)
--- trunk/LayoutTests/loader/load-defer-resume-crash-expected.txt 2011-07-11 21:52:14 UTC (rev 90783)
+++ trunk/LayoutTests/loader/load-defer-resume-crash-expected.txt 2011-07-11 22:00:11 UTC (rev 90784)
@@ -1,3 +0,0 @@
-For the test to pass there should be no crash.
-
-
Deleted: trunk/LayoutTests/loader/load-defer-resume-crash.html (90783 => 90784)
--- trunk/LayoutTests/loader/load-defer-resume-crash.html 2011-07-11 21:52:14 UTC (rev 90783)
+++ trunk/LayoutTests/loader/load-defer-resume-crash.html 2011-07-11 22:00:11 UTC (rev 90784)
@@ -1,24 +0,0 @@
-<html>
-<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
-}
-
-function run() {
- var frameElement = document.createElement('iframe')
- frameElement.setAttribute("src", "resources/images.html");
- document.getElementById("frameDiv").appendChild(frameElement);
- if (window.layoutTestController) {
- layoutTestController.setDefersLoading(true);
- setTimeout("layoutTestController.setDefersLoading(false);layoutTestController.notifyDone();",1000);
- } else
- alert("Deferring loads");
-}
-
-</script>
-<body _onload_='run()'>
-<p>For the test to pass there should be no crash.</p>
-<div id="frameDiv"></div>
-</body>
-</html>
Deleted: trunk/LayoutTests/loader/resources/images.html (90783 => 90784)
--- trunk/LayoutTests/loader/resources/images.html 2011-07-11 21:52:14 UTC (rev 90783)
+++ trunk/LayoutTests/loader/resources/images.html 2011-07-11 22:00:11 UTC (rev 90784)
@@ -1,6 +0,0 @@
-<html>
-<body>
-<img border="0" src=""
-<img border="0" src=""
-</body>
-</html>
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (90783 => 90784)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-07-11 21:52:14 UTC (rev 90783)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-07-11 22:00:11 UTC (rev 90784)
@@ -212,7 +212,6 @@
// Unskip after implementing LayoutTestController::setDefersLoading and ::goBack.
BUGWK60877 SKIP : loader/navigation-while-deferring-loads.html = FAIL
-BUGWK60877 SKIP : loader/load-defer-resume-crash.html = FAIL
// Skipped until new WebSocket protocol is implemented.
BUGWK50099 SKIP : http/tests/websocket/tests/hybi/ = PASS FAIL TIMEOUT
Modified: trunk/Source/WebCore/ChangeLog (90783 => 90784)
--- trunk/Source/WebCore/ChangeLog 2011-07-11 21:52:14 UTC (rev 90783)
+++ trunk/Source/WebCore/ChangeLog 2011-07-11 22:00:11 UTC (rev 90784)
@@ -1,3 +1,11 @@
+2011-07-11 Yi Shen <yi.4.s...@nokia.com>
+
+ [Qt] Unreviewed rollout 90779 which may fail the layout-test.
+
+ * platform/network/qt/QNetworkReplyHandler.cpp:
+ (WebCore::QNetworkReplyHandlerCallQueue::setDeferSignals):
+ * platform/network/qt/QNetworkReplyHandler.h:
+
2011-07-11 Bradley Nelson <bradnel...@chromium.org>
Reviewed by Darin Fisher.
Modified: trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp (90783 => 90784)
--- trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp 2011-07-11 21:52:14 UTC (rev 90783)
+++ trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp 2011-07-11 22:00:11 UTC (rev 90784)
@@ -181,7 +181,7 @@
void QNetworkReplyHandlerCallQueue::setDeferSignals(bool defer)
{
m_deferSignals = defer;
- QMetaObject::invokeMethod(this, "flush", Qt::QueuedConnection);
+ flush();
}
void QNetworkReplyHandlerCallQueue::flush()
Modified: trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.h (90783 => 90784)
--- trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.h 2011-07-11 21:52:14 UTC (rev 90783)
+++ trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.h 2011-07-11 22:00:11 UTC (rev 90784)
@@ -41,8 +41,7 @@
class ResourceResponse;
class QNetworkReplyHandler;
-class QNetworkReplyHandlerCallQueue : public QObject {
- Q_OBJECT
+class QNetworkReplyHandlerCallQueue {
public:
QNetworkReplyHandlerCallQueue(QNetworkReplyHandler*, bool deferSignals);
bool deferSignals() const { return m_deferSignals; }
@@ -61,7 +60,7 @@
bool m_flushing;
QList<EnqueuedCall> m_enqueuedCalls;
- Q_INVOKABLE void flush();
+ void flush();
};
class QNetworkReplyWrapper : public QObject {
