Diff
Modified: trunk/Source/WebKit2/ChangeLog (150276 => 150277)
--- trunk/Source/WebKit2/ChangeLog 2013-05-17 18:16:41 UTC (rev 150276)
+++ trunk/Source/WebKit2/ChangeLog 2013-05-17 18:28:02 UTC (rev 150277)
@@ -1,5 +1,39 @@
2013-05-17 Sam Weinig <s...@webkit.org>
+ Expose new load-with-userData API to Objective-C
+ https://bugs.webkit.org/show_bug.cgi?id=116335
+
+ Reviewed by Anders Carlsson.
+
+ - Adds loadRequest:userData:, loadFileURL:restrictToFilesWithin:userData:, loadHTMLString:baseURL:userData:
+ loadData:MIMEType:textEncodingName:baseURL:, and loadData:MIMEType:textEncodingName:baseURL:userData.
+ - Adds a WKObjCTypeWrapperRef (which is a ObjCObjectGraph under the covers) to allow the userData to be unwrapped
+ in the injected bundles willLoadURLRequest and willLoadDataRequest C-SPI callbacks.
+
+ * Shared/API/c/WKBase.h:
+ * Shared/API/c/WKSharedAPICast.h:
+ * Shared/API/c/mac/WKBaseMac.h: Added.
+ * Shared/API/c/mac/WKObjCTypeWrapperRef.h: Added.
+ * Shared/API/c/mac/WKObjCTypeWrapperRef.mm: Added.
+ (WKObjCTypeWrapperGetTypeID):
+ (WKObjCTypeWrapperCreate):
+ (WKObjCTypeWrapperGetObject):
+ * UIProcess/API/mac/WKBrowsingContextController.h:
+ * UIProcess/API/mac/WKBrowsingContextController.mm:
+ (+[WKBrowsingContextController registerSchemeForCustomProtocol:]):
+ (+[WKBrowsingContextController unregisterSchemeForCustomProtocol:]):
+ (-[WKBrowsingContextController loadRequest:]):
+ (-[WKBrowsingContextController loadRequest:userData:]):
+ (-[WKBrowsingContextController loadFileURL:restrictToFilesWithin:]):
+ (-[WKBrowsingContextController loadFileURL:restrictToFilesWithin:userData:]):
+ (-[WKBrowsingContextController loadHTMLString:baseURL:]):
+ (-[WKBrowsingContextController loadHTMLString:baseURL:userData:]):
+ (-[WKBrowsingContextController loadData:MIMEType:textEncodingName:baseURL:]):
+ (-[WKBrowsingContextController loadData:MIMEType:textEncodingName:baseURL:userData:]):
+ * WebKit2.xcodeproj/project.pbxproj:
+
+2013-05-17 Sam Weinig <s...@webkit.org>
+
Add WKPageLoadData and WKPageLoadDataWithUserData SPI to support loading arbitrary data blobs
https://bugs.webkit.org/show_bug.cgi?id=116325
Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (150276 => 150277)
--- trunk/Source/WebKit2/Shared/API/c/WKBase.h 2013-05-17 18:16:41 UTC (rev 150276)
+++ trunk/Source/WebKit2/Shared/API/c/WKBase.h 2013-05-17 18:28:02 UTC (rev 150277)
@@ -41,6 +41,10 @@
#include <WebKit2/WKBaseEfl.h>
#endif
+#if defined(__APPLE__)
+#include <WebKit2/WKBaseMac.h>
+#endif
+
/* WebKit2 shared types */
typedef uint32_t WKTypeID;
Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (150276 => 150277)
--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-05-17 18:16:41 UTC (rev 150276)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-05-17 18:28:02 UTC (rev 150277)
@@ -63,6 +63,7 @@
class ImmutableDictionary;
class MutableArray;
class MutableDictionary;
+class ObjCObjectGraph;
class WebArchive;
class WebArchiveResource;
class WebCertificateInfo;
@@ -116,6 +117,7 @@
#if PLATFORM(MAC)
WK_ADD_API_MAPPING(WKWebArchiveRef, WebArchive)
WK_ADD_API_MAPPING(WKWebArchiveResourceRef, WebArchiveResource)
+WK_ADD_API_MAPPING(WKObjCTypeWrapperRef, ObjCObjectGraph)
#endif
template<typename ImplType, typename APIType = typename ImplTypeInfo<ImplType*>::APIType>
Added: trunk/Source/WebKit2/Shared/API/c/mac/WKBaseMac.h (0 => 150277)
--- trunk/Source/WebKit2/Shared/API/c/mac/WKBaseMac.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/c/mac/WKBaseMac.h 2013-05-17 18:28:02 UTC (rev 150277)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2013 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 WKBaseMac_h
+#define WKBaseMac_h
+
+#ifndef WKBase_h
+#error "Please #include \"WKBase.h\" instead of this file directly."
+#endif
+
+typedef const struct OpaqueWKObjCTypeWrapper* WKObjCTypeWrapperRef;
+
+#endif /* WKBaseMac_h */
Added: trunk/Source/WebKit2/Shared/API/c/mac/WKObjCTypeWrapperRef.h (0 => 150277)
--- trunk/Source/WebKit2/Shared/API/c/mac/WKObjCTypeWrapperRef.h (rev 0)
+++ trunk/Source/WebKit2/Shared/API/c/mac/WKObjCTypeWrapperRef.h 2013-05-17 18:28:02 UTC (rev 150277)
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2013 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 WKObjCTypeWrapperRef_h
+#define WKObjCTypeWrapperRef_h
+
+#include <Foundation/Foundation.h>
+#include <WebKit2/WKBase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT WKTypeID WKObjCTypeWrapperGetTypeID();
+
+WK_EXPORT WKObjCTypeWrapperRef WKObjCTypeWrapperCreate(id object);
+WK_EXPORT id WKObjCTypeWrapperGetObject(WKObjCTypeWrapperRef wrapper);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKObjCTypeWrapperRef_h */
Added: trunk/Source/WebKit2/Shared/API/c/mac/WKObjCTypeWrapperRef.mm (0 => 150277)
--- trunk/Source/WebKit2/Shared/API/c/mac/WKObjCTypeWrapperRef.mm (rev 0)
+++ trunk/Source/WebKit2/Shared/API/c/mac/WKObjCTypeWrapperRef.mm 2013-05-17 18:28:02 UTC (rev 150277)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2013 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 "WKObjCTypeWrapperRef.h"
+
+#import "ObjCObjectGraph.h"
+#import "WKSharedAPICast.h"
+
+using namespace WebKit;
+
+WKTypeID WKObjCTypeWrapperGetTypeID()
+{
+ return toAPI(ObjCObjectGraph::APIType);
+}
+
+WKObjCTypeWrapperRef WKObjCTypeWrapperCreate(id object)
+{
+ RefPtr<ObjCObjectGraph> objectWrapper = ObjCObjectGraph::create(object);
+ return toAPI(objectWrapper.release().leakRef());
+}
+
+id WKObjCTypeWrapperGetObject(WKObjCTypeWrapperRef wrapperRef)
+{
+ return toImpl(wrapperRef)->rootObject();
+}
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h (150276 => 150277)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h 2013-05-17 18:16:41 UTC (rev 150276)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h 2013-05-17 18:28:02 UTC (rev 150277)
@@ -48,6 +48,7 @@
/* Load a request. This is only valid for requests of non-file: URLs. Passing a
file: URL will throw an exception. */
- (void)loadRequest:(NSURLRequest *)request;
+- (void)loadRequest:(NSURLRequest *)request userData:(id)userData;
/* Load a file: URL. Opens the sandbox only for files within allowedDirectory.
- Passing a non-file: URL to either parameter will yield an exception.
@@ -55,10 +56,16 @@
reading.
*/
- (void)loadFileURL:(NSURL *)URL restrictToFilesWithin:(NSURL *)allowedDirectory;
+- (void)loadFileURL:(NSURL *)URL restrictToFilesWithin:(NSURL *)allowedDirectory userData:(id)userData;
/* Load a page using the passed in string as its contents. */
- (void)loadHTMLString:(NSString *)HTMLString baseURL:(NSURL *)baseURL;
+- (void)loadHTMLString:(NSString *)HTMLString baseURL:(NSURL *)baseURL userData:(id)userData;
+/* Load a page using the passed in data as its contents. */
+- (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)baseURL;
+- (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)baseURL userData:(id)userData;
+
/* Stops the load associated with the active URL. */
- (void)stopLoading;
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm (150276 => 150277)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2013-05-17 18:16:41 UTC (rev 150276)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm 2013-05-17 18:28:02 UTC (rev 150277)
@@ -28,6 +28,7 @@
#import "WKBrowsingContextControllerPrivate.h"
#import "WKBrowsingContextControllerInternal.h"
+#import "ObjCObjectGraph.h"
#import "WKErrorCF.h"
#import "WKFrame.h"
#import "WKPagePrivate.h"
@@ -37,11 +38,14 @@
#import "WKURLRequest.h"
#import "WKURLRequestNS.h"
#import "WebContext.h"
+#import "WebData.h"
#import "WebPageProxy.h"
#import <wtf/RetainPtr.h>
#import "WKBrowsingContextLoadDelegate.h"
+using namespace WebKit;
+
static inline NSString *autoreleased(WKStringRef string)
{
WKRetainPtr<WKStringRef> wkString = adoptWK(string);
@@ -104,7 +108,7 @@
NSString *lowercaseScheme = [scheme lowercaseString];
[[WKBrowsingContextController customSchemes] addObject:lowercaseScheme];
- [[NSNotificationCenter defaultCenter] postNotificationName:WebKit::SchemeForCustomProtocolRegisteredNotificationName object:lowercaseScheme];
+ [[NSNotificationCenter defaultCenter] postNotificationName:SchemeForCustomProtocolRegisteredNotificationName object:lowercaseScheme];
}
+ (void)unregisterSchemeForCustomProtocol:(NSString *)scheme
@@ -114,28 +118,52 @@
NSString *lowercaseScheme = [scheme lowercaseString];
[[WKBrowsingContextController customSchemes] removeObject:lowercaseScheme];
- [[NSNotificationCenter defaultCenter] postNotificationName:WebKit::SchemeForCustomProtocolUnregisteredNotificationName object:lowercaseScheme];
+ [[NSNotificationCenter defaultCenter] postNotificationName:SchemeForCustomProtocolUnregisteredNotificationName object:lowercaseScheme];
}
- (void)loadRequest:(NSURLRequest *)request
{
+ [self loadRequest:request userData:nil];
+}
+
+- (void)loadRequest:(NSURLRequest *)request userData:(id)userData
+{
WKRetainPtr<WKURLRequestRef> wkRequest = adoptWK(WKURLRequestCreateWithNSURLRequest(request));
- WKPageLoadURLRequest(self._pageRef, wkRequest.get());
+
+ RefPtr<ObjCObjectGraph> wkUserData;
+ if (userData)
+ wkUserData = ObjCObjectGraph::create(userData);
+
+ WKPageLoadURLRequestWithUserData(self._pageRef, wkRequest.get(), (WKTypeRef)wkUserData.get());
}
- (void)loadFileURL:(NSURL *)URL restrictToFilesWithin:(NSURL *)allowedDirectory
{
+ [self loadFileURL:URL restrictToFilesWithin:allowedDirectory userData:nil];
+}
+
+- (void)loadFileURL:(NSURL *)URL restrictToFilesWithin:(NSURL *)allowedDirectory userData:(id)userData
+{
if (![URL isFileURL] || (allowedDirectory && ![allowedDirectory isFileURL]))
[NSException raise:NSInvalidArgumentException format:@"Attempted to load a non-file URL"];
WKRetainPtr<WKURLRef> wkURL = adoptWK(WKURLCreateWithCFURL((CFURLRef)URL));
WKRetainPtr<WKURLRef> wkAllowedDirectory = adoptWK(WKURLCreateWithCFURL((CFURLRef)allowedDirectory));
- WKPageLoadFile(self._pageRef, wkURL.get(), wkAllowedDirectory.get());
+ RefPtr<ObjCObjectGraph> wkUserData;
+ if (userData)
+ wkUserData = ObjCObjectGraph::create(userData);
+
+ WKPageLoadFileWithUserData(self._pageRef, wkURL.get(), wkAllowedDirectory.get(), (WKTypeRef)wkUserData.get());
}
- (void)loadHTMLString:(NSString *)HTMLString baseURL:(NSURL *)baseURL
{
+ [self loadHTMLString:HTMLString baseURL:baseURL userData:nil];
+}
+
+- (void)loadHTMLString:(NSString *)HTMLString baseURL:(NSURL *)baseURL userData:(id)userData
+{
WKRetainPtr<WKStringRef> wkHTMLString;
if (HTMLString)
wkHTMLString = adoptWK(WKStringCreateWithCFString((CFStringRef)HTMLString));
@@ -144,9 +172,50 @@
if (baseURL)
wkBaseURL = adoptWK(WKURLCreateWithCFURL((CFURLRef)baseURL));
- WKPageLoadHTMLString(self._pageRef, wkHTMLString.get(), wkBaseURL.get());
+ RefPtr<ObjCObjectGraph> wkUserData;
+ if (userData)
+ wkUserData = ObjCObjectGraph::create(userData);
+
+ WKPageLoadHTMLStringWithUserData(self._pageRef, wkHTMLString.get(), wkBaseURL.get(), (WKTypeRef)wkUserData.get());
}
+- (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)baseURL
+{
+ [self loadData:data MIMEType:MIMEType textEncodingName:encodingName baseURL:baseURL userData:nil];
+}
+
+static void releaseNSData(unsigned char*, const void* data)
+{
+ [(NSData *)data release];
+}
+
+- (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)baseURL userData:(id)userData
+{
+ RefPtr<WebData> wkData;
+ if (data) {
+ [data retain];
+ wkData = WebData::createWithoutCopying((const unsigned char*)[data bytes], [data length], releaseNSData, data);
+ }
+
+ WKRetainPtr<WKStringRef> wkMIMEType;
+ if (MIMEType)
+ wkMIMEType = adoptWK(WKStringCreateWithCFString((CFStringRef)MIMEType));
+
+ WKRetainPtr<WKStringRef> wkEncodingName;
+ if (encodingName)
+ wkEncodingName = adoptWK(WKStringCreateWithCFString((CFStringRef)encodingName));
+
+ WKRetainPtr<WKURLRef> wkBaseURL;
+ if (baseURL)
+ wkBaseURL = adoptWK(WKURLCreateWithCFURL((CFURLRef)baseURL));
+
+ RefPtr<ObjCObjectGraph> wkUserData;
+ if (userData)
+ wkUserData = ObjCObjectGraph::create(userData);
+
+ WKPageLoadDataWithUserData(self._pageRef, toAPI(wkData.get()), wkMIMEType.get(), wkEncodingName.get(), wkBaseURL.get(), (WKTypeRef)wkUserData.get());
+}
+
- (void)stopLoading
{
WKPageStopLoading(self._pageRef);
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (150276 => 150277)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-05-17 18:16:41 UTC (rev 150276)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-05-17 18:28:02 UTC (rev 150277)
@@ -587,6 +587,9 @@
7CB16FF21724BA28007A0A95 /* com.macromedia.Flash Player.plugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7CB16FE51724B9B5007A0A95 /* com.macromedia.Flash Player.plugin.sb */; };
7CB16FF31724BA2F007A0A95 /* com.microsoft.SilverlightPlugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7CB16FE61724B9B5007A0A95 /* com.microsoft.SilverlightPlugin.sb */; };
7CB16FF41724BA30007A0A95 /* com.oracle.java.JavaAppletPlugin.sb in Copy Plug-in Sandbox Profiles */ = {isa = PBXBuildFile; fileRef = 7CB16FE71724B9B5007A0A95 /* com.oracle.java.JavaAppletPlugin.sb */; };
+ 7CD5EBB81746A15B000C1C45 /* WKObjCTypeWrapperRef.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CD5EBB61746A15B000C1C45 /* WKObjCTypeWrapperRef.mm */; };
+ 7CD5EBB91746A15B000C1C45 /* WKObjCTypeWrapperRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBB71746A15B000C1C45 /* WKObjCTypeWrapperRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 7CD5EBBB1746A83E000C1C45 /* WKBaseMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD5EBBA1746A83E000C1C45 /* WKBaseMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
7CD622771739D863005BD7FF /* PluginSandboxProfile.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7CD622751739D863005BD7FF /* PluginSandboxProfile.mm */; };
7CD622781739D863005BD7FF /* PluginSandboxProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CD622761739D863005BD7FF /* PluginSandboxProfile.h */; };
7CF47FF617275B71008ACB91 /* WKBundlePageBanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CF47FF417275B71008ACB91 /* WKBundlePageBanner.cpp */; };
@@ -2068,6 +2071,9 @@
7CB16FE51724B9B5007A0A95 /* com.macromedia.Flash Player.plugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "com.macromedia.Flash Player.plugin.sb"; sourceTree = "<group>"; };
7CB16FE61724B9B5007A0A95 /* com.microsoft.SilverlightPlugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.microsoft.SilverlightPlugin.sb; sourceTree = "<group>"; };
7CB16FE71724B9B5007A0A95 /* com.oracle.java.JavaAppletPlugin.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com.oracle.java.JavaAppletPlugin.sb; sourceTree = "<group>"; };
+ 7CD5EBB61746A15B000C1C45 /* WKObjCTypeWrapperRef.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKObjCTypeWrapperRef.mm; sourceTree = "<group>"; };
+ 7CD5EBB71746A15B000C1C45 /* WKObjCTypeWrapperRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKObjCTypeWrapperRef.h; sourceTree = "<group>"; };
+ 7CD5EBBA1746A83E000C1C45 /* WKBaseMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBaseMac.h; sourceTree = "<group>"; };
7CD622751739D863005BD7FF /* PluginSandboxProfile.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginSandboxProfile.mm; sourceTree = "<group>"; };
7CD622761739D863005BD7FF /* PluginSandboxProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginSandboxProfile.h; sourceTree = "<group>"; };
7CF47FF417275B71008ACB91 /* WKBundlePageBanner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKBundlePageBanner.cpp; sourceTree = "<group>"; };
@@ -4509,8 +4515,11 @@
BC4075D6124FF0000068F20A /* mac */ = {
isa = PBXGroup;
children = (
+ 7CD5EBBA1746A83E000C1C45 /* WKBaseMac.h */,
BC407621124FF0400068F20A /* WKCertificateInfoMac.h */,
BC407622124FF0400068F20A /* WKCertificateInfoMac.mm */,
+ 7CD5EBB71746A15B000C1C45 /* WKObjCTypeWrapperRef.h */,
+ 7CD5EBB61746A15B000C1C45 /* WKObjCTypeWrapperRef.mm */,
BC407623124FF0400068F20A /* WKURLRequestNS.h */,
BC407624124FF0400068F20A /* WKURLRequestNS.mm */,
BC407625124FF0400068F20A /* WKURLResponseNS.h */,
@@ -5664,6 +5673,7 @@
BCDDB32D124EC2E10048D13C /* WKAPICast.h in Headers */,
512E34E5130B4D0500ABD19A /* WKApplicationCacheManager.h in Headers */,
7CF47FFB17275C57008ACB91 /* PageBanner.h in Headers */,
+ 7CD5EBBB1746A83E000C1C45 /* WKBaseMac.h in Headers */,
BC4075F4124FF0270068F20A /* WKArray.h in Headers */,
512F58F612A88A5400629530 /* WKAuthenticationChallenge.h in Headers */,
512F58F812A88A5400629530 /* WKAuthenticationDecisionListener.h in Headers */,
@@ -5672,6 +5682,7 @@
BC646C1D11DD399F006455B0 /* WKBackForwardListItem.h in Headers */,
BCDDB317124EBD130048D13C /* WKBase.h in Headers */,
290F4272172A0C7400939FF0 /* ChildProcessSupplement.h in Headers */,
+ 7CD5EBB91746A15B000C1C45 /* WKObjCTypeWrapperRef.h in Headers */,
BCBAAC73144E619E0053F82F /* WKBrowsingContextController.h in Headers */,
BCBAAC74144E61A50053F82F /* WKBrowsingContextControllerInternal.h in Headers */,
3788A05C14743C90006319E5 /* WKBrowsingContextControllerPrivate.h in Headers */,
@@ -6920,6 +6931,7 @@
1A043A0A124D11A900FFBFB5 /* WebProcessConnection.cpp in Sources */,
1A043F6912514D8B00FFBFB5 /* WebProcessConnectionMessageReceiver.cpp in Sources */,
BC306825125A6B9400E71278 /* WebProcessCreationParameters.cpp in Sources */,
+ 7CD5EBB81746A15B000C1C45 /* WKObjCTypeWrapperRef.mm in Sources */,
BC3065C412592F8900E71278 /* WebProcessMac.mm in Sources */,
BC3066BE125A442100E71278 /* WebProcessMessageReceiver.cpp in Sources */,
BC111B11112F5E4F00337BAB /* WebProcessProxy.cpp in Sources */,
