<!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>[166228] 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/166228">166228</a></dd>
<dt>Author</dt> <dd>m.pakula@samsung.com</dd>
<dt>Date</dt> <dd>2014-03-25 02:53:26 -0700 (Tue, 25 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][WK2] Add an API to set process model
https://bugs.webkit.org/show_bug.cgi?id=130133
Reviewed by Gyuyoung Kim.
Implement an API to set and get process model in ewk_context.
By default process model enum value is set to EWK_PROCESS_MODEL_SHARED_SECONDARY
which keeps current behaviour. Setting EWK_PROCESS_MODEL_MULTIPLE_SECONDARY
will make each web view use separate web process, also enables network process.
* UIProcess/API/efl/ewk_context.cpp:
(toWKProcessModel):
(EwkContext::setProcessModel):
(toEwkProcessModel):
(EwkContext::processModel):
(ewk_context_process_model_set):
(ewk_context_process_model_get):
* UIProcess/API/efl/ewk_context.h:
* UIProcess/API/efl/ewk_context_private.h:
* UIProcess/API/efl/tests/test_ewk2_context.cpp:
(TEST_F):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_contextcpp">trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_contexth">trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_context_privateh">trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_contextcpp">trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166227 => 166228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-25 09:10:32 UTC (rev 166227)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-25 09:53:26 UTC (rev 166228)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-03-24 Michał Pakuła vel Rutka <m.pakula@samsung.com>
+
+ [EFL][WK2] Add an API to set process model
+ https://bugs.webkit.org/show_bug.cgi?id=130133
+
+ Reviewed by Gyuyoung Kim.
+
+ Implement an API to set and get process model in ewk_context.
+ By default process model enum value is set to EWK_PROCESS_MODEL_SHARED_SECONDARY
+ which keeps current behaviour. Setting EWK_PROCESS_MODEL_MULTIPLE_SECONDARY
+ will make each web view use separate web process, also enables network process.
+
+ * UIProcess/API/efl/ewk_context.cpp:
+ (toWKProcessModel):
+ (EwkContext::setProcessModel):
+ (toEwkProcessModel):
+ (EwkContext::processModel):
+ (ewk_context_process_model_set):
+ (ewk_context_process_model_get):
+ * UIProcess/API/efl/ewk_context.h:
+ * UIProcess/API/efl/ewk_context_private.h:
+ * UIProcess/API/efl/tests/test_ewk2_context.cpp:
+ (TEST_F):
+
</ins><span class="cx"> 2014-03-24 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: hit-testing doesn't always work correctly with WK2
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_contextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (166227 => 166228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2014-03-25 09:10:32 UTC (rev 166227)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2014-03-25 09:53:26 UTC (rev 166228)
</span><span class="lines">@@ -237,6 +237,48 @@
</span><span class="cx"> return static_cast<Ewk_Cache_Model>(WKContextGetCacheModel(m_context.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline WKProcessModel toWKProcessModel(Ewk_Process_Model processModel)
+{
+ switch (processModel) {
+ case EWK_PROCESS_MODEL_SHARED_SECONDARY:
+ return kWKProcessModelSharedSecondaryProcess;
+ case EWK_PROCESS_MODEL_MULTIPLE_SECONDARY:
+ return kWKProcessModelMultipleSecondaryProcesses;
+ }
+ ASSERT_NOT_REACHED();
+
+ return kWKProcessModelSharedSecondaryProcess;
+}
+
+void EwkContext::setProcessModel(Ewk_Process_Model processModel)
+{
+ WKProcessModel newWKProcessModel = toWKProcessModel(processModel);
+
+ if (WKContextGetProcessModel(m_context.get()) == newWKProcessModel)
+ return;
+
+ WKContextSetUsesNetworkProcess(m_context.get(), newWKProcessModel == kWKProcessModelMultipleSecondaryProcesses);
+ WKContextSetProcessModel(m_context.get(), newWKProcessModel);
+}
+
+inline Ewk_Process_Model toEwkProcessModel(WKProcessModel processModel)
+{
+ switch (processModel) {
+ case kWKProcessModelSharedSecondaryProcess:
+ return EWK_PROCESS_MODEL_SHARED_SECONDARY;
+ case kWKProcessModelMultipleSecondaryProcesses:
+ return EWK_PROCESS_MODEL_MULTIPLE_SECONDARY;
+ }
+ ASSERT_NOT_REACHED();
+
+ return EWK_PROCESS_MODEL_SHARED_SECONDARY;
+}
+
+Ewk_Process_Model EwkContext::processModel() const
+{
+ return toEwkProcessModel(WKContextGetProcessModel(m_context.get()));
+}
+
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> void EwkContext::setAdditionalPluginPath(const String& path)
</span><span class="cx"> {
</span><span class="lines">@@ -469,3 +511,30 @@
</span><span class="cx">
</span><span class="cx"> impl->setMessageFromInjectedBundleCallback(callback, userData);
</span><span class="cx"> }
</span><ins>+
+Eina_Bool ewk_context_process_model_set(Ewk_Context* ewkContext, Ewk_Process_Model processModel)
+{
+#if ENABLE(NETWORK_PROCESS)
+ EWK_OBJ_GET_IMPL_OR_RETURN(EwkContext, ewkContext, impl, false);
+
+ impl->setProcessModel(processModel);
+
+ return true;
+#else
+ UNUSED_PARAM(ewkContext);
+ UNUSED_PARAM(processModel);
+ return false;
+#endif
+}
+
+Ewk_Process_Model ewk_context_process_model_get(const Ewk_Context* ewkContext)
+{
+#if ENABLE(NETWORK_PROCESS)
+ EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, EWK_PROCESS_MODEL_SHARED_SECONDARY);
+
+ return impl->processModel();
+#else
+ UNUSED_PARAM(ewkContext);
+ return EWK_PROCESS_MODEL_SHARED_SECONDARY;
+#endif
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_contexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.h (166227 => 166228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.h 2014-03-25 09:10:32 UTC (rev 166227)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.h 2014-03-25 09:53:26 UTC (rev 166228)
</span><span class="lines">@@ -75,6 +75,19 @@
</span><span class="cx"> typedef enum Ewk_Cache_Model Ewk_Cache_Model;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * \enum Ewk_Process_Model
+ *
+ * @brief Contains option for process model
+ */
+enum Ewk_Process_Model {
+ EWK_PROCESS_MODEL_SHARED_SECONDARY,
+ EWK_PROCESS_MODEL_MULTIPLE_SECONDARY
+};
+
+/// Creates a type name for the Ewk_Process_Model.
+typedef enum Ewk_Process_Model Ewk_Process_Model;
+
+/**
</ins><span class="cx"> * @typedef Ewk_Url_Scheme_Request_Cb Ewk_Url_Scheme_Request_Cb
</span><span class="cx"> * @brief Callback type for use with ewk_context_url_scheme_register().
</span><span class="cx"> */
</span><span class="lines">@@ -362,6 +375,30 @@
</span><span class="cx"> */
</span><span class="cx"> EAPI void ewk_context_message_from_injected_bundle_callback_set(Ewk_Context *context, Ewk_Context_Message_From_Injected_Bundle_Cb callback, void *user_data);
</span><span class="cx">
</span><ins>+/**
+ * Sets a process model for @a context.
+ *
+ * Sets a process model for web views, which will be used to decide how
+ * processes should be handled. Default value is
+ * EWK_PROCESS_MODEL_SHARED_SECONDARY which means that there is only one
+ * web process. When EWK_PROCESS_MODEL_MULTIPLE_SECONDARY is set a
+ * network process is introduced and every web view starts new web process.
+ * This function should be used before first web process is spawned.
+ *
+ * @param context context object to set process model
+ * @param process_model a #Ewk_Process_Model
+ */
+EAPI Eina_Bool ewk_context_process_model_set(Ewk_Context *context, Ewk_Process_Model process_model);
+
+/**
+ * Gets the process model for @a context.
+ *
+ * @param context context object to query
+ *
+ * @return the process model for the @a context
+ */
+EAPI Ewk_Process_Model ewk_context_process_model_get(const Ewk_Context *context);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_context_privateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h (166227 => 166228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h 2014-03-25 09:10:32 UTC (rev 166227)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h 2014-03-25 09:53:26 UTC (rev 166228)
</span><span class="lines">@@ -75,6 +75,10 @@
</span><span class="cx">
</span><span class="cx"> Ewk_Cache_Model cacheModel() const;
</span><span class="cx">
</span><ins>+ void setProcessModel(Ewk_Process_Model);
+
+ Ewk_Process_Model processModel() const;
+
</ins><span class="cx"> WKContextRef wkContext() const { return m_context.get(); }
</span><span class="cx">
</span><span class="cx"> WebKit::DownloadManagerEfl* downloadManager() const;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflteststest_ewk2_contextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp (166227 => 166228)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp 2014-03-25 09:10:32 UTC (rev 166227)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp 2014-03-25 09:53:26 UTC (rev 166228)
</span><span class="lines">@@ -118,6 +118,13 @@
</span><span class="cx"> ASSERT_EQ(EWK_CACHE_MODEL_DOCUMENT_VIEWER, ewk_context_cache_model_get(context));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST_F(EWK2ContextTest, ewk_context_process_model)
+{
+ Ewk_Context* context = ewk_view_context_get(webView());
+
+ ASSERT_EQ(EWK_PROCESS_MODEL_SHARED_SECONDARY, ewk_context_process_model_get(context));
+}
+
</ins><span class="cx"> TEST_F(EWK2ContextTest, ewk_context_new)
</span><span class="cx"> {
</span><span class="cx"> Ewk_Context* context = ewk_context_new();
</span></span></pre>
</div>
</div>
</body>
</html>