<!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>[168603] trunk</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/168603">168603</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-05-11 15:12:17 -0700 (Sun, 11 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a WKContextConfigurationRef object and make the injected bundle path part of the configuration
https://bugs.webkit.org/show_bug.cgi?id=132806
Source/WebKit2:
<rdar://problem/16830143>
Reviewed by Beth Dakin.
Many setters on WKContextRef really only make sense to set early on, so move to a pattern where we create a
configuration object, a WKContextConfiguration which WKContexts can be created from. Add the injected bundle path
as a configuration property. More setters will follow.
* Shared/API/c/WKBase.h:
Add WKContextConfigurationRef.
* Shared/APIObject.h:
Add ContextConfiguration enum declaration.
* UIProcess/API/C/WKAPICast.h:
Handle WKContextConfigurationRef.
* UIProcess/API/C/WKContext.cpp:
(WKContextCreate):
Create an empty WKContextConfigurationRef object and pass it to WKContextCreateWithConfiguration.
(WKContextCreateWithInjectedBundlePath):
Create a WKContextConfigurationRef object, set its bundle path and pass the configuration to WKContextCreateWithConfiguration.
(WKContextCreateWithConfiguration):
Convert the WKContextConfigurationRef object to a WebContextConfiguration and pass it to WebContext::create.
* UIProcess/API/C/WKContext.h:
Add WKContextCreateWithConfiguration.
* UIProcess/API/C/WKContextConfigurationRef.cpp: Added.
(WKContextConfigurationCreate):
Create an API::ContextConfiguration object.
(WKContextConfigurationCopyInjectedBundlePath):
Return the injected bundle path.
(WKContextConfigurationSetInjectedBundlePath):
Set the injected bundle path.
* UIProcess/API/C/WKContextConfigurationRef.h: Added.
New C SPI header.
* UIProcess/API/Cocoa/WKProcessGroup.mm:
(-[WKProcessGroup initWithInjectedBundleURL:]):
Construct a WebContextConfiguration object and pass it to WebContext::Create.
* UIProcess/API/Cocoa/WKProcessPool.mm:
(-[WKProcessPool _initWithConfiguration:]):
Construct a WebContextConfiguration object and pass it to WebContext::Create.
* UIProcess/APIContextConfiguration.cpp: Added.
New API::ContextConfiguration object.
(API::ContextConfiguration::webContextConfiguration):
Construct a WebContextConfiguration struct from our current configuration.
* UIProcess/APIContextConfiguration.h: Added.
* UIProcess/WebContext.cpp:
(WebKit::WebContext::create):
Pass the WebContextConfiguration to the constructor.
(WebKit::WebContext::WebContext):
Set the injected bundle path from the WebContextConfiguration object.
* UIProcess/WebContext.h:
Change the WebContext constructor and create function to take a WebContextConfiguration object.
* WebKit2.xcodeproj/project.pbxproj:
Add new files.
Tools:
Reviewed by Beth Dakin.
Migrate to WKContextConfiguration.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::initialize):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKBaseh">trunk/Source/WebKit2/Shared/API/c/WKBase.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIObjecth">trunk/Source/WebKit2/Shared/APIObject.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKAPICasth">trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContexth">trunk/Source/WebKit2/UIProcess/API/C/WKContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessGroupmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextConfigurationRefcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextConfigurationRefh">trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIContextConfigurationcpp">trunk/Source/WebKit2/UIProcess/APIContextConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIContextConfigurationh">trunk/Source/WebKit2/UIProcess/APIContextConfiguration.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168602 => 168603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-11 21:02:52 UTC (rev 168602)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-11 22:12:17 UTC (rev 168603)
</span><span class="lines">@@ -1,3 +1,79 @@
</span><ins>+2014-05-11 Anders Carlsson <andersca@apple.com>
+
+ Add a WKContextConfigurationRef object and make the injected bundle path part of the configuration
+ https://bugs.webkit.org/show_bug.cgi?id=132806
+ <rdar://problem/16830143>
+
+ Reviewed by Beth Dakin.
+
+ Many setters on WKContextRef really only make sense to set early on, so move to a pattern where we create a
+ configuration object, a WKContextConfiguration which WKContexts can be created from. Add the injected bundle path
+ as a configuration property. More setters will follow.
+
+ * Shared/API/c/WKBase.h:
+ Add WKContextConfigurationRef.
+
+ * Shared/APIObject.h:
+ Add ContextConfiguration enum declaration.
+
+ * UIProcess/API/C/WKAPICast.h:
+ Handle WKContextConfigurationRef.
+
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextCreate):
+ Create an empty WKContextConfigurationRef object and pass it to WKContextCreateWithConfiguration.
+
+ (WKContextCreateWithInjectedBundlePath):
+ Create a WKContextConfigurationRef object, set its bundle path and pass the configuration to WKContextCreateWithConfiguration.
+
+ (WKContextCreateWithConfiguration):
+ Convert the WKContextConfigurationRef object to a WebContextConfiguration and pass it to WebContext::create.
+
+ * UIProcess/API/C/WKContext.h:
+ Add WKContextCreateWithConfiguration.
+
+ * UIProcess/API/C/WKContextConfigurationRef.cpp: Added.
+ (WKContextConfigurationCreate):
+ Create an API::ContextConfiguration object.
+
+ (WKContextConfigurationCopyInjectedBundlePath):
+ Return the injected bundle path.
+
+ (WKContextConfigurationSetInjectedBundlePath):
+ Set the injected bundle path.
+
+ * UIProcess/API/C/WKContextConfigurationRef.h: Added.
+ New C SPI header.
+
+ * UIProcess/API/Cocoa/WKProcessGroup.mm:
+ (-[WKProcessGroup initWithInjectedBundleURL:]):
+ Construct a WebContextConfiguration object and pass it to WebContext::Create.
+
+ * UIProcess/API/Cocoa/WKProcessPool.mm:
+ (-[WKProcessPool _initWithConfiguration:]):
+ Construct a WebContextConfiguration object and pass it to WebContext::Create.
+
+ * UIProcess/APIContextConfiguration.cpp: Added.
+ New API::ContextConfiguration object.
+
+ (API::ContextConfiguration::webContextConfiguration):
+ Construct a WebContextConfiguration struct from our current configuration.
+
+ * UIProcess/APIContextConfiguration.h: Added.
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::create):
+ Pass the WebContextConfiguration to the constructor.
+
+ (WebKit::WebContext::WebContext):
+ Set the injected bundle path from the WebContextConfiguration object.
+
+ * UIProcess/WebContext.h:
+ Change the WebContext constructor and create function to take a WebContextConfiguration object.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add new files.
+
</ins><span class="cx"> 2014-05-10 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WK2] URTBF after r168585.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (168602 => 168603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKBase.h 2014-05-11 21:02:52 UTC (rev 168602)
+++ trunk/Source/WebKit2/Shared/API/c/WKBase.h 2014-05-11 22:12:17 UTC (rev 168603)
</span><span class="lines">@@ -94,6 +94,7 @@
</span><span class="cx"> typedef const struct OpaqueWKResourceCacheManager* WKResourceCacheManagerRef;
</span><span class="cx"> typedef const struct OpaqueWKColorPickerResultListener* WKColorPickerResultListenerRef;
</span><span class="cx"> typedef const struct OpaqueWKContext* WKContextRef;
</span><ins>+typedef const struct OpaqueWKContextConfiguration* WKContextConfigurationRef;
</ins><span class="cx"> typedef const struct OpaqueWKCookieManager* WKCookieManagerRef;
</span><span class="cx"> typedef const struct OpaqueWKCredential* WKCredentialRef;
</span><span class="cx"> typedef const struct OpaqueWKDatabaseManager* WKDatabaseManagerRef;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIObject.h (168602 => 168603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIObject.h 2014-05-11 21:02:52 UTC (rev 168602)
+++ trunk/Source/WebKit2/Shared/APIObject.h 2014-05-11 22:12:17 UTC (rev 168603)
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx"> CacheManager,
</span><span class="cx"> ColorPickerResultListener,
</span><span class="cx"> Context,
</span><ins>+ ContextConfiguration,
</ins><span class="cx"> CookieManager,
</span><span class="cx"> DatabaseManager,
</span><span class="cx"> Download,
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (168602 => 168603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2014-05-11 21:02:52 UTC (rev 168602)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2014-05-11 22:12:17 UTC (rev 168603)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> #include <WebCore/Settings.h>
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><ins>+class ContextConfiguration;
</ins><span class="cx"> class NavigationData;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -111,6 +112,7 @@
</span><span class="cx"> WK_ADD_API_MAPPING(WKResourceCacheManagerRef, WebResourceCacheManagerProxy)
</span><span class="cx"> WK_ADD_API_MAPPING(WKColorPickerResultListenerRef, WebColorPickerResultListenerProxy)
</span><span class="cx"> WK_ADD_API_MAPPING(WKContextRef, WebContext)
</span><ins>+WK_ADD_API_MAPPING(WKContextConfigurationRef, API::ContextConfiguration)
</ins><span class="cx"> WK_ADD_API_MAPPING(WKCookieManagerRef, WebCookieManagerProxy)
</span><span class="cx"> WK_ADD_API_MAPPING(WKCredentialRef, WebCredential)
</span><span class="cx"> WK_ADD_API_MAPPING(WKDatabaseManagerRef, WebDatabaseManagerProxy)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (168602 => 168603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-05-11 21:02:52 UTC (rev 168602)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-05-11 22:12:17 UTC (rev 168603)
</span><span class="lines">@@ -27,11 +27,13 @@
</span><span class="cx"> #include "WKContextPrivate.h"
</span><span class="cx">
</span><span class="cx"> #include "APIClient.h"
</span><ins>+#include "APIContextConfiguration.h"
</ins><span class="cx"> #include "APIDownloadClient.h"
</span><span class="cx"> #include "APIHistoryClient.h"
</span><span class="cx"> #include "APINavigationData.h"
</span><span class="cx"> #include "APIURLRequest.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><ins>+#include "WKContextConfigurationRef.h"
</ins><span class="cx"> #include "WKRetainPtr.h"
</span><span class="cx"> #include "WebContext.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -75,16 +77,22 @@
</span><span class="cx">
</span><span class="cx"> WKContextRef WKContextCreate()
</span><span class="cx"> {
</span><del>- RefPtr<WebContext> context = WebContext::create(String());
- return toAPI(context.release().leakRef());
</del><ins>+ return WKContextCreateWithConfiguration(adoptWK(WKContextConfigurationCreate()).get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKContextRef WKContextCreateWithInjectedBundlePath(WKStringRef pathRef)
</span><span class="cx"> {
</span><del>- RefPtr<WebContext> context = WebContext::create(toImpl(pathRef)->string());
- return toAPI(context.release().leakRef());
</del><ins>+ auto configuration = adoptWK(WKContextConfigurationCreate());
+ WKContextConfigurationSetInjectedBundlePath(configuration.get(), pathRef);
+
+ return WKContextCreateWithConfiguration(configuration.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+WKContextRef WKContextCreateWithConfiguration(WKContextConfigurationRef configuration)
+{
+ return toAPI(WebContext::create(toImpl(configuration)->webContextConfiguration()).leakRef());
+}
+
</ins><span class="cx"> void WKContextSetClient(WKContextRef contextRef, const WKContextClientBase* wkClient)
</span><span class="cx"> {
</span><span class="cx"> toImpl(contextRef)->initializeClient(wkClient);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (168602 => 168603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2014-05-11 21:02:52 UTC (rev 168602)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2014-05-11 22:12:17 UTC (rev 168603)
</span><span class="lines">@@ -102,6 +102,7 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKContextRef WKContextCreate();
</span><span class="cx"> WK_EXPORT WKContextRef WKContextCreateWithInjectedBundlePath(WKStringRef path);
</span><ins>+WK_EXPORT WKContextRef WKContextCreateWithConfiguration(WKContextConfigurationRef configuration);
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT void WKContextSetClient(WKContextRef context, const WKContextClientBase* client);
</span><span class="cx"> WK_EXPORT void WKContextSetInjectedBundleClient(WKContextRef context, const WKContextInjectedBundleClientBase* client);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextConfigurationRefcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp (0 => 168603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp 2014-05-11 22:12:17 UTC (rev 168603)
</span><span class="lines">@@ -0,0 +1,47 @@
</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.
+ */
+
+#include "config.h"
+#include "WKContextConfigurationRef.h"
+
+#include "APIContextConfiguration.h"
+#include "WKAPICast.h"
+
+using namespace WebKit;
+
+WKContextConfigurationRef WKContextConfigurationCreate()
+{
+ return toAPI(API::ContextConfiguration::create().leakRef());
+}
+
+WKStringRef WKContextConfigurationCopyInjectedBundlePath(WKContextConfigurationRef configuration)
+{
+ return toCopiedAPI(toImpl(configuration)->injectedBundlePath());
+}
+
+void WKContextConfigurationSetInjectedBundlePath(WKContextConfigurationRef configuration, WKStringRef injectedBundlePath)
+{
+ toImpl(configuration)->setInjectedBundlePath(toImpl(injectedBundlePath)->string());
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextConfigurationRefh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h (0 => 168603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h 2014-05-11 22:12:17 UTC (rev 168603)
</span><span class="lines">@@ -0,0 +1,45 @@
</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.
+ */
+
+#ifndef WKContextConfigurationRef_h
+#define WKContextConfigurationRef_h
+
+#include <WebKit/WKBase.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+WK_EXPORT WKContextConfigurationRef WKContextConfigurationCreate();
+
+WK_EXPORT WKStringRef WKContextConfigurationCopyInjectedBundlePath(WKContextConfigurationRef configuration);
+WK_EXPORT void WKContextConfigurationSetInjectedBundlePath(WKContextConfigurationRef configuration, WKStringRef injectedBundlePath);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif // WKContextConfigurationRef_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessGroupmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm (168602 => 168603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm 2014-05-11 21:02:52 UTC (rev 168602)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm 2014-05-11 22:12:17 UTC (rev 168603)
</span><span class="lines">@@ -189,8 +189,11 @@
</span><span class="cx"> InitWebCoreThreadSystemInterface();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- _context = WebContext::create(bundleURL ? String([bundleURL path]) : String());
</del><ins>+ WebContextConfiguration webContextConfiguration;
+ webContextConfiguration.injectedBundlePath = bundleURL ? String(bundleURL.path) : String();
</ins><span class="cx">
</span><ins>+ _context = WebContext::create(std::move(webContextConfiguration));
+
</ins><span class="cx"> setUpConnectionClient(self, toAPI(_context.get()));
</span><span class="cx"> setUpInectedBundleClient(self, toAPI(_context.get()));
</span><span class="cx"> setUpHistoryClient(self, toAPI(_context.get()));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm (168602 => 168603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2014-05-11 21:02:52 UTC (rev 168602)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2014-05-11 22:12:17 UTC (rev 168603)
</span><span class="lines">@@ -116,15 +116,16 @@
</span><span class="cx"> InitWebCoreThreadSystemInterface();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- String bundlePath;
</del><ins>+ WebKit::WebContextConfiguration webContextConfiguration;
+
</ins><span class="cx"> if (NSURL *bundleURL = [_configuration injectedBundleURL]) {
</span><span class="cx"> if (!bundleURL.isFileURL)
</span><span class="cx"> [NSException raise:NSInvalidArgumentException format:@"Injected Bundle URL must be a file URL"];
</span><span class="cx">
</span><del>- bundlePath = bundleURL.path;
</del><ins>+ webContextConfiguration.injectedBundlePath = bundleURL.path;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- API::Object::constructInWrapper<WebKit::WebContext>(self, bundlePath);
</del><ins>+ API::Object::constructInWrapper<WebKit::WebContext>(self, std::move(webContextConfiguration));
</ins><span class="cx"> _context->setHistoryClient(std::make_unique<WebKit::HistoryClient>());
</span><span class="cx"> _context->setUsesNetworkProcess(true);
</span><span class="cx"> _context->setProcessModel(WebKit::ProcessModelMultipleSecondaryProcesses);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIContextConfigurationcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/APIContextConfiguration.cpp (0 => 168603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/APIContextConfiguration.cpp (rev 0)
+++ trunk/Source/WebKit2/UIProcess/APIContextConfiguration.cpp 2014-05-11 22:12:17 UTC (rev 168603)
</span><span class="lines">@@ -0,0 +1,49 @@
</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.
+ */
+
+#include "config.h"
+#include "APIContextConfiguration.h"
+
+#include "WebContext.h"
+namespace API {
+
+ContextConfiguration::ContextConfiguration()
+{
+}
+
+ContextConfiguration::~ContextConfiguration()
+{
+}
+
+WebKit::WebContextConfiguration ContextConfiguration::webContextConfiguration() const
+{
+ WebKit::WebContextConfiguration configuration;
+
+ configuration.injectedBundlePath = m_injectedBundlePath;
+
+ return configuration;
+}
+
+} // namespace API
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIContextConfigurationh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/APIContextConfiguration.h (0 => 168603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/APIContextConfiguration.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/APIContextConfiguration.h 2014-05-11 22:12:17 UTC (rev 168603)
</span><span class="lines">@@ -0,0 +1,59 @@
</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.
+ */
+
+#ifndef APIContextConfiguration_h
+#define APIContextConfiguration_h
+
+#include "APIObject.h"
+#include <wtf/text/WTFString.h>
+
+namespace WebKit {
+struct WebContextConfiguration;
+}
+
+namespace API {
+
+class ContextConfiguration : public ObjectImpl<Object::Type::ContextConfiguration> {
+public:
+ static PassRefPtr<ContextConfiguration> create()
+ {
+ return adoptRef(new ContextConfiguration);
+ }
+ virtual ~ContextConfiguration();
+
+ String injectedBundlePath() { return m_injectedBundlePath; }
+ void setInjectedBundlePath(const String& injectedBundlePath) { m_injectedBundlePath = injectedBundlePath; }
+
+ WebKit::WebContextConfiguration webContextConfiguration() const;
+
+private:
+ ContextConfiguration();
+
+ String m_injectedBundlePath;
+};
+
+} // namespace API
+
+#endif // APIContextConfiguration_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (168602 => 168603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-05-11 21:02:52 UTC (rev 168602)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-05-11 22:12:17 UTC (rev 168603)
</span><span class="lines">@@ -117,10 +117,10 @@
</span><span class="cx">
</span><span class="cx"> DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, webContextCounter, ("WebContext"));
</span><span class="cx">
</span><del>-PassRefPtr<WebContext> WebContext::create(const String& injectedBundlePath)
</del><ins>+PassRefPtr<WebContext> WebContext::create(WebContextConfiguration configuration)
</ins><span class="cx"> {
</span><span class="cx"> InitializeWebKit2();
</span><del>- return adoptRef(new WebContext(injectedBundlePath));
</del><ins>+ return adoptRef(new WebContext(std::move(configuration)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Vector<WebContext*>& contexts()
</span><span class="lines">@@ -134,13 +134,13 @@
</span><span class="cx"> return contexts();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebContext::WebContext(const String& injectedBundlePath)
</del><ins>+WebContext::WebContext(WebContextConfiguration configuration)
</ins><span class="cx"> : m_processModel(ProcessModelSharedSecondaryProcess)
</span><span class="cx"> , m_webProcessCountLimit(UINT_MAX)
</span><span class="cx"> , m_haveInitialEmptyProcess(false)
</span><span class="cx"> , m_processWithPageCache(0)
</span><span class="cx"> , m_defaultPageGroup(WebPageGroup::createNonNull())
</span><del>- , m_injectedBundlePath(injectedBundlePath)
</del><ins>+ , m_injectedBundlePath(configuration.injectedBundlePath)
</ins><span class="cx"> , m_downloadClient(std::make_unique<API::DownloadClient>())
</span><span class="cx"> , m_historyClient(std::make_unique<API::HistoryClient>())
</span><span class="cx"> , m_visitedLinkProvider(VisitedLinkProvider::create())
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (168602 => 168603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-05-11 21:02:52 UTC (rev 168602)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-05-11 22:12:17 UTC (rev 168603)
</span><span class="lines">@@ -95,15 +95,19 @@
</span><span class="cx"> int webProcessThroughputQOS();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+struct WebContextConfiguration {
+ String injectedBundlePath;
+};
+
</ins><span class="cx"> class WebContext : public API::ObjectImpl<API::Object::Type::Context>, private IPC::MessageReceiver
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> , private PluginInfoStoreClient
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> public:
</span><del>- WebContext(const String& injectedBundlePath);
-
- static PassRefPtr<WebContext> create(const String& injectedBundlePath);
</del><ins>+ WebContext(WebContextConfiguration);
+
+ static PassRefPtr<WebContext> create(WebContextConfiguration);
</ins><span class="cx"> virtual ~WebContext();
</span><span class="cx">
</span><span class="cx"> static const Vector<WebContext*>& allContexts();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (168602 => 168603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-05-11 21:02:52 UTC (rev 168602)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-05-11 22:12:17 UTC (rev 168603)
</span><span class="lines">@@ -418,6 +418,10 @@
</span><span class="cx"> 1AE4987911FF7FAA0048B464 /* JSNPObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE4987711FF7FAA0048B464 /* JSNPObject.cpp */; };
</span><span class="cx"> 1AE49A4911FFA8CE0048B464 /* JSNPMethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE49A4711FFA8CE0048B464 /* JSNPMethod.h */; };
</span><span class="cx"> 1AE49A4A11FFA8CE0048B464 /* JSNPMethod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE49A4811FFA8CE0048B464 /* JSNPMethod.cpp */; };
</span><ins>+ 1AE52F9119201DA700A1FA37 /* APIContextConfiguration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE52F8F19201DA700A1FA37 /* APIContextConfiguration.cpp */; };
+ 1AE52F9219201DA700A1FA37 /* APIContextConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE52F9019201DA700A1FA37 /* APIContextConfiguration.h */; };
+ 1AE52F971920263300A1FA37 /* WKContextConfigurationRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AE52F9319201F6B00A1FA37 /* WKContextConfigurationRef.cpp */; };
+ 1AE52F981920267200A1FA37 /* WKContextConfigurationRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AE52F9419201F6B00A1FA37 /* WKContextConfigurationRef.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 1AE5B7FB11E7AED200BA6767 /* NetscapePluginMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AE5B7F911E7AED200BA6767 /* NetscapePluginMac.mm */; settings = {COMPILER_FLAGS = "-Wno-deprecated-declarations"; }; };
</span><span class="cx"> 1AEFCC1211D01F96008219D3 /* PluginInfoStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEFCC1011D01F96008219D3 /* PluginInfoStore.h */; };
</span><span class="cx"> 1AEFCC1311D01F96008219D3 /* PluginInfoStore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AEFCC1111D01F96008219D3 /* PluginInfoStore.cpp */; };
</span><span class="lines">@@ -2320,6 +2324,10 @@
</span><span class="cx"> 1AE4987711FF7FAA0048B464 /* JSNPObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNPObject.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AE49A4711FFA8CE0048B464 /* JSNPMethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNPMethod.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AE49A4811FFA8CE0048B464 /* JSNPMethod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNPMethod.cpp; sourceTree = "<group>"; };
</span><ins>+ 1AE52F8F19201DA700A1FA37 /* APIContextConfiguration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIContextConfiguration.cpp; sourceTree = "<group>"; };
+ 1AE52F9019201DA700A1FA37 /* APIContextConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIContextConfiguration.h; sourceTree = "<group>"; };
+ 1AE52F9319201F6B00A1FA37 /* WKContextConfigurationRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKContextConfigurationRef.cpp; sourceTree = "<group>"; };
+ 1AE52F9419201F6B00A1FA37 /* WKContextConfigurationRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContextConfigurationRef.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1AE5B7F911E7AED200BA6767 /* NetscapePluginMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NetscapePluginMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1AEFCC1011D01F96008219D3 /* PluginInfoStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginInfoStore.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AEFCC1111D01F96008219D3 /* PluginInfoStore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginInfoStore.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -5543,6 +5551,8 @@
</span><span class="cx"> 1AEFCC0511D01F34008219D3 /* Plugins */,
</span><span class="cx"> 0F594793187B3B4C00437857 /* Scrolling */,
</span><span class="cx"> 1A44B95816B73F8C00B7BBD8 /* Storage */,
</span><ins>+ 1AE52F8F19201DA700A1FA37 /* APIContextConfiguration.cpp */,
+ 1AE52F9019201DA700A1FA37 /* APIContextConfiguration.h */,
</ins><span class="cx"> BCF69FA11176D01400471A52 /* APINavigationData.cpp */,
</span><span class="cx"> BCF69FA01176D01400471A52 /* APINavigationData.h */,
</span><span class="cx"> 75A8D2DD187DE87400C39C9E /* APISession.cpp */,
</span><span class="lines">@@ -5786,6 +5796,8 @@
</span><span class="cx"> 33367639130C99DC006C9DE2 /* WKResourceCacheManager.h */,
</span><span class="cx"> 75A8D2D0187D17BF00C39C9E /* WKSessionRef.cpp */,
</span><span class="cx"> 75A8D2D1187D17BF00C39C9E /* WKSessionRef.h */,
</span><ins>+ 1AE52F9319201F6B00A1FA37 /* WKContextConfigurationRef.cpp */,
+ 1AE52F9419201F6B00A1FA37 /* WKContextConfigurationRef.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = C;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -6910,6 +6922,7 @@
</span><span class="cx"> 515E7728183DD6F60007203F /* AsyncRequest.h in Headers */,
</span><span class="cx"> BCE81D8D1319F7EF00241910 /* FontInfo.h in Headers */,
</span><span class="cx"> 1ABC3DFC1899F51C004F0626 /* WKNavigationDelegate.h in Headers */,
</span><ins>+ 1AE52F9219201DA700A1FA37 /* APIContextConfiguration.h in Headers */,
</ins><span class="cx"> E105FE5418D7B9DE008F57A8 /* EditingRange.h in Headers */,
</span><span class="cx"> 2D140EB018F37BE0005E75A0 /* PageOverlayController.h in Headers */,
</span><span class="cx"> BC17753F118BABF0007D9E9A /* GenericCallback.h in Headers */,
</span><span class="lines">@@ -7176,6 +7189,7 @@
</span><span class="cx"> 75E749EC180DBB9800088BA6 /* WebOriginDataManagerProxyMessages.h in Headers */,
</span><span class="cx"> 512935D81288D19400A4B695 /* WebContextMenuItem.h in Headers */,
</span><span class="cx"> 00B9661618E24CBA00CE1F88 /* APIFindClient.h in Headers */,
</span><ins>+ 1AE52F981920267200A1FA37 /* WKContextConfigurationRef.h in Headers */,
</ins><span class="cx"> 510FBB9B1288C95E00AFFDF4 /* WebContextMenuItemData.h in Headers */,
</span><span class="cx"> 51ACBB82127A8BAD00D203B9 /* WebContextMenuProxy.h in Headers */,
</span><span class="cx"> 1AB8A1F418400B8F00E9AE69 /* WKPageFindClient.h in Headers */,
</span><span class="lines">@@ -8631,6 +8645,7 @@
</span><span class="cx"> 1A2161B111F37664008AD0F5 /* NPRuntimeObjectMap.cpp in Sources */,
</span><span class="cx"> 1A2162B011F38971008AD0F5 /* NPRuntimeUtilities.cpp in Sources */,
</span><span class="cx"> 1A9E329E1822FEDD00F5D04C /* WKRemoteObjectCoder.mm in Sources */,
</span><ins>+ 1AE52F971920263300A1FA37 /* WKContextConfigurationRef.cpp in Sources */,
</ins><span class="cx"> 1A2D84A4127F6AD1001EB962 /* NPVariantData.cpp in Sources */,
</span><span class="cx"> BC8ACA1416670D89004C1941 /* ObjCObjectGraph.mm in Sources */,
</span><span class="cx"> BC8ACA1616670D89004C1941 /* ObjCObjectGraphCoders.mm in Sources */,
</span><span class="lines">@@ -9043,6 +9058,7 @@
</span><span class="cx"> BCB9E24C1120E15C00A137E0 /* WKContext.cpp in Sources */,
</span><span class="cx"> 51A555F5128C6C47009ABCEC /* WKContextMenuItem.cpp in Sources */,
</span><span class="cx"> 9FB5F394169E6A80002C25BF /* WKContextPrivateMac.mm in Sources */,
</span><ins>+ 1AE52F9119201DA700A1FA37 /* APIContextConfiguration.cpp in Sources */,
</ins><span class="cx"> 3309345A1315B9980097A7BC /* WKCookieManager.cpp in Sources */,
</span><span class="cx"> 512F58F912A88A5400629530 /* WKCredential.cpp in Sources */,
</span><span class="cx"> 759CCD581808F1640078E8A8 /* WebOriginDataManagerProxyChangeClient.cpp in Sources */,
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (168602 => 168603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-05-11 21:02:52 UTC (rev 168602)
+++ trunk/Tools/ChangeLog 2014-05-11 22:12:17 UTC (rev 168603)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-05-11 Anders Carlsson <andersca@apple.com>
+
+ Add a WKContextConfigurationRef object and make the injected bundle path part of the configuration
+ https://bugs.webkit.org/show_bug.cgi?id=132806
+
+ Reviewed by Beth Dakin.
+
+ Migrate to WKContextConfiguration.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::initialize):
+
</ins><span class="cx"> 2014-05-10 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(CMAKE): [GTK] WebKit2 C API tests are not longer built in the same binary
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (168602 => 168603)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2014-05-11 21:02:52 UTC (rev 168602)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2014-05-11 22:12:17 UTC (rev 168603)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "TestInvocation.h"
</span><span class="cx"> #include <WebKit2/WKAuthenticationChallenge.h>
</span><span class="cx"> #include <WebKit2/WKAuthenticationDecisionListener.h>
</span><ins>+#include <WebKit2/WKContextConfigurationRef.h>
</ins><span class="cx"> #include <WebKit2/WKContextPrivate.h>
</span><span class="cx"> #include <WebKit2/WKCredential.h>
</span><span class="cx"> #include <WebKit2/WKIconDatabase.h>
</span><span class="lines">@@ -326,7 +327,10 @@
</span><span class="cx"> WKRetainPtr<WKStringRef> pageGroupIdentifier(AdoptWK, WKStringCreateWithUTF8CString("WebKitTestRunnerPageGroup"));
</span><span class="cx"> m_pageGroup.adopt(WKPageGroupCreateWithIdentifier(pageGroupIdentifier.get()));
</span><span class="cx">
</span><del>- m_context.adopt(WKContextCreateWithInjectedBundlePath(injectedBundlePath()));
</del><ins>+ auto configuration = adoptWK(WKContextConfigurationCreate());
+ WKContextConfigurationSetInjectedBundlePath(configuration.get(), injectedBundlePath());
+
+ m_context = adoptWK(WKContextCreateWithConfiguration(configuration.get()));
</ins><span class="cx"> m_geolocationProvider = adoptPtr(new GeolocationProviderMock(m_context.get()));
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 1080)
</span></span></pre>
</div>
</div>
</body>
</html>