[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

ossy at webkit.org ossy at webkit.org
Thu Apr 8 02:14:55 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit f46ba4c1290594a9cd4634bfe9fb65dbede70aa3
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 9 00:19:10 2010 +0000

    [Qt] Unreviewed buildfix after r55688.
    
    * platform/network/qt/ResourceHandleQt.cpp:
    (WebCore::ResourceHandle::loadResourceSynchronously):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55691 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 37ca7c8..e6c4f90 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-08  Csaba Osztrogonác  <ossy at webkit.org>
+
+        [Qt] Unreviewed buildfix after r55688.
+
+        * platform/network/qt/ResourceHandleQt.cpp:
+        (WebCore::ResourceHandle::loadResourceSynchronously):
+
 2010-03-08  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/network/qt/ResourceHandleQt.cpp b/WebCore/platform/network/qt/ResourceHandleQt.cpp
index a4403cc..bf0f50f 100644
--- a/WebCore/platform/network/qt/ResourceHandleQt.cpp
+++ b/WebCore/platform/network/qt/ResourceHandleQt.cpp
@@ -193,7 +193,7 @@ PassRefPtr<SharedBuffer> ResourceHandle::bufferedData()
 void ResourceHandle::loadResourceSynchronously(const ResourceRequest& request, StoredCredentials /*storedCredentials*/, ResourceError& error, ResourceResponse& response, Vector<char>& data, Frame* frame)
 {
     WebCoreSynchronousLoader syncLoader;
-    ResourceHandle handle(request, &syncLoader, true, false, true);
+    ResourceHandle handle(request, &syncLoader, true, false);
 
     ResourceHandleInternal *d = handle.getInternal();
     if (!(d->m_user.isEmpty() || d->m_pass.isEmpty())) {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list