summaryrefslogtreecommitdiff
path: root/Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-10-22 15:40:17 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-10-22 15:40:17 +0200
commit43a42f108af6bcbd91f2672731c3047c26213af1 (patch)
tree7fa092e5f5d873c72f2486a70e26be26f7a38bec /Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.cpp
parentd9cf437c840c6eb7417bdd97e6c40979255d3158 (diff)
downloadqtwebkit-43a42f108af6bcbd91f2672731c3047c26213af1.tar.gz
Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 (http://svn.webkit.org/repository/webkit/trunk@132067)
New snapshot that fixes build without QtWidgets
Diffstat (limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.cpp')
-rw-r--r--Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.cpp
index 29811fc6a..d4404147b 100644
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitURIResponse.cpp
@@ -27,6 +27,9 @@
#include <glib/gi18n-lib.h>
#include <wtf/text/CString.h>
+using namespace WebKit;
+using namespace WebCore;
+
enum {
PROP_0,
@@ -37,13 +40,10 @@ enum {
PROP_SUGGESTED_FILENAME
};
-using namespace WebKit;
-using namespace WebCore;
-
G_DEFINE_TYPE(WebKitURIResponse, webkit_uri_response, G_TYPE_OBJECT)
struct _WebKitURIResponsePrivate {
- WebCore::ResourceResponse resourceResponse;
+ ResourceResponse resourceResponse;
CString uri;
CString mimeType;
CString suggestedFilename;
@@ -282,9 +282,9 @@ const WebCore::ResourceResponse& webkitURIResponseGetResourceResponse(WebKitURIR
return uriResponse->priv->resourceResponse;
}
-void webkitURIResponseSetCertificateInfo(WebKitURIResponse* response, WKCertificateInfoRef wkCertificate)
+void webkitURIResponseSetCertificateInfo(WebKitURIResponse* response, WebCertificateInfo* certificate)
{
- const PlatformCertificateInfo& certificateInfo = toImpl(wkCertificate)->platformCertificateInfo();
+ const PlatformCertificateInfo& certificateInfo = certificate->platformCertificateInfo();
response->priv->resourceResponse.setSoupMessageCertificate(certificateInfo.certificate());
response->priv->resourceResponse.setSoupMessageTLSErrors(certificateInfo.tlsErrors());
}