Diff
Modified: trunk/Source/WebKit2/ChangeLog (158455 => 158456)
--- trunk/Source/WebKit2/ChangeLog 2013-11-01 21:23:51 UTC (rev 158455)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-01 21:26:50 UTC (rev 158456)
@@ -1,3 +1,22 @@
+2013-11-01 Dan Bernstein <m...@apple.com>
+
+ [Cocoa] Avoid some double-wrapping of strings and URLs
+ https://bugs.webkit.org/show_bug.cgi?id=123632
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/API/c/cf/WKStringCF.cpp: Removed.
+ * Shared/API/c/cf/WKStringCF.mm: Copied from Source/WebKit2/Shared/API/c/cf/WKStringCF.cpp.
+ (wkNSStringClass): Added this helper.
+ (WKStringCreateWithCFString): If the passed-in CFString is already wrapping a WebString,
+ then retain it and return it.
+ * Shared/API/c/cf/WKURLCF.cpp: Removed.
+ * Shared/API/c/cf/WKURLCF.mm: Copied from Source/WebKit2/Shared/API/c/cf/WKURLCF.cpp.
+ (wkNSURLClass): Added this helper.
+ (WKURLCreateWithCFURL): If the passed-in CFURL is already wrapping a WebURL, then retain it
+ and return it.
+ * WebKit2.xcodeproj/project.pbxproj: Updated for renames.
+
2013-11-01 Anders Carlsson <ander...@apple.com>
Begin work on encoding argument types
Deleted: trunk/Source/WebKit2/Shared/API/c/cf/WKStringCF.cpp (158455 => 158456)
--- trunk/Source/WebKit2/Shared/API/c/cf/WKStringCF.cpp 2013-11-01 21:23:51 UTC (rev 158455)
+++ trunk/Source/WebKit2/Shared/API/c/cf/WKStringCF.cpp 2013-11-01 21:26:50 UTC (rev 158456)
@@ -1,50 +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 "WKStringCF.h"
-
-#include "WKAPICast.h"
-#include <wtf/text/WTFString.h>
-
-using namespace WebCore;
-using namespace WebKit;
-
-WKStringRef WKStringCreateWithCFString(CFStringRef cfString)
-{
- String string(cfString);
- return toCopiedAPI(string);
-}
-
-CFStringRef WKStringCopyCFString(CFAllocatorRef allocatorRef, WKStringRef stringRef)
-{
- ASSERT(!toImpl(stringRef)->string().isNull());
-
- // NOTE: This does not use StringImpl::createCFString() since that function
- // expects to be called on the thread running WebCore.
- if (toImpl(stringRef)->string().is8Bit())
- return CFStringCreateWithBytes(allocatorRef, reinterpret_cast<const UInt8*>(toImpl(stringRef)->string().characters8()), toImpl(stringRef)->string().length(), kCFStringEncodingISOLatin1, true);
- return CFStringCreateWithCharacters(allocatorRef, reinterpret_cast<const UniChar*>(toImpl(stringRef)->string().characters16()), toImpl(stringRef)->string().length());
-}
Copied: trunk/Source/WebKit2/Shared/API/c/cf/WKStringCF.mm (from rev 158455, trunk/Source/WebKit2/Shared/API/c/cf/WKStringCF.cpp) (0 => 158456)
--- trunk/Source/WebKit2/Shared/API/c/cf/WKStringCF.mm (rev 0)
+++ trunk/Source/WebKit2/Shared/API/c/cf/WKStringCF.mm 2013-11-01 21:26:50 UTC (rev 158456)
@@ -0,0 +1,70 @@
+/*
+ * 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 "WKStringCF.h"
+
+#import "WKAPICast.h"
+#import "WKNSString.h"
+#import <objc/runtime.h>
+#import <wtf/text/WTFString.h>
+
+using namespace WebCore;
+using namespace WebKit;
+
+#if WK_API_ENABLED
+static inline Class wkNSStringClass()
+{
+ static dispatch_once_t once;
+ static Class wkNSStringClass;
+ dispatch_once(&once, ^{
+ wkNSStringClass = [WKNSString class];
+ });
+ return wkNSStringClass;
+}
+#endif // WK_API_ENABLED
+
+WKStringRef WKStringCreateWithCFString(CFStringRef cfString)
+{
+#if WK_API_ENABLED
+ // Since WKNSString is an internal class with no subclasses, we can do a simple equality check.
+ if (object_getClass((NSString *)cfString) == wkNSStringClass()) {
+ return toAPI(static_cast<WebString*>(&[(WKNSString *)cfString retain]._apiObject));
+ }
+#endif
+ String string(cfString);
+ return toCopiedAPI(string);
+}
+
+CFStringRef WKStringCopyCFString(CFAllocatorRef allocatorRef, WKStringRef stringRef)
+{
+ ASSERT(!toImpl(stringRef)->string().isNull());
+
+ // NOTE: This does not use StringImpl::createCFString() since that function
+ // expects to be called on the thread running WebCore.
+ if (toImpl(stringRef)->string().is8Bit())
+ return CFStringCreateWithBytes(allocatorRef, reinterpret_cast<const UInt8*>(toImpl(stringRef)->string().characters8()), toImpl(stringRef)->string().length(), kCFStringEncodingISOLatin1, true);
+ return CFStringCreateWithCharacters(allocatorRef, reinterpret_cast<const UniChar*>(toImpl(stringRef)->string().characters16()), toImpl(stringRef)->string().length());
+}
Deleted: trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.cpp (158455 => 158456)
--- trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.cpp 2013-11-01 21:23:51 UTC (rev 158455)
+++ trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.cpp 2013-11-01 21:26:50 UTC (rev 158456)
@@ -1,66 +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 "WKURLCF.h"
-
-#include "WKAPICast.h"
-#include <WebCore/CFURLExtras.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
-#include <wtf/text/CString.h>
-#include <wtf/text/WTFString.h>
-
-using namespace WebCore;
-using namespace WebKit;
-
-WKURLRef WKURLCreateWithCFURL(CFURLRef cfURL)
-{
- if (!cfURL)
- return 0;
-
- CString urlBytes;
- getURLBytes(cfURL, urlBytes);
-
- return toCopiedURLAPI(urlBytes.data());
-}
-
-CFURLRef WKURLCopyCFURL(CFAllocatorRef allocatorRef, WKURLRef URLRef)
-{
- ASSERT(!toImpl(URLRef)->string().isNull());
-
- // We first create a CString and then create the CFURL from it. This will ensure that the CFURL is stored in
- // UTF-8 which uses less memory and is what WebKit clients might expect.
-
- // This pattern of using UTF-8 and then falling back to Latin1 on failure matches URL::createCFString with the
- // major differnce being that URL does not do a UTF-8 conversion and instead chops off the high bits of the UTF-16
- // character sequence.
-
- CString buffer = toImpl(URLRef)->string().utf8();
- CFURLRef result = CFURLCreateAbsoluteURLWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(buffer.data()), buffer.length(), kCFStringEncodingUTF8, 0, true);
- if (!result)
- result = CFURLCreateAbsoluteURLWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(buffer.data()), buffer.length(), kCFStringEncodingISOLatin1, 0, true);
- return result;
-}
Copied: trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.mm (from rev 158455, trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.cpp) (0 => 158456)
--- trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.mm (rev 0)
+++ trunk/Source/WebKit2/Shared/API/c/cf/WKURLCF.mm 2013-11-01 21:26:50 UTC (rev 158456)
@@ -0,0 +1,87 @@
+/*
+ * 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 "WKURLCF.h"
+
+#import "WKAPICast.h"
+#import "WKNSURL.h"
+#import <WebCore/CFURLExtras.h>
+#import <objc/runtime.h>
+#import <wtf/PassRefPtr.h>
+#import <wtf/RefPtr.h>
+#import <wtf/text/CString.h>
+#import <wtf/text/WTFString.h>
+
+using namespace WebCore;
+using namespace WebKit;
+
+#if WK_API_ENABLED
+static inline Class wkNSURLClass()
+{
+ static dispatch_once_t once;
+ static Class wkNSURLClass;
+ dispatch_once(&once, ^{
+ wkNSURLClass = [WKNSURL class];
+ });
+ return wkNSURLClass;
+}
+#endif // WK_API_ENABLED
+
+WKURLRef WKURLCreateWithCFURL(CFURLRef cfURL)
+{
+ if (!cfURL)
+ return 0;
+
+#if WK_API_ENABLED
+ // Since WKNSURL is an internal class with no subclasses, we can do a simple equality check.
+ if (object_getClass((NSURL *)cfURL) == wkNSURLClass()) {
+ return toAPI(static_cast<WebURL*>(&[(WKNSURL *)cfURL retain]._apiObject));
+ }
+#endif
+
+ CString urlBytes;
+ getURLBytes(cfURL, urlBytes);
+
+ return toCopiedURLAPI(urlBytes.data());
+}
+
+CFURLRef WKURLCopyCFURL(CFAllocatorRef allocatorRef, WKURLRef URLRef)
+{
+ ASSERT(!toImpl(URLRef)->string().isNull());
+
+ // We first create a CString and then create the CFURL from it. This will ensure that the CFURL is stored in
+ // UTF-8 which uses less memory and is what WebKit clients might expect.
+
+ // This pattern of using UTF-8 and then falling back to Latin1 on failure matches URL::createCFString with the
+ // major differnce being that URL does not do a UTF-8 conversion and instead chops off the high bits of the UTF-16
+ // character sequence.
+
+ CString buffer = toImpl(URLRef)->string().utf8();
+ CFURLRef result = CFURLCreateAbsoluteURLWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(buffer.data()), buffer.length(), kCFStringEncodingUTF8, 0, true);
+ if (!result)
+ result = CFURLCreateAbsoluteURLWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(buffer.data()), buffer.length(), kCFStringEncodingISOLatin1, 0, true);
+ return result;
+}
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (158455 => 158456)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-11-01 21:23:51 UTC (rev 158455)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-11-01 21:26:50 UTC (rev 158456)
@@ -850,9 +850,9 @@
BC40760C124FF0270068F20A /* WKURLRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = BC4075F0124FF0270068F20A /* WKURLRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC40760D124FF0270068F20A /* WKURLResponse.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC4075F1124FF0270068F20A /* WKURLResponse.cpp */; };
BC40760E124FF0270068F20A /* WKURLResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = BC4075F2124FF0270068F20A /* WKURLResponse.h */; settings = {ATTRIBUTES = (Private, ); }; };
- BC407619124FF0370068F20A /* WKStringCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC407611124FF0370068F20A /* WKStringCF.cpp */; };
+ BC407619124FF0370068F20A /* WKStringCF.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC407611124FF0370068F20A /* WKStringCF.mm */; };
BC40761A124FF0370068F20A /* WKStringCF.h in Headers */ = {isa = PBXBuildFile; fileRef = BC407612124FF0370068F20A /* WKStringCF.h */; settings = {ATTRIBUTES = (Private, ); }; };
- BC40761B124FF0370068F20A /* WKURLCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC407613124FF0370068F20A /* WKURLCF.cpp */; };
+ BC40761B124FF0370068F20A /* WKURLCF.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC407613124FF0370068F20A /* WKURLCF.mm */; };
BC40761C124FF0370068F20A /* WKURLCF.h in Headers */ = {isa = PBXBuildFile; fileRef = BC407614124FF0370068F20A /* WKURLCF.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC407627124FF0400068F20A /* WKCertificateInfoMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BC407621124FF0400068F20A /* WKCertificateInfoMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC407628124FF0400068F20A /* WKCertificateInfoMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC407622124FF0400068F20A /* WKCertificateInfoMac.mm */; };
@@ -2388,9 +2388,9 @@
BC4075F0124FF0270068F20A /* WKURLRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKURLRequest.h; sourceTree = "<group>"; };
BC4075F1124FF0270068F20A /* WKURLResponse.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKURLResponse.cpp; sourceTree = "<group>"; };
BC4075F2124FF0270068F20A /* WKURLResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKURLResponse.h; sourceTree = "<group>"; };
- BC407611124FF0370068F20A /* WKStringCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKStringCF.cpp; sourceTree = "<group>"; };
+ BC407611124FF0370068F20A /* WKStringCF.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKStringCF.mm; sourceTree = "<group>"; };
BC407612124FF0370068F20A /* WKStringCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKStringCF.h; sourceTree = "<group>"; };
- BC407613124FF0370068F20A /* WKURLCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKURLCF.cpp; sourceTree = "<group>"; };
+ BC407613124FF0370068F20A /* WKURLCF.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKURLCF.mm; sourceTree = "<group>"; };
BC407614124FF0370068F20A /* WKURLCF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKURLCF.h; sourceTree = "<group>"; };
BC407621124FF0400068F20A /* WKCertificateInfoMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKCertificateInfoMac.h; sourceTree = "<group>"; };
BC407622124FF0400068F20A /* WKCertificateInfoMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKCertificateInfoMac.mm; sourceTree = "<group>"; };
@@ -4759,9 +4759,9 @@
children = (
BCFD5489132D82680055D816 /* WKErrorCF.cpp */,
BCFD548A132D82680055D816 /* WKErrorCF.h */,
- BC407611124FF0370068F20A /* WKStringCF.cpp */,
+ BC407611124FF0370068F20A /* WKStringCF.mm */,
BC407612124FF0370068F20A /* WKStringCF.h */,
- BC407613124FF0370068F20A /* WKURLCF.cpp */,
+ BC407613124FF0370068F20A /* WKURLCF.mm */,
BC407614124FF0370068F20A /* WKURLCF.h */,
);
path = cf;
@@ -7252,12 +7252,12 @@
F634445C12A885E9000612D8 /* WKSecurityOrigin.cpp in Sources */,
BC407603124FF0270068F20A /* WKSerializedScriptValue.cpp in Sources */,
BC407605124FF0270068F20A /* WKString.cpp in Sources */,
- BC407619124FF0370068F20A /* WKStringCF.cpp in Sources */,
+ BC407619124FF0370068F20A /* WKStringCF.mm in Sources */,
1A4A9AA912B7E796008FE984 /* WKTextInputWindowController.mm in Sources */,
BC407607124FF0270068F20A /* WKType.cpp in Sources */,
7CD5EBBE1746B04C000C1C45 /* WKTypeRefWrapper.mm in Sources */,
BC407609124FF0270068F20A /* WKURL.cpp in Sources */,
- BC40761B124FF0370068F20A /* WKURLCF.cpp in Sources */,
+ BC40761B124FF0370068F20A /* WKURLCF.mm in Sources */,
BC40760B124FF0270068F20A /* WKURLRequest.cpp in Sources */,
BC40762A124FF0400068F20A /* WKURLRequestNS.mm in Sources */,
512A9760180E031D0039A149 /* DatabaseProcessMessageReceiver.cpp in Sources */,
