<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[164603] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/164603">164603</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-02-24 13:10:50 -0800 (Mon, 24 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename WKProcessClass to WKProcessPool
https://bugs.webkit.org/show_bug.cgi?id=129268
Reviewed by Dan Bernstein.
Stage this rename by adding back WKProcessClass and WKProcessClassConfiguration as subclasses of the renamed classes.
* Shared/Cocoa/APIObject.mm:
(API::Object::newObject):
* UIProcess/API/Cocoa/WKProcessClass.h:
* UIProcess/API/Cocoa/WKProcessClass.mm:
* UIProcess/API/Cocoa/WKProcessClassConfiguration.h:
* UIProcess/API/Cocoa/WKProcessClassConfiguration.mm:
* UIProcess/API/Cocoa/WKProcessClassConfigurationPrivate.h:
* UIProcess/API/Cocoa/WKProcessClassPrivate.h:
* UIProcess/API/Cocoa/WKProcessPool.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.h.
* UIProcess/API/Cocoa/WKProcessPool.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm.
(-[WKProcessPool init]):
(-[WKProcessPool initWithConfiguration:]):
(-[WKProcessPool dealloc]):
(-[WKProcessPool description]):
(-[WKProcessPool configuration]):
(-[WKProcessPool API::]):
(-[WKProcessPool _setAllowsSpecificHTTPSCertificate:forHost:]):
* UIProcess/API/Cocoa/WKProcessPoolConfiguration.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.h.
* UIProcess/API/Cocoa/WKProcessPoolConfiguration.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.mm.
(-[WKProcessPoolConfiguration _injectedBundleURL]):
(-[WKProcessPoolConfiguration _setInjectedBundleURL:]):
(-[WKProcessPoolConfiguration description]):
(-[WKProcessPoolConfiguration copyWithZone:]):
* UIProcess/API/Cocoa/WKProcessPoolConfigurationPrivate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfigurationPrivate.h.
* UIProcess/API/Cocoa/WKProcessPoolInternal.h: Renamed from Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassInternal.h.
(WebKit::wrapper):
* UIProcess/API/Cocoa/WKProcessPoolPrivate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassPrivate.h.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
* UIProcess/API/Cocoa/WKWebViewConfiguration.h:
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration description]):
(-[WKWebViewConfiguration copyWithZone:]):
(-[WKWebViewConfiguration processPool]):
(-[WKWebViewConfiguration setProcessPool:]):
* UIProcess/API/Cocoa/WKWebViewConfigurationToBeRemoved.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassPrivate.h.
(-[WKWebViewConfiguration setProcessClass:]):
(-[WKWebViewConfiguration processClass]):
* UIProcess/API/mac/WKView.mm:
* UIProcess/ios/WKContentView.mm:
(-[WKContentView _decidePolicyForGeolocationRequestFromOrigin:frame:request:]):
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaAPIObjectmm">trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessClassh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessClassmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessClassConfigurationh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessClassConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessClassConfigurationPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfigurationPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessClassPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolConfigurationh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfiguration.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolConfigurationPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfigurationPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationToBeRemovedmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationToBeRemoved.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessClassInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164602 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-24 21:00:36 UTC (rev 164602)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2014-02-24 Anders Carlsson <andersca@apple.com>
+
+ Rename WKProcessClass to WKProcessPool
+ https://bugs.webkit.org/show_bug.cgi?id=129268
+
+ Reviewed by Dan Bernstein.
+
+ Stage this rename by adding back WKProcessClass and WKProcessClassConfiguration as subclasses of the renamed classes.
+
+ * Shared/Cocoa/APIObject.mm:
+ (API::Object::newObject):
+ * UIProcess/API/Cocoa/WKProcessClass.h:
+ * UIProcess/API/Cocoa/WKProcessClass.mm:
+ * UIProcess/API/Cocoa/WKProcessClassConfiguration.h:
+ * UIProcess/API/Cocoa/WKProcessClassConfiguration.mm:
+ * UIProcess/API/Cocoa/WKProcessClassConfigurationPrivate.h:
+ * UIProcess/API/Cocoa/WKProcessClassPrivate.h:
+ * UIProcess/API/Cocoa/WKProcessPool.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.h.
+ * UIProcess/API/Cocoa/WKProcessPool.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm.
+ (-[WKProcessPool init]):
+ (-[WKProcessPool initWithConfiguration:]):
+ (-[WKProcessPool dealloc]):
+ (-[WKProcessPool description]):
+ (-[WKProcessPool configuration]):
+ (-[WKProcessPool API::]):
+ (-[WKProcessPool _setAllowsSpecificHTTPSCertificate:forHost:]):
+ * UIProcess/API/Cocoa/WKProcessPoolConfiguration.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.h.
+ * UIProcess/API/Cocoa/WKProcessPoolConfiguration.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.mm.
+ (-[WKProcessPoolConfiguration _injectedBundleURL]):
+ (-[WKProcessPoolConfiguration _setInjectedBundleURL:]):
+ (-[WKProcessPoolConfiguration description]):
+ (-[WKProcessPoolConfiguration copyWithZone:]):
+ * UIProcess/API/Cocoa/WKProcessPoolConfigurationPrivate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfigurationPrivate.h.
+ * UIProcess/API/Cocoa/WKProcessPoolInternal.h: Renamed from Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassInternal.h.
+ (WebKit::wrapper):
+ * UIProcess/API/Cocoa/WKProcessPoolPrivate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassPrivate.h.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.h:
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration description]):
+ (-[WKWebViewConfiguration copyWithZone:]):
+ (-[WKWebViewConfiguration processPool]):
+ (-[WKWebViewConfiguration setProcessPool:]):
+ * UIProcess/API/Cocoa/WKWebViewConfigurationToBeRemoved.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassPrivate.h.
+ (-[WKWebViewConfiguration setProcessClass:]):
+ (-[WKWebViewConfiguration processClass]):
+ * UIProcess/API/mac/WKView.mm:
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView _decidePolicyForGeolocationRequestFromOrigin:frame:request:]):
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-02-24 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Move non-API files out of WebKit2/UIProcess/API/mac
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaAPIObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (164602 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2014-02-24 21:00:36 UTC (rev 164602)
+++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> #import "WKNSURLAuthenticationChallenge.h"
</span><span class="cx"> #import "WKNSURLProtectionSpace.h"
</span><span class="cx"> #import "WKNavigationDataInternal.h"
</span><del>-#import "WKProcessClassInternal.h"
</del><ins>+#import "WKProcessPoolInternal.h"
</ins><span class="cx"> #import "WKWebProcessPlugInBrowserContextControllerInternal.h"
</span><span class="cx"> #import "WKWebProcessPlugInFrameInternal.h"
</span><span class="cx"> #import "WKWebProcessPlugInHitTestResultInternal.h"
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case Type::Context:
</span><del>- wrapper = [WKProcessClass alloc];
</del><ins>+ wrapper = [WKProcessPool alloc];
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case Type::Data:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessClassh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.h (164602 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.h 2014-02-24 21:00:36 UTC (rev 164602)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.h 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -23,41 +23,12 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit2/WKProcessPool.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-@class WKProcessClassConfiguration;
-
-/*! A WKProcessClass defines a distinct type-or category-of Web Content process.
- A @link WKWebView @/link specifies the WKProcessClass of the Web
- Content process backing it through its @link WKWebViewConfiguration @/link.
- @helperclass @link WKProcessClassConfiguration @/link
- Used to configure @link WKProcessClass @/link instances.
- */
</del><span class="cx"> WK_API_CLASS
</span><del>-@interface WKProcessClass : NSObject
-
-/*! @abstract A copy of the configuration with which the @link WKProcessClass @/link was
- initialized.
-*/
-@property (nonatomic, readonly) WKProcessClassConfiguration *configuration;
-
-/*!
- @abstract Returns an instance initialized with the specified configuration.
- @param configuration The configuration for the new instance.
- @result An initialized instance, or nil if the object could not be initialized.
- @discussion This is a designated initializer. You can use @link -init @/link to initialize an
- instance with the default configuration.
-
- The initializer copies
- @link //apple_ref/doc/methodparam/WKProcessClass/initWithConfiguration:/configuration
- configuration@/link, so mutating it after initialization has no effect on the
- @link WKProcessClass @/link instance.
-*/
-- (instancetype)initWithConfiguration:(WKProcessClassConfiguration *)configuration WK_DESIGNATED_INITIALIZER;
-
</del><ins>+@interface WKProcessClass : WKProcessPool
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessClassmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm (164602 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm 2014-02-24 21:00:36 UTC (rev 164602)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -24,86 +24,11 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><del>-#import "WKProcessClassInternal.h"
</del><ins>+#import "WKProcessClass.h"
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import "HistoryClient.h"
-#import "WKObject.h"
-#import "WKProcessClassConfigurationPrivate.h"
-#import "WebCertificateInfo.h"
-#import "WebContext.h"
-#import <WebCore/CertificateInfo.h>
-#import <wtf/RetainPtr.h>
-
-#if PLATFORM(IOS)
-#import <WebCore/WebCoreThreadSystemInterface.h>
-#endif
-
</del><span class="cx"> @implementation WKProcessClass
</span><del>-
-- (instancetype)init
-{
- return [self initWithConfiguration:adoptNS([[WKProcessClassConfiguration alloc] init]).get()];
-}
-
-- (instancetype)initWithConfiguration:(WKProcessClassConfiguration *)configuration
-{
- if (!(self = [super init]))
- return nil;
-
- _configuration = adoptNS([configuration copy]);
-
-#if PLATFORM(IOS)
- // FIXME: Remove once <rdar://problem/15256572> is fixed.
- InitWebCoreThreadSystemInterface();
-#endif
-
- String bundlePath;
- if (NSURL *bundleURL = [_configuration _injectedBundleURL]) {
- if (!bundleURL.isFileURL)
- [NSException raise:NSInvalidArgumentException format:@"Injected Bundle URL must be a file URL"];
-
- bundlePath = bundleURL.path;
- }
-
- API::Object::constructInWrapper<WebKit::WebContext>(self, bundlePath);
- _context->setHistoryClient(std::make_unique<WebKit::HistoryClient>());
-
- return self;
-}
-
-- (void)dealloc
-{
- _context->~WebContext();
-
- [super dealloc];
-}
-
-- (NSString *)description
-{
- return [NSString stringWithFormat:@"<%@: %p; configuration = %@>", NSStringFromClass(self.class), self, _configuration.get()];
-}
-
-- (WKProcessClassConfiguration *)configuration
-{
- return [[_configuration copy] autorelease];
-}
-
-- (API::Object&)_apiObject
-{
- return *_context;
-}
-
</del><span class="cx"> @end
</span><span class="cx">
</span><del>-@implementation WKProcessClass (WKPrivate)
-
-- (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host
-{
- _context->allowSpecificHTTPSCertificateForHost(WebKit::WebCertificateInfo::create(WebCore::CertificateInfo((CFArrayRef)certificateChain)).get(), host);
-}
-
-@end
-
-#endif // WK_API_ENABLED
</del><ins>+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessClassConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.h (164602 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.h 2014-02-24 21:00:36 UTC (rev 164602)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.h 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -23,26 +23,12 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
</del><ins>+#import <WebKit2/WKProcessPoolConfiguration.h>
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-/*! A WKProcessClassConfiguration is used to characterize a class of Web Content processes.
- @helps Contains properties used to configure a @link WKProcessClass @/link.
- */
</del><span class="cx"> WK_API_CLASS
</span><del>-@interface WKProcessClassConfiguration : NSObject <NSCopying>
-
-/*! @abstract The maximum number of Web Content processes of the class that may exist at any time.
- @discussion When the number of Web Content processes of the class reaches this value, one of the
- existing processes will be used for any new @link WKWebView @/link configured to use the
- same class.
-
- A value of 0 means that WebKit will automatically choose a maximum. This is the default.
- */
-@property (nonatomic) NSUInteger maximumProcessCount;
-
</del><ins>+@interface WKProcessClassConfiguration : WKProcessPoolConfiguration
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessClassConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.mm (164602 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.mm 2014-02-24 21:00:36 UTC (rev 164602)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.mm 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -24,45 +24,11 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><del>-#import "WKProcessClassConfigurationPrivate.h"
</del><ins>+#import "WKProcessClassConfiguration.h"
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <wtf/RetainPtr.h>
-
-@implementation WKProcessClassConfiguration {
- RetainPtr<NSURL> _injectedBundleURL;
-}
-
-- (NSURL *)_injectedBundleURL
-{
- return _injectedBundleURL.get();
-}
-
-- (void)_setInjectedBundleURL:(NSURL *)injectedBundleURL
-{
- _injectedBundleURL = adoptNS([injectedBundleURL copy]);
-}
-
-- (NSString *)description
-{
- NSString *description = [NSString stringWithFormat:@"<%@: %p; maximumProcessCount = %lu", NSStringFromClass(self.class), self, static_cast<unsigned long>(_maximumProcessCount)];
- if (_injectedBundleURL)
- return [description stringByAppendingFormat:@"; injectedBundleURL: \"%@\">", _injectedBundleURL.get()];
-
- return [description stringByAppendingString:@">"];
-}
-
-- (id)copyWithZone:(NSZone *)zone
-{
- WKProcessClassConfiguration *configuration = [[[self class] allocWithZone:zone] init];
-
- configuration.maximumProcessCount = self.maximumProcessCount;
- configuration._injectedBundleURL = self._injectedBundleURL;
-
- return configuration;
-}
-
</del><ins>+@implementation WKProcessClassConfiguration
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessClassConfigurationPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfigurationPrivate.h (164602 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfigurationPrivate.h 2014-02-24 21:00:36 UTC (rev 164602)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfigurationPrivate.h 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -24,16 +24,4 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <WebKit2/WKProcessClassConfiguration.h>
</span><del>-
-#if WK_API_ENABLED
-
-@interface WKProcessClassConfiguration (WKPrivate)
-
-/*! @abstract The location of a bundle that will be loaded into Web Content processes of the
- class.
- */
-@property (nonatomic, copy, setter=_setInjectedBundleURL:) NSURL *_injectedBundleURL;
-
-@end
-
-#endif
</del><ins>+#import <WebKit2/WKProcessPoolConfigurationPrivate.h>
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessClassInternalh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassInternal.h (164602 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassInternal.h 2014-02-24 21:00:36 UTC (rev 164602)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassInternal.h 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -1,51 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 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 "WKProcessClassPrivate.h"
-
-#if WK_API_ENABLED
-
-#import "WKObject.h"
-#import "WebContext.h"
-
-namespace WebKit {
-
-inline WKProcessClass *wrapper(WebContext& context)
-{
- ASSERT([context.wrapper() isKindOfClass:[WKProcessClass class]]);
- return (WKProcessClass *)context.wrapper();
-}
-
-}
-
-@interface WKProcessClass () <WKObject> {
-@package
- RetainPtr<WKProcessClassConfiguration> _configuration;
-
- API::ObjectStorage<WebKit::WebContext> _context;
-}
-@end
-
-#endif // WK_API_ENABLED
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessClassPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassPrivate.h (164602 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassPrivate.h 2014-02-24 21:00:36 UTC (rev 164602)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassPrivate.h 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -24,13 +24,4 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <WebKit2/WKProcessClass.h>
</span><del>-
-#if WK_API_ENABLED
-
-@interface WKProcessClass (WKPrivate)
-
-- (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host;
-
-@end
-
-#endif
</del><ins>+#import <WebKit2/WKProcessPoolPrivate.h>
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolhfromrev164602trunkSourceWebKit2UIProcessAPICocoaWKProcessClassh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.h (from rev 164602, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.h) (0 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.h 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+/*
+ * Copyright (C) 2014 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 <Foundation/Foundation.h>
+#import <WebKit2/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+@class WKProcessPoolConfiguration;
+
+/*! A WKProcessPool defines a distinct type-or category-of Web Content process.
+ A @link WKWebView @/link specifies the WKProcessPool of the Web
+ Content process backing it through its @link WKWebViewConfiguration @/link.
+ @helperclass @link WKProcessPoolConfiguration @/link
+ Used to configure @link WKProcessPool @/link instances.
+ */
+WK_API_CLASS
+@interface WKProcessPool : NSObject
+
+/*! @abstract A copy of the configuration with which the @link WKProcessPool @/link was
+ initialized.
+*/
+@property (nonatomic, readonly) WKProcessPoolConfiguration *configuration;
+
+/*!
+ @abstract Returns an instance initialized with the specified configuration.
+ @param configuration The configuration for the new instance.
+ @result An initialized instance, or nil if the object could not be initialized.
+ @discussion This is a designated initializer. You can use @link -init @/link to initialize an
+ instance with the default configuration.
+
+ The initializer copies
+ @link //apple_ref/doc/methodparam/WKProcessPool/initWithConfiguration:/configuration
+ configuration@/link, so mutating it after initialization has no effect on the
+ @link WKProcessPool @/link instance.
+*/
+- (instancetype)initWithConfiguration:(WKProcessPoolConfiguration *)configuration WK_DESIGNATED_INITIALIZER;
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmmfromrev164602trunkSourceWebKit2UIProcessAPICocoaWKProcessClassmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm (from rev 164602, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm) (0 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -0,0 +1,109 @@
</span><ins>+/*
+ * Copyright (C) 2014 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 "WKProcessPoolInternal.h"
+
+#if WK_API_ENABLED
+
+#import "HistoryClient.h"
+#import "WKObject.h"
+#import "WKProcessPoolConfigurationPrivate.h"
+#import "WebCertificateInfo.h"
+#import "WebContext.h"
+#import <WebCore/CertificateInfo.h>
+#import <wtf/RetainPtr.h>
+
+#if PLATFORM(IOS)
+#import <WebCore/WebCoreThreadSystemInterface.h>
+#endif
+
+@implementation WKProcessPool
+
+- (instancetype)init
+{
+ return [self initWithConfiguration:adoptNS([[WKProcessPoolConfiguration alloc] init]).get()];
+}
+
+- (instancetype)initWithConfiguration:(WKProcessPoolConfiguration *)configuration
+{
+ if (!(self = [super init]))
+ return nil;
+
+ _configuration = adoptNS([configuration copy]);
+
+#if PLATFORM(IOS)
+ // FIXME: Remove once <rdar://problem/15256572> is fixed.
+ InitWebCoreThreadSystemInterface();
+#endif
+
+ String bundlePath;
+ if (NSURL *bundleURL = [_configuration _injectedBundleURL]) {
+ if (!bundleURL.isFileURL)
+ [NSException raise:NSInvalidArgumentException format:@"Injected Bundle URL must be a file URL"];
+
+ bundlePath = bundleURL.path;
+ }
+
+ API::Object::constructInWrapper<WebKit::WebContext>(self, bundlePath);
+ _context->setHistoryClient(std::make_unique<WebKit::HistoryClient>());
+
+ return self;
+}
+
+- (void)dealloc
+{
+ _context->~WebContext();
+
+ [super dealloc];
+}
+
+- (NSString *)description
+{
+ return [NSString stringWithFormat:@"<%@: %p; configuration = %@>", NSStringFromClass(self.class), self, _configuration.get()];
+}
+
+- (WKProcessPoolConfiguration *)configuration
+{
+ return [[_configuration copy] autorelease];
+}
+
+- (API::Object&)_apiObject
+{
+ return *_context;
+}
+
+@end
+
+@implementation WKProcessPool (WKPrivate)
+
+- (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host
+{
+ _context->allowSpecificHTTPSCertificateForHost(WebKit::WebCertificateInfo::create(WebCore::CertificateInfo((CFArrayRef)certificateChain)).get(), host);
+}
+
+@end
+
+#endif // WK_API_ENABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolConfigurationhfromrev164602trunkSourceWebKit2UIProcessAPICocoaWKProcessClassConfigurationh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfiguration.h (from rev 164602, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.h) (0 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfiguration.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfiguration.h 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+/*
+ * Copyright (C) 2014 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 <Foundation/Foundation.h>
+#import <WebKit2/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+/*! A WKProcessPoolConfiguration is used to characterize a class of Web Content processes.
+ @helps Contains properties used to configure a @link WKProcessPool @/link.
+ */
+WK_API_CLASS
+@interface WKProcessPoolConfiguration : NSObject <NSCopying>
+
+/*! @abstract The maximum number of Web Content processes of the class that may exist at any time.
+ @discussion When the number of Web Content processes of the class reaches this value, one of the
+ existing processes will be used for any new @link WKWebView @/link configured to use the
+ same class.
+
+ A value of 0 means that WebKit will automatically choose a maximum. This is the default.
+ */
+@property (nonatomic) NSUInteger maximumProcessCount;
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolConfigurationmmfromrev164602trunkSourceWebKit2UIProcessAPICocoaWKProcessClassConfigurationmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfiguration.mm (from rev 164602, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfiguration.mm) (0 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfiguration.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfiguration.mm 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -0,0 +1,68 @@
</span><ins>+/*
+ * Copyright (C) 2014 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 "WKProcessPoolConfigurationPrivate.h"
+
+#if WK_API_ENABLED
+
+#import <wtf/RetainPtr.h>
+
+@implementation WKProcessPoolConfiguration {
+ RetainPtr<NSURL> _injectedBundleURL;
+}
+
+- (NSURL *)_injectedBundleURL
+{
+ return _injectedBundleURL.get();
+}
+
+- (void)_setInjectedBundleURL:(NSURL *)injectedBundleURL
+{
+ _injectedBundleURL = adoptNS([injectedBundleURL copy]);
+}
+
+- (NSString *)description
+{
+ NSString *description = [NSString stringWithFormat:@"<%@: %p; maximumProcessCount = %lu", NSStringFromClass(self.class), self, static_cast<unsigned long>(_maximumProcessCount)];
+ if (_injectedBundleURL)
+ return [description stringByAppendingFormat:@"; injectedBundleURL: \"%@\">", _injectedBundleURL.get()];
+
+ return [description stringByAppendingString:@">"];
+}
+
+- (id)copyWithZone:(NSZone *)zone
+{
+ WKProcessPoolConfiguration *configuration = [[[self class] allocWithZone:zone] init];
+
+ configuration.maximumProcessCount = self.maximumProcessCount;
+ configuration._injectedBundleURL = self._injectedBundleURL;
+
+ return configuration;
+}
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolConfigurationPrivatehfromrev164602trunkSourceWebKit2UIProcessAPICocoaWKProcessClassConfigurationPrivateh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfigurationPrivate.h (from rev 164602, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassConfigurationPrivate.h) (0 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfigurationPrivate.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolConfigurationPrivate.h 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+/*
+ * Copyright (C) 2014 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 <WebKit2/WKProcessPoolConfiguration.h>
+
+#if WK_API_ENABLED
+
+@interface WKProcessPoolConfiguration (WKPrivate)
+
+/*! @abstract The location of a bundle that will be loaded into Web Content processes of the
+ class.
+ */
+@property (nonatomic, copy, setter=_setInjectedBundleURL:) NSURL *_injectedBundleURL;
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolInternalhfromrev164602trunkSourceWebKit2UIProcessAPICocoaWKProcessClassInternalh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolInternal.h (from rev 164602, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassInternal.h) (0 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolInternal.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolInternal.h 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+/*
+ * Copyright (C) 2014 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 "WKProcessPoolPrivate.h"
+
+#if WK_API_ENABLED
+
+#import "WKObject.h"
+#import "WebContext.h"
+
+namespace WebKit {
+
+inline WKProcessPool *wrapper(WebContext& context)
+{
+ ASSERT([context.wrapper() isKindOfClass:[WKProcessPool class]]);
+ return (WKProcessPool *)context.wrapper();
+}
+
+}
+
+@interface WKProcessPool () <WKObject> {
+@package
+ RetainPtr<WKProcessPoolConfiguration> _configuration;
+
+ API::ObjectStorage<WebKit::WebContext> _context;
+}
+@end
+
+#endif // WK_API_ENABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolPrivatehfromrev164602trunkSourceWebKit2UIProcessAPICocoaWKProcessClassPrivateh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (from rev 164602, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassPrivate.h) (0 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+/*
+ * Copyright (C) 2014 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 <WebKit2/WKProcessPool.h>
+
+#if WK_API_ENABLED
+
+@interface WKProcessPool (WKPrivate)
+
+- (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host;
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (164602 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-24 21:00:36 UTC (rev 164602)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> #import "WKNavigationDelegate.h"
</span><span class="cx"> #import "WKNavigationInternal.h"
</span><span class="cx"> #import "WKPreferencesInternal.h"
</span><del>-#import "WKProcessClassInternal.h"
</del><ins>+#import "WKProcessPoolInternal.h"
</ins><span class="cx"> #import "WKRemoteObjectRegistryInternal.h"
</span><span class="cx"> #import "WKUIDelegate.h"
</span><span class="cx"> #import "WKWebViewConfigurationPrivate.h"
</span><span class="lines">@@ -108,23 +108,23 @@
</span><span class="cx"> _configuration = adoptNS([configuration copy]);
</span><span class="cx">
</span><span class="cx"> if (WKWebView *relatedWebView = [_configuration _relatedWebView]) {
</span><del>- WKProcessClass *processClass = [_configuration processClass];
- WKProcessClass *relatedWebViewProcessClass = [relatedWebView->_configuration processClass];
- if (processClass && processClass != relatedWebViewProcessClass)
- [NSException raise:NSInvalidArgumentException format:@"Related web view %@ has process class %@ but configuration specifies a different process class %@", relatedWebView, relatedWebViewProcessClass, configuration.processClass];
</del><ins>+ WKProcessPool *processPool = [_configuration processPool];
+ WKProcessPool *relatedWebViewProcessPool = [relatedWebView->_configuration processPool];
+ if (processPool && processPool != relatedWebViewProcessPool)
+ [NSException raise:NSInvalidArgumentException format:@"Related web view %@ has process pool %@ but configuration specifies a different process pool %@", relatedWebView, relatedWebViewProcessPool, configuration.processPool];
</ins><span class="cx">
</span><del>- [_configuration setProcessClass:relatedWebViewProcessClass];
</del><ins>+ [_configuration setProcessPool:relatedWebViewProcessPool];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (![_configuration processClass])
- [_configuration setProcessClass:adoptNS([[WKProcessClass alloc] init]).get()];
</del><ins>+ if (![_configuration processPool])
+ [_configuration setProcessPool:adoptNS([[WKProcessPool alloc] init]).get()];
</ins><span class="cx">
</span><span class="cx"> if (![_configuration preferences])
</span><span class="cx"> [_configuration setPreferences:adoptNS([[WKPreferences alloc] init]).get()];
</span><span class="cx">
</span><span class="cx"> CGRect bounds = self.bounds;
</span><span class="cx">
</span><del>- WebKit::WebContext& context = *[_configuration processClass]->_context;
</del><ins>+ WebKit::WebContext& context = *[_configuration processPool]->_context;
</ins><span class="cx">
</span><span class="cx"> WebKit::WebPageConfiguration webPageConfiguration;
</span><span class="cx"> webPageConfiguration.preferences = [_configuration preferences]->_preferences.get();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h (164602 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2014-02-24 21:00:36 UTC (rev 164602)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> @class WKPreferences;
</span><del>-@class WKProcessClass;
</del><ins>+@class WKProcessPool;
</ins><span class="cx">
</span><span class="cx"> /*! A @link WKWebViewConfiguration @/link is a collection of properties used to initialize a web
</span><span class="cx"> view.
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> When this property is set to nil, a unique process class will be created for each
</span><span class="cx"> @link WKWebView @/link initialized with the configuration.
</span><span class="cx"> */
</span><del>-@property (nonatomic, strong) WKProcessClass *processClass;
</del><ins>+@property (nonatomic, strong) WKProcessPool *processPool;
</ins><span class="cx">
</span><span class="cx"> @property (nonatomic, strong) WKPreferences *preferences;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (164602 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-02-24 21:00:36 UTC (rev 164602)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -32,35 +32,35 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> @implementation WKWebViewConfiguration {
</span><del>- RetainPtr<WKProcessClass> _processClass;
</del><ins>+ RetainPtr<WKProcessPool> _processPool;
</ins><span class="cx"> RetainPtr<WKPreferences> _preferences;
</span><span class="cx"> WebKit::WeakObjCPtr<WKWebView> _relatedWebView;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)description
</span><span class="cx"> {
</span><del>- return [NSString stringWithFormat:@"<%@: %p; processClass = %@; preferences = %@>", NSStringFromClass(self.class), self, _processClass.get(), _preferences.get()];
</del><ins>+ return [NSString stringWithFormat:@"<%@: %p; processPool = %@; preferences = %@>", NSStringFromClass(self.class), self, _processPool.get(), _preferences.get()];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id)copyWithZone:(NSZone *)zone
</span><span class="cx"> {
</span><span class="cx"> WKWebViewConfiguration *configuration = [[[self class] allocWithZone:zone] init];
</span><span class="cx">
</span><del>- configuration.processClass = _processClass.get();
</del><ins>+ configuration.processPool = _processPool.get();
</ins><span class="cx"> configuration.preferences = _preferences.get();
</span><span class="cx"> configuration._relatedWebView = _relatedWebView.get().get();
</span><span class="cx">
</span><span class="cx"> return configuration;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (WKProcessClass *)processClass
</del><ins>+- (WKProcessPool *)processPool
</ins><span class="cx"> {
</span><del>- return _processClass.get();
</del><ins>+ return _processPool.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setProcessClass:(WKProcessClass *)processClass
</del><ins>+- (void)setProcessPool:(WKProcessPool *)processPool
</ins><span class="cx"> {
</span><del>- _processClass = processClass;
</del><ins>+ _processPool = processPool;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WKPreferences *)preferences
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationToBeRemovedmmfromrev164602trunkSourceWebKit2UIProcessAPICocoaWKProcessClassPrivateh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationToBeRemoved.mm (from rev 164602, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassPrivate.h) (0 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationToBeRemoved.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationToBeRemoved.mm 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+/*
+ * Copyright (C) 2014 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 "WKWebViewConfiguration.h"
+
+#if WK_API_ENABLED
+
+#import "WKProcessClass.h"
+
+@interface WKWebViewConfiguration (WKToBeReoved)
+@property (nonatomic) WKProcessClass *processClass;
+@end
+
+@implementation WKWebViewConfiguration (WKToBeReoved)
+
+- (void)setProcessClass:(WKProcessClass *)processClass
+{
+ self.processPool = processClass;
+}
+
+- (WKProcessClass *)processClass
+{
+ return (WKProcessClass *)self.processPool;
+}
+
+@end
+
+#endif
+
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (164602 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-02-24 21:00:36 UTC (rev 164602)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> #import "WKAPICast.h"
</span><span class="cx"> #import "WKFullScreenWindowController.h"
</span><span class="cx"> #import "WKPrintingView.h"
</span><del>-#import "WKProcessClassInternal.h"
</del><ins>+#import "WKProcessPoolInternal.h"
</ins><span class="cx"> #import "WKStringCF.h"
</span><span class="cx"> #import "WKTextInputWindowController.h"
</span><span class="cx"> #import "WKThumbnailView.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (164602 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-02-24 21:00:36 UTC (rev 164602)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #import "WKInteractionView.h"
</span><span class="cx"> #import "WKPreferencesInternal.h"
</span><span class="cx"> #import "WKProcessGroupPrivate.h"
</span><del>-#import "WKProcessClassInternal.h"
</del><ins>+#import "WKProcessPoolInternal.h"
</ins><span class="cx"> #import "WKWebViewConfiguration.h"
</span><span class="cx"> #import "WebContext.h"
</span><span class="cx"> #import "WebFrameProxy.h"
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_decidePolicyForGeolocationRequestFromOrigin:(WebSecurityOrigin&)origin frame:(WebFrameProxy&)frame request:(GeolocationPermissionRequestProxy&)permissionRequest
</span><span class="cx"> {
</span><del>- // FIXME: The line below is commented out since wrapper(WebContext&) now returns a WKProcessClass.
</del><ins>+ // FIXME: The line below is commented out since wrapper(WebContext&) now returns a WKProcessPool.
</ins><span class="cx"> // As part of the new API we should figure out where geolocation fits in, see <rdar://problem/15885544>.
</span><span class="cx"> // [[wrapper(_page->process().context()) _geolocationProvider] decidePolicyForGeolocationRequestFromOrigin:toAPI(&origin) frame:toAPI(&frame) request:toAPI(&permissionRequest) window:[self window]];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (164602 => 164603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-24 21:00:36 UTC (rev 164602)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-02-24 21:10:50 UTC (rev 164603)
</span><span class="lines">@@ -114,8 +114,8 @@
</span><span class="cx"> 1A0F29CC120B37160053D1B9 /* VisitedLinkTable.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0F29CA120B37160053D1B9 /* VisitedLinkTable.h */; };
</span><span class="cx"> 1A0F29E3120B44420053D1B9 /* VisitedLinkProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A0F29E1120B44420053D1B9 /* VisitedLinkProvider.cpp */; };
</span><span class="cx"> 1A0F29E4120B44420053D1B9 /* VisitedLinkProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A0F29E2120B44420053D1B9 /* VisitedLinkProvider.h */; };
</span><del>- 1A158419189044F50017616C /* WKProcessClass.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A158417189044F50017616C /* WKProcessClass.mm */; };
- 1A15841A189044F50017616C /* WKProcessClass.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A158418189044F50017616C /* WKProcessClass.h */; settings = {ATTRIBUTES = (Public, ); }; };
</del><ins>+ 1A158419189044F50017616C /* WKProcessPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A158417189044F50017616C /* WKProcessPool.mm */; };
+ 1A15841A189044F50017616C /* WKProcessPool.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A158418189044F50017616C /* WKProcessPool.h */; settings = {ATTRIBUTES = (Public, ); }; };
</ins><span class="cx"> 1A17977F137EE82C00F97D45 /* PluginCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A17977D137EE82C00F97D45 /* PluginCreationParameters.cpp */; };
</span><span class="cx"> 1A179780137EE82C00F97D45 /* PluginCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A17977E137EE82C00F97D45 /* PluginCreationParameters.h */; };
</span><span class="cx"> 1A186EEA12EF7618008E5F37 /* LayerTreeHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A186EE812EF7618008E5F37 /* LayerTreeHost.h */; };
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> 1A3C888018A5ABAE00C4C962 /* WKPreferencesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */; };
</span><span class="cx"> 1A3CC16618906ACF001E6ED8 /* WKWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */; };
</span><span class="cx"> 1A3CC16718906ACF001E6ED8 /* WKWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3CC16518906ACF001E6ED8 /* WKWebView.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><del>- 1A3CC16918907EB0001E6ED8 /* WKProcessClassInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3CC16818907EB0001E6ED8 /* WKProcessClassInternal.h */; };
</del><ins>+ 1A3CC16918907EB0001E6ED8 /* WKProcessPoolInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3CC16818907EB0001E6ED8 /* WKProcessPoolInternal.h */; };
</ins><span class="cx"> 1A3D610113A7CC2A00F95D4E /* PluginModuleInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3D60FF13A7CC2A00F95D4E /* PluginModuleInfo.cpp */; };
</span><span class="cx"> 1A3D610213A7CC2A00F95D4E /* PluginModuleInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3D610013A7CC2A00F95D4E /* PluginModuleInfo.h */; };
</span><span class="cx"> 1A3D610513A7F03A00F95D4E /* ArgumentCoders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3D610413A7F03A00F95D4E /* ArgumentCoders.cpp */; };
</span><span class="lines">@@ -192,9 +192,9 @@
</span><span class="cx"> 1A422F8E18B29C6400D8CD96 /* HistoryClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A422F8C18B29C6400D8CD96 /* HistoryClient.mm */; };
</span><span class="cx"> 1A422F8F18B29C6400D8CD96 /* HistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A422F8D18B29C6400D8CD96 /* HistoryClient.h */; };
</span><span class="cx"> 1A433F0D113C53DD00FACDE9 /* WebErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A433F0C113C53DD00FACDE9 /* WebErrors.h */; };
</span><del>- 1A43E829188F3CDC009E4D30 /* WKProcessClassConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A43E827188F3CDC009E4D30 /* WKProcessClassConfiguration.mm */; };
- 1A43E82A188F3CDC009E4D30 /* WKProcessClassConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A43E828188F3CDC009E4D30 /* WKProcessClassConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 1A43E82C188F3CF5009E4D30 /* WKProcessClassConfigurationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A43E82B188F3CF5009E4D30 /* WKProcessClassConfigurationPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ 1A43E829188F3CDC009E4D30 /* WKProcessPoolConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A43E827188F3CDC009E4D30 /* WKProcessPoolConfiguration.mm */; };
+ 1A43E82A188F3CDC009E4D30 /* WKProcessPoolConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A43E828188F3CDC009E4D30 /* WKProcessPoolConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 1A43E82C188F3CF5009E4D30 /* WKProcessPoolConfigurationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A43E82B188F3CF5009E4D30 /* WKProcessPoolConfigurationPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 1A445B9F184D5FB5004B3414 /* WKContextInjectedBundleClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A445B9E184D5FB5004B3414 /* WKContextInjectedBundleClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1A445BA1184D5FC1004B3414 /* WKContextHistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A445BA0184D5FC1004B3414 /* WKContextHistoryClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1A445BA3184D5FCF004B3414 /* WKContextDownloadClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A445BA2184D5FCF004B3414 /* WKContextDownloadClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> 1A64230912DD09EB00CAAE2C /* DrawingAreaProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A64230712DD09EB00CAAE2C /* DrawingAreaProxyMessages.h */; };
</span><span class="cx"> 1A64245E12DE29A100CAAE2C /* UpdateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A64245C12DE29A100CAAE2C /* UpdateInfo.h */; };
</span><span class="cx"> 1A64245F12DE29A100CAAE2C /* UpdateInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A64245D12DE29A100CAAE2C /* UpdateInfo.cpp */; };
</span><del>- 1A6509CE18B4146200614332 /* WKProcessClassPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6509CD18B4146200614332 /* WKProcessClassPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ 1A6509CE18B4146200614332 /* WKProcessPoolPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6509CD18B4146200614332 /* WKProcessPoolPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 1A6637D718B2831F00C0BCF3 /* APIHistoryClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6637D618B2831F00C0BCF3 /* APIHistoryClient.h */; };
</span><span class="cx"> 1A66BF8F18A052ED002071B4 /* WKWebViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */; };
</span><span class="cx"> 1A6F9F9011E13EFC00DB1371 /* CommandLine.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */; };
</span><span class="lines">@@ -267,6 +267,13 @@
</span><span class="cx"> 1A9E329E1822FEDD00F5D04C /* WKRemoteObjectCoder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9E329C1822FEDD00F5D04C /* WKRemoteObjectCoder.mm */; };
</span><span class="cx"> 1A9E329F1822FEDD00F5D04C /* WKRemoteObjectCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9E329D1822FEDD00F5D04C /* WKRemoteObjectCoder.h */; };
</span><span class="cx"> 1A9E32A11823018900F5D04C /* WKRemoteObjectRegistryInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9E32A01823018900F5D04C /* WKRemoteObjectRegistryInternal.h */; };
</span><ins>+ 1A9EA31218BBDE00004F7C95 /* WKProcessClass.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9EA31018BBDE00004F7C95 /* WKProcessClass.mm */; };
+ 1A9EA31318BBDE00004F7C95 /* WKProcessClass.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9EA31118BBDE00004F7C95 /* WKProcessClass.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 1A9EA31618BBDE13004F7C95 /* WKProcessClassConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9EA31418BBDE13004F7C95 /* WKProcessClassConfiguration.mm */; };
+ 1A9EA31718BBDE13004F7C95 /* WKProcessClassConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9EA31518BBDE13004F7C95 /* WKProcessClassConfiguration.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 1A9EA31918BBDE98004F7C95 /* WKProcessClassConfigurationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9EA31818BBDE98004F7C95 /* WKProcessClassConfigurationPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 1A9EA31B18BBDF16004F7C95 /* WKProcessClassPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9EA31A18BBDF16004F7C95 /* WKProcessClassPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 1A9EA31E18BBDF4B004F7C95 /* WKWebViewConfigurationToBeRemoved.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A9EA31C18BBDF4B004F7C95 /* WKWebViewConfigurationToBeRemoved.mm */; };
</ins><span class="cx"> 1A9FBA8D13FF04E600DEED67 /* PluginComplexTextInputState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A9FBA8C13FF04E600DEED67 /* PluginComplexTextInputState.h */; };
</span><span class="cx"> 1AA20D5118AD50E0005D1ED4 /* WKNavigationDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA20D5018AD50E0005D1ED4 /* WKNavigationDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1AA2E51D12E4C05E00BC4966 /* CGUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AA2E51B12E4C05E00BC4966 /* CGUtilities.h */; };
</span><span class="lines">@@ -1776,8 +1783,8 @@
</span><span class="cx"> 1A0F29CA120B37160053D1B9 /* VisitedLinkTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkTable.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A0F29E1120B44420053D1B9 /* VisitedLinkProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkProvider.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A0F29E2120B44420053D1B9 /* VisitedLinkProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkProvider.h; sourceTree = "<group>"; };
</span><del>- 1A158417189044F50017616C /* WKProcessClass.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKProcessClass.mm; sourceTree = "<group>"; };
- 1A158418189044F50017616C /* WKProcessClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessClass.h; sourceTree = "<group>"; };
</del><ins>+ 1A158417189044F50017616C /* WKProcessPool.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKProcessPool.mm; sourceTree = "<group>"; };
+ 1A158418189044F50017616C /* WKProcessPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessPool.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1A17635416B1D5D000D88FD6 /* StorageNamespaceImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageNamespaceImpl.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A17635516B1D5D000D88FD6 /* StorageNamespaceImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageNamespaceImpl.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A17977D137EE82C00F97D45 /* PluginCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginCreationParameters.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -1847,7 +1854,7 @@
</span><span class="cx"> 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebView.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A3CC16518906ACF001E6ED8 /* WKWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebView.h; sourceTree = "<group>"; };
</span><del>- 1A3CC16818907EB0001E6ED8 /* WKProcessClassInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessClassInternal.h; sourceTree = "<group>"; };
</del><ins>+ 1A3CC16818907EB0001E6ED8 /* WKProcessPoolInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessPoolInternal.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1A3D60FF13A7CC2A00F95D4E /* PluginModuleInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginModuleInfo.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A3D610013A7CC2A00F95D4E /* PluginModuleInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginModuleInfo.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A3D610413A7F03A00F95D4E /* ArgumentCoders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ArgumentCoders.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -1863,9 +1870,9 @@
</span><span class="cx"> 1A422F8C18B29C6400D8CD96 /* HistoryClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HistoryClient.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A422F8D18B29C6400D8CD96 /* HistoryClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A433F0C113C53DD00FACDE9 /* WebErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebErrors.h; sourceTree = "<group>"; };
</span><del>- 1A43E827188F3CDC009E4D30 /* WKProcessClassConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKProcessClassConfiguration.mm; sourceTree = "<group>"; };
- 1A43E828188F3CDC009E4D30 /* WKProcessClassConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessClassConfiguration.h; sourceTree = "<group>"; };
- 1A43E82B188F3CF5009E4D30 /* WKProcessClassConfigurationPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessClassConfigurationPrivate.h; sourceTree = "<group>"; };
</del><ins>+ 1A43E827188F3CDC009E4D30 /* WKProcessPoolConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKProcessPoolConfiguration.mm; sourceTree = "<group>"; };
+ 1A43E828188F3CDC009E4D30 /* WKProcessPoolConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessPoolConfiguration.h; sourceTree = "<group>"; };
+ 1A43E82B188F3CF5009E4D30 /* WKProcessPoolConfigurationPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessPoolConfigurationPrivate.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1A445B9E184D5FB5004B3414 /* WKContextInjectedBundleClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextInjectedBundleClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A445BA0184D5FC1004B3414 /* WKContextHistoryClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextHistoryClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A445BA2184D5FCF004B3414 /* WKContextDownloadClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextDownloadClient.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -1900,7 +1907,7 @@
</span><span class="cx"> 1A64230712DD09EB00CAAE2C /* DrawingAreaProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingAreaProxyMessages.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A64245C12DE29A100CAAE2C /* UpdateInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UpdateInfo.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A64245D12DE29A100CAAE2C /* UpdateInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UpdateInfo.cpp; sourceTree = "<group>"; };
</span><del>- 1A6509CD18B4146200614332 /* WKProcessClassPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessClassPrivate.h; sourceTree = "<group>"; };
</del><ins>+ 1A6509CD18B4146200614332 /* WKProcessPoolPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessPoolPrivate.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1A6637D618B2831F00C0BCF3 /* APIHistoryClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIHistoryClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebViewInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A6F9F8E11E13EFC00DB1371 /* CommandLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommandLine.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -1946,6 +1953,13 @@
</span><span class="cx"> 1A9E329C1822FEDD00F5D04C /* WKRemoteObjectCoder.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKRemoteObjectCoder.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1A9E329D1822FEDD00F5D04C /* WKRemoteObjectCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKRemoteObjectCoder.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A9E32A01823018900F5D04C /* WKRemoteObjectRegistryInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKRemoteObjectRegistryInternal.h; sourceTree = "<group>"; };
</span><ins>+ 1A9EA31018BBDE00004F7C95 /* WKProcessClass.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKProcessClass.mm; sourceTree = "<group>"; };
+ 1A9EA31118BBDE00004F7C95 /* WKProcessClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessClass.h; sourceTree = "<group>"; };
+ 1A9EA31418BBDE13004F7C95 /* WKProcessClassConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKProcessClassConfiguration.mm; sourceTree = "<group>"; };
+ 1A9EA31518BBDE13004F7C95 /* WKProcessClassConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessClassConfiguration.h; sourceTree = "<group>"; };
+ 1A9EA31818BBDE98004F7C95 /* WKProcessClassConfigurationPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessClassConfigurationPrivate.h; sourceTree = "<group>"; };
+ 1A9EA31A18BBDF16004F7C95 /* WKProcessClassPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessClassPrivate.h; sourceTree = "<group>"; };
+ 1A9EA31C18BBDF4B004F7C95 /* WKWebViewConfigurationToBeRemoved.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebViewConfigurationToBeRemoved.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 1A9FBA8C13FF04E600DEED67 /* PluginComplexTextInputState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginComplexTextInputState.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AA1C79A100E7FC50078DEBC /* WebCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> 1AA1C7DE100E846E0078DEBC /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = JavaScriptCore.framework; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="lines">@@ -4047,6 +4061,20 @@
</span><span class="cx"> path = Cocoa;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="cx"> };
</span><ins>+ 1AC5C47A18BBCB7D0089F57F /* To Be Removed */ = {
+ isa = PBXGroup;
+ children = (
+ 1A9EA31118BBDE00004F7C95 /* WKProcessClass.h */,
+ 1A9EA31018BBDE00004F7C95 /* WKProcessClass.mm */,
+ 1A9EA31518BBDE13004F7C95 /* WKProcessClassConfiguration.h */,
+ 1A9EA31418BBDE13004F7C95 /* WKProcessClassConfiguration.mm */,
+ 1A9EA31818BBDE98004F7C95 /* WKProcessClassConfigurationPrivate.h */,
+ 1A9EA31A18BBDF16004F7C95 /* WKProcessClassPrivate.h */,
+ 1A9EA31C18BBDF4B004F7C95 /* WKWebViewConfigurationToBeRemoved.mm */,
+ );
+ name = "To Be Removed";
+ sourceTree = "<group>";
+ };
</ins><span class="cx"> 1AE00D6818327C1200087DD7 /* IPC */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="lines">@@ -4369,6 +4397,7 @@
</span><span class="cx"> 37C4C08318149C2A003688B9 /* Cocoa */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><ins>+ 1AC5C47A18BBCB7D0089F57F /* To Be Removed */,
</ins><span class="cx"> 1A43E826188F38E2009E4D30 /* Deprecated */,
</span><span class="cx"> 2D6B371918A967AD0042AE80 /* WKThumbnailView.h */,
</span><span class="cx"> 2DACE64D18ADBFF000E4CA76 /* WKThumbnailViewInternal.h */,
</span><span class="lines">@@ -4392,13 +4421,13 @@
</span><span class="cx"> 1AFDD3161891C94700153970 /* WKPreferences.h */,
</span><span class="cx"> 1AFDD3181891CA1200153970 /* WKPreferences.mm */,
</span><span class="cx"> 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */,
</span><del>- 1A158418189044F50017616C /* WKProcessClass.h */,
- 1A158417189044F50017616C /* WKProcessClass.mm */,
- 1A6509CD18B4146200614332 /* WKProcessClassPrivate.h */,
- 1A43E828188F3CDC009E4D30 /* WKProcessClassConfiguration.h */,
- 1A43E827188F3CDC009E4D30 /* WKProcessClassConfiguration.mm */,
- 1A43E82B188F3CF5009E4D30 /* WKProcessClassConfigurationPrivate.h */,
- 1A3CC16818907EB0001E6ED8 /* WKProcessClassInternal.h */,
</del><ins>+ 1A158418189044F50017616C /* WKProcessPool.h */,
+ 1A158417189044F50017616C /* WKProcessPool.mm */,
+ 1A6509CD18B4146200614332 /* WKProcessPoolPrivate.h */,
+ 1A43E828188F3CDC009E4D30 /* WKProcessPoolConfiguration.h */,
+ 1A43E827188F3CDC009E4D30 /* WKProcessPoolConfiguration.mm */,
+ 1A43E82B188F3CF5009E4D30 /* WKProcessPoolConfigurationPrivate.h */,
+ 1A3CC16818907EB0001E6ED8 /* WKProcessPoolInternal.h */,
</ins><span class="cx"> 1AD8790918B6C38A006CAFD7 /* WKUIDelegate.h */,
</span><span class="cx"> 1A3CC16518906ACF001E6ED8 /* WKWebView.h */,
</span><span class="cx"> 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */,
</span><span class="lines">@@ -6275,9 +6304,9 @@
</span><span class="cx"> 7CA254EB182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h in Headers */,
</span><span class="cx"> 37C4C08718149C5B003688B9 /* WKBackForwardListItem.h in Headers */,
</span><span class="cx"> 1F335BC0185B84F0001A201A /* WKWebProcessPlugInLoadDelegate.h in Headers */,
</span><del>- 1A43E82C188F3CF5009E4D30 /* WKProcessClassConfigurationPrivate.h in Headers */,
</del><ins>+ 1A43E82C188F3CF5009E4D30 /* WKProcessPoolConfigurationPrivate.h in Headers */,
</ins><span class="cx"> 1F7506B41859164C00EC0FF7 /* WKWebProcessPlugInScriptWorld.h in Headers */,
</span><del>- 1A43E82A188F3CDC009E4D30 /* WKProcessClassConfiguration.h in Headers */,
</del><ins>+ 1A43E82A188F3CDC009E4D30 /* WKProcessPoolConfiguration.h in Headers */,
</ins><span class="cx"> 1F7506B31859164500EC0FF7 /* WKWebProcessPlugInNodeHandle.h in Headers */,
</span><span class="cx"> 377EAD4517E2C51A002D193D /* WKDeclarationSpecifiers.h in Headers */,
</span><span class="cx"> 1FB00AC7185F76460019142E /* WKWebProcessPlugInPageGroup.h in Headers */,
</span><span class="lines">@@ -6407,7 +6436,7 @@
</span><span class="cx"> 1A24B5F311F531E800C38269 /* MachUtilities.h in Headers */,
</span><span class="cx"> 1A232903162C867300D82F7A /* MessageDecoder.h in Headers */,
</span><span class="cx"> 51FCB18617BBFE0300394CD8 /* AsynchronousNetworkLoaderClient.h in Headers */,
</span><del>- 1A3CC16918907EB0001E6ED8 /* WKProcessClassInternal.h in Headers */,
</del><ins>+ 1A3CC16918907EB0001E6ED8 /* WKProcessPoolInternal.h in Headers */,
</ins><span class="cx"> 2D1B5D5E185869C8006C6596 /* ViewGestureControllerMessages.h in Headers */,
</span><span class="cx"> 0FCB4E5218BBE044000FCFC9 /* WKInteractionView.h in Headers */,
</span><span class="cx"> 1A2328FF162C866A00D82F7A /* MessageEncoder.h in Headers */,
</span><span class="lines">@@ -6537,6 +6566,7 @@
</span><span class="cx"> 1AD3306F16B1D991004F60E7 /* StorageAreaImpl.h in Headers */,
</span><span class="cx"> 1A4D664E18A3031B00D82E21 /* WKFrameInfoInternal.h in Headers */,
</span><span class="cx"> 1AF4129B18B40FCD00546FDC /* WKNavigationActionPrivate.h in Headers */,
</span><ins>+ 1A9EA31318BBDE00004F7C95 /* WKProcessClass.h in Headers */,
</ins><span class="cx"> 1ACECD2517162DB1001FC9EF /* StorageAreaMap.h in Headers */,
</span><span class="cx"> 1A334DEE16DE8F88006A8E38 /* StorageAreaMapMessages.h in Headers */,
</span><span class="cx"> 1A44B95C16B73F9F00B7BBD8 /* StorageManager.h in Headers */,
</span><span class="lines">@@ -6587,7 +6617,7 @@
</span><span class="cx"> 512A9761180E031D0039A149 /* DatabaseProcessMessages.h in Headers */,
</span><span class="cx"> BC09B8F9147460F7005F5625 /* WebContextConnectionClient.h in Headers */,
</span><span class="cx"> BCDE059B11CDA8AE00E41AF1 /* WebContextInjectedBundleClient.h in Headers */,
</span><del>- 1A6509CE18B4146200614332 /* WKProcessClassPrivate.h in Headers */,
</del><ins>+ 1A6509CE18B4146200614332 /* WKProcessPoolPrivate.h in Headers */,
</ins><span class="cx"> 51871B5C127CB89D00F76232 /* WebContextMenu.h in Headers */,
</span><span class="cx"> BC032D7710F4378D0058C15A /* WebContextMenuClient.h in Headers */,
</span><span class="cx"> 75E749EC180DBB9800088BA6 /* WebOriginDataManagerProxyMessages.h in Headers */,
</span><span class="lines">@@ -6644,6 +6674,7 @@
</span><span class="cx"> 9391F2CB121B67AD00EBF7E8 /* WebFrameNetworkingContext.h in Headers */,
</span><span class="cx"> BCB9F6A01123A84B00A137E0 /* WebFramePolicyListenerProxy.h in Headers */,
</span><span class="cx"> BC9B38A110F538BE00443A15 /* WebFrameProxy.h in Headers */,
</span><ins>+ 1A9EA31918BBDE98004F7C95 /* WKProcessClassConfigurationPrivate.h in Headers */,
</ins><span class="cx"> BC1BE1E012D54A410004A228 /* WebGeolocationClient.h in Headers */,
</span><span class="cx"> BC0E5FE512D697160012A72A /* WebGeolocationManager.h in Headers */,
</span><span class="cx"> BC0E606212D6BA910012A72A /* WebGeolocationManagerMessages.h in Headers */,
</span><span class="lines">@@ -6665,6 +6696,7 @@
</span><span class="cx"> 1C8E28201275D15400BC7BD0 /* WebInspector.h in Headers */,
</span><span class="cx"> 1A3CC16718906ACF001E6ED8 /* WKWebView.h in Headers */,
</span><span class="cx"> BC032D8210F4378D0058C15A /* WebInspectorClient.h in Headers */,
</span><ins>+ 1A9EA31718BBDE13004F7C95 /* WKProcessClassConfiguration.h in Headers */,
</ins><span class="cx"> 1C8E25A91270E3BC00BC7BD0 /* WebInspectorFrontendClient.h in Headers */,
</span><span class="cx"> 1C8E2A361277852400BC7BD0 /* WebInspectorMessages.h in Headers */,
</span><span class="cx"> 1C8E28341275D73800BC7BD0 /* WebInspectorProxy.h in Headers */,
</span><span class="lines">@@ -6798,6 +6830,7 @@
</span><span class="cx"> BC1B419811D41D570011E8DD /* WKBundlePagePrivate.h in Headers */,
</span><span class="cx"> BCF049E711FE20F600F86A58 /* WKBundlePrivate.h in Headers */,
</span><span class="cx"> BC60C5791240A546008C5E29 /* WKBundleRangeHandle.h in Headers */,
</span><ins>+ 1A9EA31B18BBDF16004F7C95 /* WKProcessClassPrivate.h in Headers */,
</ins><span class="cx"> BC5D24C716CD73C5007D5461 /* WKBundleRangeHandlePrivate.h in Headers */,
</span><span class="cx"> BC14DF9F120B635F00826C0C /* WKBundleScriptWorld.h in Headers */,
</span><span class="cx"> BC4075F6124FF0270068F20A /* WKCertificateInfo.h in Headers */,
</span><span class="lines">@@ -6809,7 +6842,7 @@
</span><span class="cx"> 3795789C18AD4F1900B9ED2E /* WKWebProcessPlugInFormDelegatePrivate.h in Headers */,
</span><span class="cx"> 51A555F6128C6C47009ABCEC /* WKContextMenuItem.h in Headers */,
</span><span class="cx"> 51A55601128C6D92009ABCEC /* WKContextMenuItemTypes.h in Headers */,
</span><del>- 1A15841A189044F50017616C /* WKProcessClass.h in Headers */,
</del><ins>+ 1A15841A189044F50017616C /* WKProcessPool.h in Headers */,
</ins><span class="cx"> 1AB8A1EE18400ACB00E9AE69 /* WKPagePolicyClient.h in Headers */,
</span><span class="cx"> 37183D57182F4E700080C811 /* WKNSURLExtras.h in Headers */,
</span><span class="cx"> BCC938E11180DE440085E5FE /* WKContextPrivate.h in Headers */,
</span><span class="lines">@@ -7690,6 +7723,7 @@
</span><span class="cx"> 1A2D957012848564001EB962 /* ChildProcess.cpp in Sources */,
</span><span class="cx"> BC82837B16B36A4F00A278FE /* ChildProcessEntryPoint.mm in Sources */,
</span><span class="cx"> 9F54F88F16488E87007DF81A /* ChildProcessMac.mm in Sources */,
</span><ins>+ 1A9EA31E18BBDF4B004F7C95 /* WKWebViewConfigurationToBeRemoved.mm in Sources */,
</ins><span class="cx"> E1513C66166EABB200149FCB /* ChildProcessProxy.cpp in Sources */,
</span><span class="cx"> 1A2A4B0E1586A2240090C9E9 /* ColorSpaceData.mm in Sources */,
</span><span class="cx"> 1A6F9FB711E1408500DB1371 /* CommandLinePOSIX.cpp in Sources */,
</span><span class="lines">@@ -7735,7 +7769,7 @@
</span><span class="cx"> 1A4D664B18A3030E00D82E21 /* WKFrameInfo.mm in Sources */,
</span><span class="cx"> 2D28F3E51885CCC1004B9EAE /* WebDatabaseManagerIOS.mm in Sources */,
</span><span class="cx"> 51B15A8413843A3900321AD8 /* EnvironmentUtilities.cpp in Sources */,
</span><del>- 1A43E829188F3CDC009E4D30 /* WKProcessClassConfiguration.mm in Sources */,
</del><ins>+ 1A43E829188F3CDC009E4D30 /* WKProcessPoolConfiguration.mm in Sources */,
</ins><span class="cx"> 1A7C6CDA1378950800B9C04D /* EnvironmentVariables.cpp in Sources */,
</span><span class="cx"> 1AA575FA1496B52600A4EE06 /* EventDispatcher.cpp in Sources */,
</span><span class="cx"> 1A9E328A1821636900F5D04C /* WKRemoteObjectRegistry.mm in Sources */,
</span><span class="lines">@@ -7917,6 +7951,7 @@
</span><span class="cx"> 1AA3D75B1651B44F008713D0 /* RemoteLayerTreeHost.mm in Sources */,
</span><span class="cx"> 1AF1AC6B1651759E00C17D7F /* RemoteLayerTreeTransaction.mm in Sources */,
</span><span class="cx"> E1B78473163F253E0007B692 /* RemoteNetworkingContext.mm in Sources */,
</span><ins>+ 1A9EA31618BBDE13004F7C95 /* WKProcessClassConfiguration.mm in Sources */,
</ins><span class="cx"> BC111B09112F5E3C00337BAB /* ResponsivenessTimer.cpp in Sources */,
</span><span class="cx"> 1AAB4AAA1296F1540023952F /* SandboxExtensionMac.mm in Sources */,
</span><span class="cx"> E1E552C416AE065F004ED653 /* SandboxInitialiationParametersMac.mm in Sources */,
</span><span class="lines">@@ -8039,7 +8074,7 @@
</span><span class="cx"> BCE469791214F2B4000B98EB /* WebFrameListenerProxy.cpp in Sources */,
</span><span class="cx"> BC111A5F112F4FBB00337BAB /* WebFrameLoaderClient.cpp in Sources */,
</span><span class="cx"> 9391F2CA121B679A00EBF7E8 /* WebFrameNetworkingContext.mm in Sources */,
</span><del>- 1A158419189044F50017616C /* WKProcessClass.mm in Sources */,
</del><ins>+ 1A158419189044F50017616C /* WKProcessPool.mm in Sources */,
</ins><span class="cx"> BCB9F6A11123A84B00A137E0 /* WebFramePolicyListenerProxy.cpp in Sources */,
</span><span class="cx"> BC111B0E112F5E4F00337BAB /* WebFrameProxy.cpp in Sources */,
</span><span class="cx"> CD73BA53131B645B00EEDED2 /* WebFullScreenManager.cpp in Sources */,
</span><span class="lines">@@ -8065,6 +8100,7 @@
</span><span class="cx"> 51D02F6B132EC73700BEAA96 /* WebIconDatabaseProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> BCCF6ABC12C91EF9008F9C35 /* WebImage.cpp in Sources */,
</span><span class="cx"> 1C8E28211275D15400BC7BD0 /* WebInspector.cpp in Sources */,
</span><ins>+ 1A9EA31218BBDE00004F7C95 /* WKProcessClass.mm in Sources */,
</ins><span class="cx"> BC111A60112F4FBB00337BAB /* WebInspectorClient.cpp in Sources */,
</span><span class="cx"> 1C8E25A81270E3BB00BC7BD0 /* WebInspectorFrontendClient.cpp in Sources */,
</span><span class="cx"> 1CA8B954127C891500576C2B /* WebInspectorMac.mm in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>