[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
paroga at webkit.org
paroga at webkit.org
Wed Dec 22 13:38:51 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c38c446a0fbe5dd2ff8a17b834e3e75dfa48339e
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 22 10:19:50 2010 +0000
2010-09-22 Patrick Gansterer <paroga at webkit.org>
Unreviewed.
[WINCE] Build fix for ResourceHandleWin after r67291.
* platform/network/win/ResourceHandleWin.cpp:
(WebCore::ResourceHandle::loadResourceSynchronously): Replace Frame* parameter with NetworkingContext*.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68033 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 80fdebb..e2dbdb5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-22 Patrick Gansterer <paroga at webkit.org>
+
+ Unreviewed.
+
+ [WINCE] Build fix for ResourceHandleWin after r67291.
+
+ * platform/network/win/ResourceHandleWin.cpp:
+ (WebCore::ResourceHandle::loadResourceSynchronously): Replace Frame* parameter with NetworkingContext*.
+
2010-09-22 Chris Guillory <chris.guillory at google.com>
Reviewed by Chris Fleizach.
diff --git a/WebCore/platform/network/win/ResourceHandleWin.cpp b/WebCore/platform/network/win/ResourceHandleWin.cpp
index 8f102dd..946a0f7 100644
--- a/WebCore/platform/network/win/ResourceHandleWin.cpp
+++ b/WebCore/platform/network/win/ResourceHandleWin.cpp
@@ -556,14 +556,14 @@ void ResourceHandle::cancel()
client()->didFail(this, ResourceError());
}
-void ResourceHandle::loadResourceSynchronously(const ResourceRequest& request, StoredCredentials storedCredentials, ResourceError& error, ResourceResponse& response, Vector<char>& data, Frame* frame)
+void ResourceHandle::loadResourceSynchronously(NetworkingContext* context, const ResourceRequest& request, StoredCredentials storedCredentials, ResourceError& error, ResourceResponse& response, Vector<char>& data)
{
UNUSED_PARAM(storedCredentials);
WebCoreSynchronousLoader syncLoader(error, response, data, request.httpUserAgent());
ResourceHandle handle(request, &syncLoader, true, false);
- handle.start(frame);
+ handle.start(context);
}
void ResourceHandle::setHasReceivedResponse(bool b)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list