Skip to content

W
webkit
Commit 78acf879 authored by yi.4.shen@nokia.com's avatar yi.4.shen@nokia.com
Browse files
Options

[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.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@91189 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6d1be741
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 6 deletions
LayoutTests/ChangeLog
View file @ 78acf879
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>
AnimationBase asserts if a test tries to pause during the delay phase
LayoutTests/loader/load-defer-resume-crash-expected.txt 0 → 100644
View file @ 78acf879
For the test to pass there should be no crash.
LayoutTests/loader/load-defer-resume-crash.html 0 → 100644
View file @ 78acf879
<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>
LayoutTests/loader/resources/images.html 0 → 100644
View file @ 78acf879
<html>
<body>
<img border="0" src="image1.png"/>
<img border="0" src="image2.png"/>
</body>
</html>
LayoutTests/platform/chromium/test_expectations.txt
View file @ 78acf879
......@@ -160,6 +160,7 @@ 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
......
Source/WebCore/ChangeLog
View file @ 78acf879
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>
AnimationBase asserts if a test tries to pause during the delay phase
Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
View file @ 78acf879
......@@ -178,10 +178,13 @@ void QNetworkReplyHandlerCallQueue::unlock()
flush();
}
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);
}
void QNetworkReplyHandlerCallQueue::flush()
......
Source/WebCore/platform/network/qt/QNetworkReplyHandler.h
View file @ 78acf879
......@@ -41,11 +41,12 @@ class ResourceRequest;
class ResourceResponse;
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)();
void push(EnqueuedCall method);
......@@ -60,7 +61,7 @@ private:
bool m_flushing;
QList<EnqueuedCall> m_enqueuedCalls;
void flush();
Q_INVOKABLE void flush();
};
class QNetworkReplyWrapper : public QObject {
......@@ -120,7 +121,7 @@ public:
};
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; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment