[Qt] Unreviewed rollout 90779 which may fail the layout-test.
authoryi.4.shen@nokia.com <yi.4.shen@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 11 Jul 2011 22:00:11 +0000 (22:00 +0000)
committeryi.4.shen@nokia.com <yi.4.shen@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 11 Jul 2011 22:00:11 +0000 (22:00 +0000)
Source/WebCore:

* platform/network/qt/QNetworkReplyHandler.cpp:
(WebCore::QNetworkReplyHandlerCallQueue::setDeferSignals):
* platform/network/qt/QNetworkReplyHandler.h:

LayoutTests:

* 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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@90784 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/loader/load-defer-resume-crash-expected.txt [deleted file]
LayoutTests/loader/load-defer-resume-crash.html [deleted file]
LayoutTests/loader/resources/images.html [deleted file]
LayoutTests/platform/chromium/test_expectations.txt
Source/WebCore/ChangeLog
Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
Source/WebCore/platform/network/qt/QNetworkReplyHandler.h

index c9ee416..d289acb 100644 (file)
@@ -1,3 +1,12 @@
+2011-07-11  Yi Shen  <yi.4.shen@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  <jberlin@apple.com>
 
         WebKitTestRunner needs an implementation of layoutTestController.setDefersLoading.
diff --git a/LayoutTests/loader/load-defer-resume-crash-expected.txt b/LayoutTests/loader/load-defer-resume-crash-expected.txt
deleted file mode 100644 (file)
index d6bfd6c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-For the test to pass there should be no crash.
-
-
diff --git a/LayoutTests/loader/load-defer-resume-crash.html b/LayoutTests/loader/load-defer-resume-crash.html
deleted file mode 100644 (file)
index 560cfc9..0000000
+++ /dev/null
@@ -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>
diff --git a/LayoutTests/loader/resources/images.html b/LayoutTests/loader/resources/images.html
deleted file mode 100644 (file)
index 2220299..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<body>
-<img border="0" src="image1.png"/>
-<img border="0" src="image2.png"/>
-</body>
-</html>
index 2116db5..c3f184d 100644 (file)
@@ -212,7 +212,6 @@ WONTFIX SKIP : animations/animation-api-1.html = FAIL
 
 // 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
index 20db1ba..38e4f15 100644 (file)
@@ -1,3 +1,11 @@
+2011-07-11  Yi Shen  <yi.4.shen@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  <bradnelson@chromium.org>
 
         Reviewed by Darin Fisher.
index 6bead38..9e1b81d 100644 (file)
@@ -181,7 +181,7 @@ void QNetworkReplyHandlerCallQueue::unlock()
 void QNetworkReplyHandlerCallQueue::setDeferSignals(bool defer)
 {
     m_deferSignals = defer;
-    QMetaObject::invokeMethod(this, "flush",  Qt::QueuedConnection);
+    flush();
 }
 
 void QNetworkReplyHandlerCallQueue::flush()
index 426fd6a..6150120 100644 (file)
@@ -41,8 +41,7 @@ class ResourceRequest;
 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 @@ private:
     bool m_flushing;
     QList<EnqueuedCall> m_enqueuedCalls;
 
-    Q_INVOKABLE void flush();
+    void flush();
 };
 
 class QNetworkReplyWrapper : public QObject {