[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 16:32:46 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 72175d555f2a49320591abe6b5076c43b13e0660
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 25 17:17:03 2010 +0000
2010-11-25 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r72734.
http://trac.webkit.org/changeset/72734
https://bugs.webkit.org/show_bug.cgi?id=50086
Backing out 72732 which made Qt sad and crashy (Requested by
kling on #webkit).
* platform/network/qt/ResourceHandleQt.cpp:
(WebCore::ResourceHandle::loadResourceSynchronously):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72735 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2c71cef..c2f9a37 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-25 Sheriff Bot <webkit.review.bot at gmail.com>
+
+ Unreviewed, rolling out r72734.
+ http://trac.webkit.org/changeset/72734
+ https://bugs.webkit.org/show_bug.cgi?id=50086
+
+ Backing out 72732 which made Qt sad and crashy (Requested by
+ kling on #webkit).
+
+ * platform/network/qt/ResourceHandleQt.cpp:
+ (WebCore::ResourceHandle::loadResourceSynchronously):
+
2010-11-25 Andreas Kling <kling at webkit.org>
Unreviewed crash fix for Qt 4.6.x.
diff --git a/WebCore/platform/network/qt/ResourceHandleQt.cpp b/WebCore/platform/network/qt/ResourceHandleQt.cpp
index 41ed1b1..46d544d 100644
--- a/WebCore/platform/network/qt/ResourceHandleQt.cpp
+++ b/WebCore/platform/network/qt/ResourceHandleQt.cpp
@@ -211,7 +211,7 @@ void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const
QNetworkReply* reply = d->m_job->reply();
// When using synchronous calls, we are finished when reaching this point.
- if (reply && reply->isFinished()) {
+ if (reply->isFinished()) {
syncLoader.setReplyFinished(true);
d->m_job->forwardData();
d->m_job->finish();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list