diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 10:36:58 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-01 10:36:58 +0200 |
| commit | b1e9e47fa11f608ae16bc07f97a2acf95bf80272 (patch) | |
| tree | c88c45e80c9c44506e7cdf9a3bb39ebf82a8cd5b /Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp | |
| parent | be01689f43cf6882cf670d33df49ead1f570c53a (diff) | |
| download | qtwebkit-b1e9e47fa11f608ae16bc07f97a2acf95bf80272.tar.gz | |
Imported WebKit commit 499c84c99aa98e9870fa7eaa57db476c6d160d46 (http://svn.webkit.org/repository/webkit/trunk@119200)
Weekly update :). Particularly relevant changes for Qt are the use of the WebCore image decoders and direct usage
of libpng/libjpeg if available in the system.
Diffstat (limited to 'Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp b/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp index 1e10baaf1..22b09fd30 100644 --- a/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp +++ b/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp @@ -22,11 +22,11 @@ #include "DataReference.h" #include "MessageID.h" +#include "WebErrors.h" #include "WebKitSoupRequestGeneric.h" #include "WebKitSoupRequestInputStream.h" #include "WebProcess.h" #include "WebSoupRequestManagerProxyMessages.h" -#include <WebCore/ErrorsGtk.h> #include <WebCore/ResourceHandle.h> #include <WebCore/ResourceRequest.h> #include <libsoup/soup-requester.h> @@ -99,7 +99,7 @@ void WebSoupRequestManager::didHandleURIRequest(const CoreIPC::DataReference& re } else { GOwnPtr<char> uriString(soup_uri_to_string(soup_request_get_uri(SOUP_REQUEST(request.get())), FALSE)); WebCore::ResourceRequest resourceRequest(String::fromUTF8(uriString.get())); - WebCore::ResourceError resourceError(WebCore::cannotShowURLError(resourceRequest)); + WebCore::ResourceError resourceError(cannotShowURLError(resourceRequest)); g_simple_async_result_set_error(result.get(), g_quark_from_string(resourceError.domain().utf8().data()), resourceError.errorCode(), "%s", resourceError.localizedDescription().utf8().data()); } |