[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 12:55:07 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit fff73c18af8e00f8d0eeef959714756db254bb85
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 1 21:36:11 2010 +0000
Add URLResponse API for WebKit2
https://bugs.webkit.org/show_bug.cgi?id=45062
Reviewed by Anders Carlsson.
Add WebURLResponse class and WKURLResponseRef C API to go with it. Right now,
instance of WKURLResponseRef are manipulated via platform types just like
WKURLRequestRef.
This just adds the type and conversion functions, no uses yet.
* Shared/APIObject.h:
* Shared/WebCoreArgumentCoders.h:
* Shared/WebURLResponse.cpp: Added.
(WebKit::WebURLResponse::WebURLResponse):
* Shared/WebURLResponse.h: Added.
(WebKit::WebURLResponse::create):
(WebKit::WebURLResponse::resourceResponse):
(WebKit::WebURLResponse::type):
* Shared/mac/WebCoreArgumentCodersMac.mm:
(CoreIPC::encodeWithNSKeyedArchiver):
(CoreIPC::decodeWithNSKeyedArchiver):
(CoreIPC::encodeResourceRequest):
(CoreIPC::decodeResourceRequest):
* Shared/mac/WebURLResponseMac.mm: Added.
(WebKit::WebURLResponse::WebURLResponse):
(WebKit::WebURLResponse::platformResponse):
* Shared/qt/WebURLResponseQt.cpp: Added.
(WebKit::WebURLResponse::WebURLResponse):
(WebKit::WebURLResponse::platformResponse):
* Shared/win/WebURLResponseWin.cpp: Added.
(WebKit::WebURLResponse::WebURLResponse):
(WebKit::WebURLResponse::platformResponse):
* UIProcess/API/C/WKURLResponse.cpp: Added.
(WKURLResponseGetTypeID):
* UIProcess/API/C/WKURLResponse.h: Added.
* UIProcess/API/C/cf/WKURLResponseCF.cpp: Added.
(WKURLResponseCreateWithCFURLResponse):
(WKURLResponseCopyCFURLResponse):
* UIProcess/API/C/cf/WKURLResponseCF.h: Added.
* UIProcess/API/C/mac/WKURLResponseNS.h: Added.
* UIProcess/API/C/mac/WKURLResponseNS.mm: Added.
(WKURLResponseCreateWithNSURLResponse):
(WKURLResponseCopyNSURLResponse):
* WebKit2.pro:
* WebKit2.xcodeproj/project.pbxproj:
* win/WebKit2.vcproj:
* win/WebKit2Generated.make:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66619 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a23f4f7..7b7ca9c 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,54 @@
+2010-09-01 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Anders Carlsson.
+
+ Add URLResponse API for WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=45062
+
+ Add WebURLResponse class and WKURLResponseRef C API to go with it. Right now,
+ instance of WKURLResponseRef are manipulated via platform types just like
+ WKURLRequestRef.
+
+ This just adds the type and conversion functions, no uses yet.
+
+ * Shared/APIObject.h:
+ * Shared/WebCoreArgumentCoders.h:
+ * Shared/WebURLResponse.cpp: Added.
+ (WebKit::WebURLResponse::WebURLResponse):
+ * Shared/WebURLResponse.h: Added.
+ (WebKit::WebURLResponse::create):
+ (WebKit::WebURLResponse::resourceResponse):
+ (WebKit::WebURLResponse::type):
+ * Shared/mac/WebCoreArgumentCodersMac.mm:
+ (CoreIPC::encodeWithNSKeyedArchiver):
+ (CoreIPC::decodeWithNSKeyedArchiver):
+ (CoreIPC::encodeResourceRequest):
+ (CoreIPC::decodeResourceRequest):
+ * Shared/mac/WebURLResponseMac.mm: Added.
+ (WebKit::WebURLResponse::WebURLResponse):
+ (WebKit::WebURLResponse::platformResponse):
+ * Shared/qt/WebURLResponseQt.cpp: Added.
+ (WebKit::WebURLResponse::WebURLResponse):
+ (WebKit::WebURLResponse::platformResponse):
+ * Shared/win/WebURLResponseWin.cpp: Added.
+ (WebKit::WebURLResponse::WebURLResponse):
+ (WebKit::WebURLResponse::platformResponse):
+ * UIProcess/API/C/WKURLResponse.cpp: Added.
+ (WKURLResponseGetTypeID):
+ * UIProcess/API/C/WKURLResponse.h: Added.
+ * UIProcess/API/C/cf/WKURLResponseCF.cpp: Added.
+ (WKURLResponseCreateWithCFURLResponse):
+ (WKURLResponseCopyCFURLResponse):
+ * UIProcess/API/C/cf/WKURLResponseCF.h: Added.
+ * UIProcess/API/C/mac/WKURLResponseNS.h: Added.
+ * UIProcess/API/C/mac/WKURLResponseNS.mm: Added.
+ (WKURLResponseCreateWithNSURLResponse):
+ (WKURLResponseCopyNSURLResponse):
+ * WebKit2.pro:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * win/WebKit2.vcproj:
+ * win/WebKit2Generated.make:
+
2010-09-01 Andras Becsi <abecsi at webkit.org>
Reviewed by Antti Koivisto.
diff --git a/WebKit2/Shared/APIObject.h b/WebKit2/Shared/APIObject.h
index 4f7cdf0..66b6792 100644
--- a/WebKit2/Shared/APIObject.h
+++ b/WebKit2/Shared/APIObject.h
@@ -41,6 +41,7 @@ public:
TypeString,
TypeURL,
TypeURLRequest,
+ TypeURLResponse,
// UIProcess types
TypeBackForwardList,
diff --git a/WebKit2/Shared/WebCoreArgumentCoders.h b/WebKit2/Shared/WebCoreArgumentCoders.h
index 85369e6..d96a4a2 100644
--- a/WebKit2/Shared/WebCoreArgumentCoders.h
+++ b/WebKit2/Shared/WebCoreArgumentCoders.h
@@ -35,7 +35,6 @@
#include <WebCore/IntRect.h>
#include <WebCore/PluginData.h>
#include <WebCore/ResourceRequest.h>
-#include <WebCore/ResourceResponse.h>
#include <wtf/text/WTFString.h>
namespace CoreIPC {
diff --git a/WebKit2/Shared/WebURLResponse.cpp b/WebKit2/Shared/WebURLResponse.cpp
new file mode 100644
index 0000000..8f8ec14
--- /dev/null
+++ b/WebKit2/Shared/WebURLResponse.cpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "WebURLResponse.h"
+
+namespace WebKit {
+
+WebURLResponse::WebURLResponse(const WebCore::ResourceResponse& response)
+ : m_response(response)
+{
+}
+
+} // namespace WebKit
diff --git a/WebKit2/Shared/WebURLResponse.h b/WebKit2/Shared/WebURLResponse.h
new file mode 100644
index 0000000..4f06db2
--- /dev/null
+++ b/WebKit2/Shared/WebURLResponse.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebURLResponse_h
+#define WebURLResponse_h
+
+#include "APIObject.h"
+#include <WebCore/ResourceResponse.h>
+#include <wtf/Forward.h>
+
+#if PLATFORM(MAC)
+typedef NSURLResponse* PlatformResponse;
+#elif PLATFORM(WIN)
+typedef CFURLResponseRef PlatformResponse;
+#else
+typedef void* PlatformResponse;
+#endif
+
+namespace WebKit {
+
+class WebURLResponse : public APIObject {
+public:
+ static const Type APIType = TypeURLResponse;
+
+ static PassRefPtr<WebURLResponse> create(const WebCore::ResourceResponse& response)
+ {
+ return adoptRef(new WebURLResponse(response));
+ }
+
+ static PassRefPtr<WebURLResponse> create(PlatformResponse platformResponse)
+ {
+ return adoptRef(new WebURLResponse(platformResponse));
+ }
+
+ PlatformResponse platformResponse() const;
+ const WebCore::ResourceResponse& resourceResponse() const { return m_response; }
+
+private:
+ explicit WebURLResponse(const WebCore::ResourceResponse&);
+ explicit WebURLResponse(PlatformResponse);
+
+ virtual Type type() const { return APIType; }
+
+ WebCore::ResourceResponse m_response;
+};
+
+} // namespace WebKit
+
+#endif // WebURLResponse_h
diff --git a/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm b/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
index 2f33cd1..05d13d2 100644
--- a/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
+++ b/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
@@ -27,27 +27,34 @@
namespace CoreIPC {
-void encodeResourceRequest(ArgumentEncoder* encoder, const WebCore::ResourceRequest& resourceRequest)
+static void encodeWithNSKeyedArchiver(ArgumentEncoder* encoder, id rootObject)
{
- NSURLRequest *nsURLRequest = resourceRequest.nsURLRequest();
- NSData *data = [NSKeyedArchiver archivedDataWithRootObject:nsURLRequest];
-
+ NSData *data = [NSKeyedArchiver archivedDataWithRootObject:rootObject];
encoder->encodeBytes(static_cast<const uint8_t*>([data bytes]), [data length]);
}
-bool decodeResourceRequest(ArgumentDecoder* decoder, WebCore::ResourceRequest& resourceRequest)
+static id decodeWithNSKeyedArchiver(ArgumentDecoder* decoder)
{
Vector<uint8_t> bytes;
if (!decoder->decodeBytes(bytes))
- return false;
+ return nil;
- NSData *nsData = [[NSData alloc] initWithBytesNoCopy:bytes.data() length:bytes.size() freeWhenDone:NO];
- NSURLRequest *nsURLRequest = [NSKeyedUnarchiver unarchiveObjectWithData:nsData];
+ RetainPtr<NSData> nsData(AdoptNS, [[NSData alloc] initWithBytesNoCopy:bytes.data() length:bytes.size() freeWhenDone:NO]);
+ return [NSKeyedUnarchiver unarchiveObjectWithData:nsData.get()];
+}
+
+void encodeResourceRequest(ArgumentEncoder* encoder, const WebCore::ResourceRequest& resourceRequest)
+{
+ encodeWithNSKeyedArchiver(encoder, resourceRequest.nsURLRequest());
+}
+
+bool decodeResourceRequest(ArgumentDecoder* decoder, WebCore::ResourceRequest& resourceRequest)
+{
+ NSURLRequest *nsURLRequest = decodeWithNSKeyedArchiver(decoder);
if (!nsURLRequest)
return false;
resourceRequest = WebCore::ResourceRequest(nsURLRequest);
-
return true;
}
diff --git a/WebKit2/Shared/mac/WebURLResponseMac.mm b/WebKit2/Shared/mac/WebURLResponseMac.mm
new file mode 100644
index 0000000..ff5b6e6
--- /dev/null
+++ b/WebKit2/Shared/mac/WebURLResponseMac.mm
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "WebURLResponse.h"
+
+namespace WebKit {
+
+WebURLResponse::WebURLResponse(PlatformResponse platformResponse)
+ : m_response(platformResponse)
+{
+}
+
+PlatformResponse WebURLResponse::platformResponse() const
+{
+ return m_response.nsURLResponse();
+}
+
+} // namespace WebKit
diff --git a/WebKit2/Shared/qt/WebURLResponseQt.cpp b/WebKit2/Shared/qt/WebURLResponseQt.cpp
new file mode 100644
index 0000000..abc0c29
--- /dev/null
+++ b/WebKit2/Shared/qt/WebURLResponseQt.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "WebURLResponse.h"
+
+namespace WebKit {
+
+WebURLResponse::WebURLResponse(PlatformResponse)
+{
+ ASSERT_NOT_REACHED();
+}
+
+PlatformResponse WebURLResponse::platformResponse() const
+{
+ ASSERT_NOT_REACHED();
+ return 0;
+}
+
+} // namespace WebKit
diff --git a/WebKit2/Shared/win/WebURLResponseWin.cpp b/WebKit2/Shared/win/WebURLResponseWin.cpp
new file mode 100644
index 0000000..3b3f24c
--- /dev/null
+++ b/WebKit2/Shared/win/WebURLResponseWin.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "WebURLResponse.h"
+
+namespace WebKit {
+
+WebURLResponse::WebURLResponse(PlatformResponse platformResponse)
+ : m_response(platformResponse)
+{
+}
+
+PlatformResponse WebURLResponse::platformResponse() const
+{
+ return m_response.cfURLResponse();
+}
+
+} // namespace WebKit
diff --git a/WebKit2/UIProcess/API/C/WKURLResponse.cpp b/WebKit2/UIProcess/API/C/WKURLResponse.cpp
new file mode 100644
index 0000000..285c127
--- /dev/null
+++ b/WebKit2/UIProcess/API/C/WKURLResponse.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "WKURLResponse.h"
+
+#include "WKAPICast.h"
+#include "WebURLResponse.h"
+
+using namespace WebKit;
+
+WKTypeID WKURLResponseGetTypeID()
+{
+ return toRef(WebURLResponse::APIType);
+}
+
diff --git a/WebKit2/UIProcess/API/C/WKURLResponse.h b/WebKit2/UIProcess/API/C/WKURLResponse.h
new file mode 100644
index 0000000..62e51f4
--- /dev/null
+++ b/WebKit2/UIProcess/API/C/WKURLResponse.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WKURLResponse_h
+#define WKURLResponse_h
+
+#include <WebKit2/WKBase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT WKTypeID WKURLResponseGetTypeID();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKURLResponse_h */
diff --git a/WebKit2/UIProcess/API/C/cf/WKURLResponseCF.cpp b/WebKit2/UIProcess/API/C/cf/WKURLResponseCF.cpp
new file mode 100644
index 0000000..b7b46b3
--- /dev/null
+++ b/WebKit2/UIProcess/API/C/cf/WKURLResponseCF.cpp
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "WKURLResponseCF.h"
+
+#include "WKAPICast.h"
+#include "WebURLResponse.h"
+
+using namespace WebKit;
+
+WKURLResponseRef WKURLResponseCreateWithCFURLResponse(CFURLResponseRef urlResponse)
+{
+ CFURLResponseRef copiedURLResponse = CFURLResponseCreateCopy(kCFAllocatorDefault, urlResponse);
+ RefPtr<WebURLResponse> response = WebURLResponse::create(copiedURLResponse);
+ return toRef(response.release().releaseRef());
+}
+
+CFURLResponseRef WKURLResponseCopyCFURLResponse(CFAllocatorRef alloc, WKURLResponseRef urlResponse)
+{
+ return CFURLResponseCreateCopy(alloc, toWK(urlResponse)->platformResponse());
+}
diff --git a/WebKit2/UIProcess/API/C/cf/WKURLResponseCF.h b/WebKit2/UIProcess/API/C/cf/WKURLResponseCF.h
new file mode 100644
index 0000000..5ce7184
--- /dev/null
+++ b/WebKit2/UIProcess/API/C/cf/WKURLResponseCF.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WKURLResponseCF_h
+#define WKURLResponseCF_h
+
+#include <CFNetwork/CFURLResponsePriv.h>
+#include <WebKit2/WKBase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT WKURLResponseRef WKURLResponseCreateWithCFURLResponse(CFURLResponseRef urlResponse);
+WK_EXPORT CFURLResponseRef WKURLResponseCopyCFURLResponse(CFAllocatorRef alloc, WKURLResponseRef urlResponse);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKURLResponseCF_h */
diff --git a/WebKit2/UIProcess/API/C/mac/WKURLResponseNS.h b/WebKit2/UIProcess/API/C/mac/WKURLResponseNS.h
new file mode 100644
index 0000000..3cdf74c
--- /dev/null
+++ b/WebKit2/UIProcess/API/C/mac/WKURLResponseNS.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WKURLResponseNS_h
+#define WKURLResponseNS_h
+
+#include <Foundation/Foundation.h>
+#include <WebKit2/WKBase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT WKURLResponseRef WKURLResponseCreateWithNSURLResponse(NSURLResponse* urlResponse);
+WK_EXPORT NSURLResponse* WKURLResponseCopyNSURLResponse(CFAllocatorRef alloc, WKURLResponseRef urlResponse);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKURLResponseNS_h */
diff --git a/WebKit2/UIProcess/API/C/mac/WKURLResponseNS.mm b/WebKit2/UIProcess/API/C/mac/WKURLResponseNS.mm
new file mode 100644
index 0000000..6d6e510
--- /dev/null
+++ b/WebKit2/UIProcess/API/C/mac/WKURLResponseNS.mm
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "WKURLResponseNS.h"
+
+#include "WKAPICast.h"
+#include "WebURLResponse.h"
+
+using namespace WebKit;
+
+WKURLResponseRef WKURLResponseCreateWithNSURLResponse(NSURLResponse* urlResponse)
+{
+ RetainPtr<NSURLResponse> copiedURLResponse(AdoptNS, [urlResponse copy]);
+ RefPtr<WebURLResponse> response = WebURLResponse::create(copiedURLResponse.get());
+ return toRef(response.release().releaseRef());
+}
+
+NSURLResponse* WKURLResponseCopyNSURLResponse(CFAllocatorRef alloc, WKURLResponseRef urlResponse)
+{
+ return [toWK(urlResponse)->platformResponse() copy];
+}
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index c7e72fa..6e99d91 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -166,6 +166,7 @@ HEADERS += \
Shared/WebNavigationDataStore.h \
Shared/WebPreferencesStore.h \
Shared/WebURLRequest.h \
+ Shared/WebURLResponse.h \
UIProcess/API/cpp/WKRetainPtr.h \
UIProcess/API/cpp/qt/WKStringQt.h \
UIProcess/API/cpp/qt/WKURLQt.h \
@@ -185,6 +186,7 @@ HEADERS += \
UIProcess/API/C/WKType.h \
UIProcess/API/C/WKURL.h \
UIProcess/API/C/WKURLRequest.h \
+ UIProcess/API/C/WKURLResponse.h \
UIProcess/API/qt/qgraphicswkview.h \
UIProcess/API/qt/qwkpage.h \
UIProcess/API/qt/qwkpage_p.h \
@@ -269,10 +271,12 @@ SOURCES += \
Shared/WebEventConversion.cpp \
Shared/WebPreferencesStore.cpp \
Shared/WebURLRequest.cpp \
+ Shared/WebURLResponse.cpp \
Shared/qt/UpdateChunk.cpp \
Shared/qt/WebEventFactoryQt.cpp \
Shared/qt/WebCoreArgumentCodersQt.cpp \
Shared/qt/WebURLRequestQt.cpp \
+ Shared/qt/WebURLResponseQt.cpp \
UIProcess/API/C/WKContext.cpp \
UIProcess/API/C/WKFrame.cpp \
UIProcess/API/C/WKFramePolicyListener.cpp \
@@ -284,6 +288,7 @@ SOURCES += \
UIProcess/API/C/WKType.cpp \
UIProcess/API/C/WKURL.cpp \
UIProcess/API/C/WKURLRequest.cpp \
+ UIProcess/API/C/WKURLResponse.cpp \
UIProcess/API/qt/ClientImpl.cpp \
UIProcess/API/qt/qgraphicswkview.cpp \
UIProcess/API/qt/qwkpage.cpp \
diff --git a/WebKit2/WebKit2.xcodeproj/project.pbxproj b/WebKit2/WebKit2.xcodeproj/project.pbxproj
index 6c8a590..f1cc630 100644
--- a/WebKit2/WebKit2.xcodeproj/project.pbxproj
+++ b/WebKit2/WebKit2.xcodeproj/project.pbxproj
@@ -227,6 +227,13 @@
BC8780FC1161C2B800CC2768 /* PlatformProcessIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8780FB1161C2B800CC2768 /* PlatformProcessIdentifier.h */; };
BC87DFAA1018101400564216 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BC87DFA91018101400564216 /* libicucore.dylib */; };
BC8A501511765F5600757573 /* WKRetainPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8A501411765F5600757573 /* WKRetainPtr.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ BC90A1D2122DD55E00CC8C50 /* WebURLResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */; };
+ BC90A1D3122DD55E00CC8C50 /* WebURLResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */; };
+ BC90A1D7122DD66A00CC8C50 /* WebURLResponseMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC90A1D5122DD66A00CC8C50 /* WebURLResponseMac.mm */; };
+ BC90A1DC122DD89800CC8C50 /* WKURLResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = BC90A1DA122DD89800CC8C50 /* WKURLResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ BC90A1DD122DD89800CC8C50 /* WKURLResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC90A1DB122DD89800CC8C50 /* WKURLResponse.cpp */; };
+ BC90A1E0122DD8EE00CC8C50 /* WKURLResponseNS.h in Headers */ = {isa = PBXBuildFile; fileRef = BC90A1DE122DD8EE00CC8C50 /* WKURLResponseNS.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ BC90A1E1122DD8EE00CC8C50 /* WKURLResponseNS.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC90A1DF122DD8EE00CC8C50 /* WKURLResponseNS.mm */; };
BC963D6B113DD19200574BE2 /* WebPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC963D6A113DD19200574BE2 /* WebPage.cpp */; };
BC963D6E113DD1A500574BE2 /* WebPageMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC963D6D113DD1A500574BE2 /* WebPageMac.mm */; };
BC9B38A110F538BE00443A15 /* WebFrameProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = BC9B389F10F538BE00443A15 /* WebFrameProxy.h */; };
@@ -579,6 +586,13 @@
BC87DFA91018101400564216 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = /usr/lib/libicucore.dylib; sourceTree = "<absolute>"; };
BC8A501011765AF700757573 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = WebProcess/Info.plist; sourceTree = "<group>"; };
BC8A501411765F5600757573 /* WKRetainPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKRetainPtr.h; sourceTree = "<group>"; };
+ BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebURLResponse.h; sourceTree = "<group>"; };
+ BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebURLResponse.cpp; sourceTree = "<group>"; };
+ BC90A1D5122DD66A00CC8C50 /* WebURLResponseMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebURLResponseMac.mm; sourceTree = "<group>"; };
+ BC90A1DA122DD89800CC8C50 /* WKURLResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKURLResponse.h; sourceTree = "<group>"; };
+ BC90A1DB122DD89800CC8C50 /* WKURLResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKURLResponse.cpp; sourceTree = "<group>"; };
+ BC90A1DE122DD8EE00CC8C50 /* WKURLResponseNS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKURLResponseNS.h; sourceTree = "<group>"; };
+ BC90A1DF122DD8EE00CC8C50 /* WKURLResponseNS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKURLResponseNS.mm; sourceTree = "<group>"; };
BC963D6A113DD19200574BE2 /* WebPage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPage.cpp; sourceTree = "<group>"; };
BC963D6D113DD1A500574BE2 /* WebPageMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPageMac.mm; sourceTree = "<group>"; };
BC9B389F10F538BE00443A15 /* WebFrameProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFrameProxy.h; sourceTree = "<group>"; };
@@ -892,6 +906,8 @@
BCDB86C01200FB97007254BE /* WebURL.h */,
BCE2315C122C30CA00D5C35A /* WebURLRequest.cpp */,
BCE2315B122C30CA00D5C35A /* WebURLRequest.h */,
+ BC90A1D1122DD55E00CC8C50 /* WebURLResponse.cpp */,
+ BC90A1D0122DD55E00CC8C50 /* WebURLResponse.h */,
);
path = Shared;
sourceTree = "<group>";
@@ -1129,6 +1145,8 @@
BC20EBB2116EEF7A00094A50 /* WKURL.h */,
BCE231C6122C492300D5C35A /* WKURLRequest.cpp */,
BCE231C5122C492300D5C35A /* WKURLRequest.h */,
+ BC90A1DB122DD89800CC8C50 /* WKURLResponse.cpp */,
+ BC90A1DA122DD89800CC8C50 /* WKURLResponse.h */,
);
path = C;
sourceTree = "<group>";
@@ -1185,6 +1203,7 @@
BC111B5B112F629800337BAB /* WebEventFactory.h */,
BC111B5C112F629800337BAB /* WebEventFactory.mm */,
BCE231C0122C466E00D5C35A /* WebURLRequestMac.mm */,
+ BC90A1D5122DD66A00CC8C50 /* WebURLResponseMac.mm */,
);
path = mac;
sourceTree = "<group>";
@@ -1366,6 +1385,8 @@
children = (
BCE23277122C71AC00D5C35A /* WKURLRequestNS.h */,
BCE23278122C71AC00D5C35A /* WKURLRequestNS.mm */,
+ BC90A1DE122DD8EE00CC8C50 /* WKURLResponseNS.h */,
+ BC90A1DF122DD8EE00CC8C50 /* WKURLResponseNS.mm */,
);
path = mac;
sourceTree = "<group>";
@@ -1532,6 +1553,9 @@
BCE2315D122C30CA00D5C35A /* WebURLRequest.h in Headers */,
BCE231C7122C492300D5C35A /* WKURLRequest.h in Headers */,
BCE23279122C71AC00D5C35A /* WKURLRequestNS.h in Headers */,
+ BC90A1D2122DD55E00CC8C50 /* WebURLResponse.h in Headers */,
+ BC90A1DC122DD89800CC8C50 /* WKURLResponse.h in Headers */,
+ BC90A1E0122DD8EE00CC8C50 /* WKURLResponseNS.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1760,6 +1784,10 @@
BCE231C8122C492300D5C35A /* WKURLRequest.cpp in Sources */,
BCE23263122C6CF300D5C35A /* WebCoreArgumentCodersMac.mm in Sources */,
BCE2327A122C71AC00D5C35A /* WKURLRequestNS.mm in Sources */,
+ BC90A1D3122DD55E00CC8C50 /* WebURLResponse.cpp in Sources */,
+ BC90A1D7122DD66A00CC8C50 /* WebURLResponseMac.mm in Sources */,
+ BC90A1DD122DD89800CC8C50 /* WKURLResponse.cpp in Sources */,
+ BC90A1E1122DD8EE00CC8C50 /* WKURLResponseNS.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/WebKit2/win/WebKit2.vcproj b/WebKit2/win/WebKit2.vcproj
index b86a7d6..15bd489 100755
--- a/WebKit2/win/WebKit2.vcproj
+++ b/WebKit2/win/WebKit2.vcproj
@@ -480,6 +480,14 @@
RelativePath="..\Shared\WebURLRequest.h"
>
</File>
+ <File
+ RelativePath="..\Shared\WebURLResponse.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\Shared\WebURLResponse.h"
+ >
+ </File>
<Filter
Name="CoreIPCSupport"
>
@@ -543,6 +551,10 @@
RelativePath="..\Shared\win\WebURLRequestWin.cpp"
>
</File>
+ <File
+ RelativePath="..\Shared\win\WebURLResponseWin.cpp"
+ >
+ </File>
</Filter>
</Filter>
<Filter
@@ -1386,6 +1398,14 @@
RelativePath="..\UIProcess\API\C\WKURLRequest.h"
>
</File>
+ <File
+ RelativePath="..\UIProcess\API\C\WKURLResponse.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\UIProcess\API\C\WKURLResponse.h"
+ >
+ </File>
<Filter
Name="cf"
>
@@ -1413,6 +1433,14 @@
RelativePath="..\UIProcess\API\C\cf\WKURLRequestCF.h"
>
</File>
+ <File
+ RelativePath="..\UIProcess\API\C\cf\WKURLResponseCF.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\UIProcess\API\C\cf\WKURLResponseCF.h"
+ >
+ </File>
</Filter>
</Filter>
<Filter
diff --git a/WebKit2/win/WebKit2Generated.make b/WebKit2/win/WebKit2Generated.make
index 6da81a1..f20843e 100644
--- a/WebKit2/win/WebKit2Generated.make
+++ b/WebKit2/win/WebKit2Generated.make
@@ -23,9 +23,11 @@ all:
xcopy /y /d "..\UIProcess\API\C\WKType.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WKURL.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\WKURLRequest.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
+ xcopy /y /d "..\UIProcess\API\C\WKURLResponse.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\cf\WKStringCF.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\cf\WKURLCF.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\cf\WKURLRequestCF.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
+ xcopy /y /d "..\UIProcess\API\C\cf\WKURLResponseCF.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\C\win\WKContextPrivateWin.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\cpp\WKRetainPtr.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
xcopy /y /d "..\UIProcess\API\win\WKBaseWin.h" "$(WEBKITOUTPUTDIR)\include\WebKit2"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list