Changeset 91189 in webkit

Timestamp:

Jul 18, 2011 9:48:32 AM (13 years ago)

Author:

yi.4.shen@nokia.com

Message:

[Qt] ASSERTION FAILED in ResourceHandle::setDefersLoading causes crash
​https://bugs.webkit.org/show_bug.cgi?id=62808

Source/WebCore:

The assertion in ResourceHandle::setDefersLoading assumes asynchronous
content delivery -- To resume a page, first, its main resource loader
calls setDefersLoading to resume loading the main content; then all the
sub-resource loaders calls setDefersLoading to resume sub-contents.
However, since QNetworkReplyHandler delivers content synchronously,
some new sub-resource loaders get created as soon as the main resource
loader resumed, and all these new sub-resource loaders set their
defersLoading flag to false. Then, the assertion fails for these new
sub-resource loaders when calling setDefersLoading on them. As a fix,
this path makes QNetworkReplyHandler deliver content asynchronously
when its load type is set to SynchronousLoad.

Reviewed by Benjamin Poulain.

Test: loader/load-defer-resume-crash.html

• platform/network/qt/QNetworkReplyHandler.cpp:

(WebCore::QNetworkReplyHandlerCallQueue::setDeferSignals):

• platform/network/qt/QNetworkReplyHandler.h:

(WebCore::QNetworkReplyHandler::setLoadingDeferred):

LayoutTests:

Added a test for the crash occurs when load deferring is turned off.

Reviewed by Benjamin Poulain.

• loader/load-defer-resume-crash-expected.txt: Added.
• loader/load-defer-resume-crash.html: Added.
• loader/resources/images.html: Added.
• platform/chromium/test_expectations.txt: Skip this test since the LayoutTestController::setDefersLoading is not implemented for chromium.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/loader/load-defer-resume-crash-expected.txt (added)
• LayoutTests/loader/load-defer-resume-crash.html (added)
• LayoutTests/loader/resources/images.html (added)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp (modified) (1 diff)
• Source/WebCore/platform/network/qt/QNetworkReplyHandler.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-18  Yi Shen  <yi.4.shen@nokia.com>
+
+        [Qt] ASSERTION FAILED in ResourceHandle::setDefersLoading causes crash
+        https://bugs.webkit.org/show_bug.cgi?id=62808
+
+        Added a test for the crash occurs when load deferring is turned off.
+
+        Reviewed by Benjamin Poulain.
+
+        * loader/load-defer-resume-crash-expected.txt: Added.
+        * loader/load-defer-resume-crash.html: Added.
+        * loader/resources/images.html: Added.
+        * platform/chromium/test_expectations.txt: Skip this test since the LayoutTestController::setDefersLoading is not implemented for chromium.
+
 2011-07-18  Young Han Lee  <joybro@company100.net>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -161 +161 @@
 // 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.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-18  Yi Shen  <yi.4.shen@nokia.com>
+
+        [Qt] ASSERTION FAILED in ResourceHandle::setDefersLoading causes crash
+        https://bugs.webkit.org/show_bug.cgi?id=62808
+
+        The assertion in ResourceHandle::setDefersLoading assumes asynchronous
+        content delivery -- To resume a page, first, its main resource loader
+        calls setDefersLoading to resume loading the main content; then all the
+        sub-resource loaders calls setDefersLoading to resume sub-contents.
+        However, since QNetworkReplyHandler delivers content synchronously,
+        some new sub-resource loaders get created as soon as the main resource
+        loader resumed, and all these new sub-resource loaders set their
+        defersLoading flag to false. Then, the assertion fails for these new
+        sub-resource loaders when calling setDefersLoading on them. As a fix,
+        this path makes QNetworkReplyHandler deliver content asynchronously
+        when its load type is set to SynchronousLoad.
+
+        Reviewed by Benjamin Poulain.
+
+        Test: loader/load-defer-resume-crash.html
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandlerCallQueue::setDeferSignals):
+        * platform/network/qt/QNetworkReplyHandler.h:
+        (WebCore::QNetworkReplyHandler::setLoadingDeferred):
+
 2011-07-18  Young Han Lee  <joybro@company100.net>
 

trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp

@@ -179 +179 @@
 }
 
-void QNetworkReplyHandlerCallQueue::setDeferSignals(bool defer)
+void QNetworkReplyHandlerCallQueue::setDeferSignals(bool defer, bool sync)
 {
     m_deferSignals = defer;
-    flush();
+    if (sync)
+        flush();
+    else
+        QMetaObject::invokeMethod(this, "flush",  Qt::QueuedConnection);
 }
 

trunk/Source/WebCore/platform/network/qt/QNetworkReplyHandler.h

@@ -42 +42 @@
 class QNetworkReplyHandler;
 
-class QNetworkReplyHandlerCallQueue {
+class QNetworkReplyHandlerCallQueue : public QObject {
+    Q_OBJECT
 public:
     QNetworkReplyHandlerCallQueue(QNetworkReplyHandler*, bool deferSignals);
     bool deferSignals() const { return m_deferSignals; }
-    void setDeferSignals(bool);
+    void setDeferSignals(bool, bool sync = false);
 
     typedef void (QNetworkReplyHandler::*EnqueuedCall)();
@@ -61 +62 @@
     QList<EnqueuedCall> m_enqueuedCalls;
 
-    void flush();
+    Q_INVOKABLE void flush();
 };
 
@@ -121 +122 @@
 
     QNetworkReplyHandler(ResourceHandle*, LoadType, bool deferred = false);
-    void setLoadingDeferred(bool deferred) { m_queue.setDeferSignals(deferred); }
+    void setLoadingDeferred(bool deferred) { m_queue.setDeferSignals(deferred, m_loadType == SynchronousLoad); }
 
     QNetworkReply* reply() const { return m_replyWrapper ? m_replyWrapper->reply() : 0; }