Diff
Modified: trunk/Source/WebKit2/ChangeLog (187239 => 187240)
--- trunk/Source/WebKit2/ChangeLog 2015-07-23 18:21:00 UTC (rev 187239)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-23 18:34:51 UTC (rev 187240)
@@ -1,3 +1,15 @@
+2015-07-23 Tim Horton <[email protected]>
+
+ Remove some files that should have been removed with WebKit2 Windows
+ https://bugs.webkit.org/show_bug.cgi?id=147223
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Shared/API/c/cf/WKURLRequestCF.cpp: Removed.
+ * Shared/API/c/cf/WKURLRequestCF.h: Removed.
+ * Shared/API/c/cf/WKURLResponseCF.cpp: Removed.
+ * Shared/API/c/cf/WKURLResponseCF.h: Removed.
+
2015-07-23 Timothy Horton <[email protected]>
Fix the build
Deleted: trunk/Source/WebKit2/Shared/API/c/cf/WKURLRequestCF.cpp (187239 => 187240)
--- trunk/Source/WebKit2/Shared/API/c/cf/WKURLRequestCF.cpp 2015-07-23 18:21:00 UTC (rev 187239)
+++ trunk/Source/WebKit2/Shared/API/c/cf/WKURLRequestCF.cpp 2015-07-23 18:34:51 UTC (rev 187240)
@@ -1,44 +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.
- */
-
-#include "config.h"
-#include "WKURLRequestCF.h"
-
-#include "WKAPICast.h"
-#include "WebURLRequest.h"
-
-using namespace WebKit;
-
-WKURLRequestRef WKURLRequestCreateWithCFURLRequest(CFURLRequestRef urlRequest)
-{
- CFURLRequestRef copiedURLRequest = CFURLRequestCreateCopy(kCFAllocatorDefault, urlRequest);
- RefPtr<WebURLRequest> request = WebURLRequest::create(copiedURLRequest);
- return toAPI(request.release().leakRef());
-}
-
-CFURLRequestRef WKURLRequestCopyCFURLRequest(CFAllocatorRef alloc, WKURLRequestRef urlRequest)
-{
- return CFURLRequestCreateCopy(alloc, toImpl(urlRequest)->platformRequest());
-}
Deleted: trunk/Source/WebKit2/Shared/API/c/cf/WKURLRequestCF.h (187239 => 187240)
--- trunk/Source/WebKit2/Shared/API/c/cf/WKURLRequestCF.h 2015-07-23 18:21:00 UTC (rev 187239)
+++ trunk/Source/WebKit2/Shared/API/c/cf/WKURLRequestCF.h 2015-07-23 18:34:51 UTC (rev 187240)
@@ -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.
- */
-
-#ifndef WKURLRequestCF_h
-#define WKURLRequestCF_h
-
-#include <CFNetwork/CFURLRequestPriv.h>
-#include <WebKit/WKBase.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WK_EXPORT WKURLRequestRef WKURLRequestCreateWithCFURLRequest(CFURLRequestRef urlRequest);
-WK_EXPORT CFURLRequestRef WKURLRequestCopyCFURLRequest(CFAllocatorRef alloc, WKURLRequestRef urlRequest);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* WKURLRequestCF_h */
Deleted: trunk/Source/WebKit2/Shared/API/c/cf/WKURLResponseCF.cpp (187239 => 187240)
--- trunk/Source/WebKit2/Shared/API/c/cf/WKURLResponseCF.cpp 2015-07-23 18:21:00 UTC (rev 187239)
+++ trunk/Source/WebKit2/Shared/API/c/cf/WKURLResponseCF.cpp 2015-07-23 18:34:51 UTC (rev 187240)
@@ -1,54 +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.
- */
-
-#include "config.h"
-#include "WKURLResponseCF.h"
-
-#include "WKAPICast.h"
-#include "WebURLResponse.h"
-
-using namespace WebKit;
-
-WKURLResponseRef WKURLResponseCreateWithCFURLResponse(CFURLResponseRef urlResponse)
-{
- if (!urlResponse)
- return 0;
-
- CFURLResponseRef copiedURLResponse = CFURLResponseCreateCopy(kCFAllocatorDefault, urlResponse);
- RefPtr<WebURLResponse> response = WebURLResponse::create(copiedURLResponse);
- return toAPI(response.release().leakRef());
-}
-
-CFURLResponseRef WKURLResponseCopyCFURLResponse(CFAllocatorRef alloc, WKURLResponseRef urlResponse)
-{
- if (!urlResponse)
- return 0;
-
- PlatformResponse platformURLResponse = toImpl(urlResponse)->platformResponse();
- if (!platformURLResponse)
- return 0;
-
- return CFURLResponseCreateCopy(alloc, toImpl(urlResponse)->platformResponse());
-}
Deleted: trunk/Source/WebKit2/Shared/API/c/cf/WKURLResponseCF.h (187239 => 187240)
--- trunk/Source/WebKit2/Shared/API/c/cf/WKURLResponseCF.h 2015-07-23 18:21:00 UTC (rev 187239)
+++ trunk/Source/WebKit2/Shared/API/c/cf/WKURLResponseCF.h 2015-07-23 18:34:51 UTC (rev 187240)
@@ -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.
- */
-
-#ifndef WKURLResponseCF_h
-#define WKURLResponseCF_h
-
-#include <CFNetwork/CFURLResponsePriv.h>
-#include <WebKit/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 */
