Diff
Modified: trunk/Source/WebKit2/ChangeLog (160448 => 160449)
--- trunk/Source/WebKit2/ChangeLog 2013-12-11 19:03:28 UTC (rev 160448)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-11 19:18:08 UTC (rev 160449)
@@ -1,3 +1,25 @@
+2013-12-11 Anders Carlsson <[email protected]>
+
+ Remove platform specific gunk from WebURLRequest and WebURLResponse
+ https://bugs.webkit.org/show_bug.cgi?id=125589
+
+ Reviewed by Andreas Kling.
+
+ * Shared/API/c/WKURLRequest.cpp:
+ (WKURLRequestCopyURL):
+ * Shared/API/c/mac/WKURLRequestNS.mm:
+ (WKURLRequestCopyNSURLRequest):
+ * Shared/API/c/mac/WKURLResponseNS.mm:
+ (WKURLResponseCopyNSURLResponse):
+ * Shared/WebURLRequest.cpp:
+ * Shared/WebURLRequest.h:
+ * Shared/WebURLResponse.h:
+ * Shared/mac/WebURLRequestMac.mm: Removed.
+ * Shared/mac/WebURLResponseMac.mm: Removed.
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::isMainInspectorPage):
+ * WebKit2.xcodeproj/project.pbxproj:
+
2013-12-11 José Dapena Paz <[email protected]> and Zan Dobersek <[email protected]>
[GTK][WK2] Add the WebKitBatteryProvider class
Modified: trunk/Source/WebKit2/Shared/API/c/WKURLRequest.cpp (160448 => 160449)
--- trunk/Source/WebKit2/Shared/API/c/WKURLRequest.cpp 2013-12-11 19:03:28 UTC (rev 160448)
+++ trunk/Source/WebKit2/Shared/API/c/WKURLRequest.cpp 2013-12-11 19:18:08 UTC (rev 160449)
@@ -45,7 +45,7 @@
WKURLRef WKURLRequestCopyURL(WKURLRequestRef requestRef)
{
- return toCopiedURLAPI(toImpl(requestRef)->url());
+ return toCopiedURLAPI(toImpl(requestRef)->resourceRequest().url());
}
WKURLRef WKURLRequestCopyFirstPartyForCookies(WKURLRequestRef requestRef)
Modified: trunk/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.mm (160448 => 160449)
--- trunk/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.mm 2013-12-11 19:03:28 UTC (rev 160448)
+++ trunk/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.mm 2013-12-11 19:18:08 UTC (rev 160449)
@@ -29,6 +29,7 @@
#import "WKAPICast.h"
#import "WebURLRequest.h"
+using namespace WebCore;
using namespace WebKit;
WKURLRequestRef WKURLRequestCreateWithNSURLRequest(NSURLRequest* urlRequest)
@@ -40,5 +41,5 @@
NSURLRequest* WKURLRequestCopyNSURLRequest(WKURLRequestRef urlRequest)
{
- return [toImpl(urlRequest)->platformRequest() copy];
+ return [toImpl(urlRequest)->resourceRequest().nsURLRequest(DoNotUpdateHTTPBody) copy];
}
Modified: trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.mm (160448 => 160449)
--- trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.mm 2013-12-11 19:03:28 UTC (rev 160448)
+++ trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.mm 2013-12-11 19:18:08 UTC (rev 160449)
@@ -40,5 +40,5 @@
NSURLResponse* WKURLResponseCopyNSURLResponse(WKURLResponseRef urlResponse)
{
- return [toImpl(urlResponse)->platformResponse() copy];
+ return [toImpl(urlResponse)->resourceResponse().nsURLResponse() copy];
}
Modified: trunk/Source/WebKit2/Shared/WebURLRequest.cpp (160448 => 160449)
--- trunk/Source/WebKit2/Shared/WebURLRequest.cpp 2013-12-11 19:03:28 UTC (rev 160448)
+++ trunk/Source/WebKit2/Shared/WebURLRequest.cpp 2013-12-11 19:18:08 UTC (rev 160449)
@@ -16,11 +16,6 @@
namespace WebKit {
-PassRefPtr<WebURLRequest> WebURLRequest::create(const URL& url)
-{
- return adoptRef(new WebURLRequest(ResourceRequest(url)));
-}
-
WebURLRequest::WebURLRequest(const ResourceRequest& request)
: m_request(request)
{
Modified: trunk/Source/WebKit2/Shared/WebURLRequest.h (160448 => 160449)
--- trunk/Source/WebKit2/Shared/WebURLRequest.h 2013-12-11 19:03:28 UTC (rev 160448)
+++ trunk/Source/WebKit2/Shared/WebURLRequest.h 2013-12-11 19:18:08 UTC (rev 160449)
@@ -30,39 +30,22 @@
#include <WebCore/ResourceRequest.h>
#include <wtf/Forward.h>
-#if PLATFORM(MAC)
-typedef NSURLRequest* PlatformRequest;
-#else
-typedef void* PlatformRequest;
-#endif
-
namespace WebKit {
class WebURLRequest : public API::ObjectImpl<API::Object::Type::URLRequest> {
public:
- static PassRefPtr<WebURLRequest> create(const WebCore::URL&);
-
static PassRefPtr<WebURLRequest> create(const WebCore::ResourceRequest& request)
{
return adoptRef(new WebURLRequest(request));
}
- static PassRefPtr<WebURLRequest> create(PlatformRequest platformRequest)
- {
- return adoptRef(new WebURLRequest(platformRequest));
- }
-
- PlatformRequest platformRequest() const;
const WebCore::ResourceRequest& resourceRequest() const { return m_request; }
- const String& url() const { return m_request.url(); }
-
static double defaultTimeoutInterval(); // May return 0 when using platform default.
static void setDefaultTimeoutInterval(double);
private:
explicit WebURLRequest(const WebCore::ResourceRequest&);
- explicit WebURLRequest(PlatformRequest);
WebCore::ResourceRequest m_request;
};
Modified: trunk/Source/WebKit2/Shared/WebURLResponse.h (160448 => 160449)
--- trunk/Source/WebKit2/Shared/WebURLResponse.h 2013-12-11 19:03:28 UTC (rev 160448)
+++ trunk/Source/WebKit2/Shared/WebURLResponse.h 2013-12-11 19:18:08 UTC (rev 160449)
@@ -30,12 +30,6 @@
#include <WebCore/ResourceResponse.h>
#include <wtf/Forward.h>
-#if PLATFORM(MAC)
-typedef NSURLResponse* PlatformResponse;
-#else
-typedef void* PlatformResponse;
-#endif
-
namespace WebKit {
class WebURLResponse : public API::ObjectImpl<API::Object::Type::URLResponse> {
@@ -45,17 +39,10 @@
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);
WebCore::ResourceResponse m_response;
};
Deleted: trunk/Source/WebKit2/Shared/mac/WebURLRequestMac.mm (160448 => 160449)
--- trunk/Source/WebKit2/Shared/mac/WebURLRequestMac.mm 2013-12-11 19:03:28 UTC (rev 160448)
+++ trunk/Source/WebKit2/Shared/mac/WebURLRequestMac.mm 2013-12-11 19:18:08 UTC (rev 160449)
@@ -1,43 +0,0 @@
-/*
- * 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.
- */
-
-#import "config.h"
-#import "WebURLRequest.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-WebURLRequest::WebURLRequest(PlatformRequest platformRequest)
- : m_request(platformRequest)
-{
-}
-
-PlatformRequest WebURLRequest::platformRequest() const
-{
- return m_request.nsURLRequest(DoNotUpdateHTTPBody);
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/Shared/mac/WebURLResponseMac.mm (160448 => 160449)
--- trunk/Source/WebKit2/Shared/mac/WebURLResponseMac.mm 2013-12-11 19:03:28 UTC (rev 160448)
+++ trunk/Source/WebKit2/Shared/mac/WebURLResponseMac.mm 2013-12-11 19:18:08 UTC (rev 160449)
@@ -1,41 +0,0 @@
-/*
- * 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.
- */
-
-#import "config.h"
-#import "WebURLResponse.h"
-
-namespace WebKit {
-
-WebURLResponse::WebURLResponse(PlatformResponse platformResponse)
- : m_response(platformResponse)
-{
-}
-
-PlatformResponse WebURLResponse::platformResponse() const
-{
- return m_response.nsURLResponse();
-}
-
-} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (160448 => 160449)
--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2013-12-11 19:03:28 UTC (rev 160448)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2013-12-11 19:18:08 UTC (rev 160449)
@@ -365,7 +365,7 @@
{
// Use URL so we can compare just the paths.
URL inspectorURL(URL(), webInspectorProxy->inspectorPageURL());
- URL requestURL(URL(), toImpl(requestRef)->url());
+ URL requestURL(URL(), toImpl(requestRef)->resourceRequest().url());
ASSERT(WebCore::SchemeRegistry::shouldTreatURLSchemeAsLocal(inspectorURL.protocol()));
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (160448 => 160449)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-11 19:03:28 UTC (rev 160448)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-11 19:18:08 UTC (rev 160449)
@@ -1045,7 +1045,6 @@
BC9099801256A98200083756 /* WKStringPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = BC90997F1256A98200083756 /* WKStringPrivate.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 */; };
BC963D6B113DD19200574BE2 /* WebPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC963D6A113DD19200574BE2 /* WebPage.cpp */; };
BC963D6E113DD1A500574BE2 /* WebPageMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC963D6D113DD1A500574BE2 /* WebPageMac.mm */; };
BC989D81161A7E5D000D46D3 /* WKWebProcessPlugIn.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC989D7F161A7E5B000D46D3 /* WKWebProcessPlugIn.mm */; };
@@ -1151,7 +1150,6 @@
BCE17B7E1381F1170012A641 /* WKPagePrivateMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE17B7C1381F1170012A641 /* WKPagePrivateMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
BCE2315D122C30CA00D5C35A /* WebURLRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE2315B122C30CA00D5C35A /* WebURLRequest.h */; };
BCE2315E122C30CA00D5C35A /* WebURLRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCE2315C122C30CA00D5C35A /* WebURLRequest.cpp */; };
- BCE231C2122C466E00D5C35A /* WebURLRequestMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCE231C0122C466E00D5C35A /* WebURLRequestMac.mm */; };
BCE23263122C6CF300D5C35A /* WebCoreArgumentCodersMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCE23262122C6CF300D5C35A /* WebCoreArgumentCodersMac.mm */; };
BCE469531214E6CB000B98EB /* WebFormClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCE4694F1214E6CB000B98EB /* WebFormClient.cpp */; };
BCE469541214E6CB000B98EB /* WebFormClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BCE469501214E6CB000B98EB /* WebFormClient.h */; };
@@ -2648,7 +2646,6 @@
BC90997F1256A98200083756 /* WKStringPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKStringPrivate.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>"; };
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>"; };
BC989D7F161A7E5B000D46D3 /* WKWebProcessPlugIn.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebProcessPlugIn.mm; sourceTree = "<group>"; };
@@ -2757,7 +2754,6 @@
BCE17B7C1381F1170012A641 /* WKPagePrivateMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKPagePrivateMac.h; path = mac/WKPagePrivateMac.h; sourceTree = "<group>"; };
BCE2315B122C30CA00D5C35A /* WebURLRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebURLRequest.h; sourceTree = "<group>"; };
BCE2315C122C30CA00D5C35A /* WebURLRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebURLRequest.cpp; sourceTree = "<group>"; };
- BCE231C0122C466E00D5C35A /* WebURLRequestMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebURLRequestMac.mm; sourceTree = "<group>"; };
BCE23262122C6CF300D5C35A /* WebCoreArgumentCodersMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreArgumentCodersMac.mm; sourceTree = "<group>"; };
BCE4694F1214E6CB000B98EB /* WebFormClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebFormClient.cpp; sourceTree = "<group>"; };
BCE469501214E6CB000B98EB /* WebFormClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebFormClient.h; sourceTree = "<group>"; };
@@ -4798,8 +4794,6 @@
BC111B5B112F629800337BAB /* WebEventFactory.h */,
BC111B5C112F629800337BAB /* WebEventFactory.mm */,
905620E512BC2476000799B6 /* WebMemorySampler.mac.mm */,
- BCE231C0122C466E00D5C35A /* WebURLRequestMac.mm */,
- BC90A1D5122DD66A00CC8C50 /* WebURLResponseMac.mm */,
);
path = mac;
sourceTree = "<group>";
@@ -7395,9 +7389,7 @@
1A594ABA112A1FB6009DE7C7 /* WebUIClient.cpp in Sources */,
BCA0EF8012331E78007D3CFB /* WebUndoStep.cpp in Sources */,
BCE2315E122C30CA00D5C35A /* WebURLRequest.cpp in Sources */,
- BCE231C2122C466E00D5C35A /* WebURLRequestMac.mm in Sources */,
BC90A1D3122DD55E00CC8C50 /* WebURLResponse.cpp in Sources */,
- BC90A1D7122DD66A00CC8C50 /* WebURLResponseMac.mm in Sources */,
C0337DD1127A2980008FF4F4 /* WebWheelEvent.cpp in Sources */,
51FCB18517BBFE0300394CD8 /* AsynchronousNetworkLoaderClient.cpp in Sources */,
29CD55AB128E294F00133C85 /* WKAccessibilityWebPageObject.mm in Sources */,
