<!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>[185977] 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/185977">185977</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-25 18:34:42 -0700 (Thu, 25 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Make send / receive messages to communicate the Web and UI Processes using Injected Bundle.
https://bugs.webkit.org/show_bug.cgi?id=145685
Patch by Hyungwook Lee <hyungwook.lee@navercorp.com> on 2015-06-25
Reviewed by Gyuyoung Kim.
To have extensible port specific API facility using Injected Bundle,
we need to load libewebkit_extension_manager.so in default that is same as what gtk port does.
* UIProcess/API/efl/ewk_context.cpp:
(EwkContext::EwkContext):
(EwkContext::findOrCreateWrapper):
(bundlePathForExtension):
(EwkContext::create):
(EwkContext::allowSpecificHTTPSCertificateForHost):
(EwkContext::isDefaultBundle):
(ewk_context_default_get):
* UIProcess/API/efl/ewk_context_private.h:
* WebProcess/efl/ExtensionManagerEfl.cpp:
(WebKit::ExtensionManagerEfl::initialize):</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_context_privateh">trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesseflExtensionManagerEflcpp">trunk/Source/WebKit2/WebProcess/efl/ExtensionManagerEfl.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185976 => 185977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-26 01:15:29 UTC (rev 185976)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-26 01:34:42 UTC (rev 185977)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-06-25 Hyungwook Lee <hyungwook.lee@navercorp.com>
+
+ [EFL] Make send / receive messages to communicate the Web and UI Processes using Injected Bundle.
+ https://bugs.webkit.org/show_bug.cgi?id=145685
+
+ Reviewed by Gyuyoung Kim.
+
+ To have extensible port specific API facility using Injected Bundle,
+ we need to load libewebkit_extension_manager.so in default that is same as what gtk port does.
+
+ * UIProcess/API/efl/ewk_context.cpp:
+ (EwkContext::EwkContext):
+ (EwkContext::findOrCreateWrapper):
+ (bundlePathForExtension):
+ (EwkContext::create):
+ (EwkContext::allowSpecificHTTPSCertificateForHost):
+ (EwkContext::isDefaultBundle):
+ (ewk_context_default_get):
+ * UIProcess/API/efl/ewk_context_private.h:
+ * WebProcess/efl/ExtensionManagerEfl.cpp:
+ (WebKit::ExtensionManagerEfl::initialize):
+
</ins><span class="cx"> 2015-06-25 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] Swiping back just after scrolling can cause some tiles to disappear
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_contextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (185976 => 185977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2015-06-26 01:15:29 UTC (rev 185976)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2015-06-26 01:34:42 UTC (rev 185977)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> m_callbackForMessageFromExtension.callback = nullptr;
</span><span class="cx"> m_callbackForMessageFromExtension.userData = nullptr;
</span><span class="cx">
</span><del>- if (!extensionsPath.isEmpty()) {
</del><ins>+ if (!extensionsPath.isEmpty() || isDefaultBundle()) {
</ins><span class="cx"> WKContextInjectedBundleClientV1 client;
</span><span class="cx"> memset(&client, 0, sizeof(client));
</span><span class="cx">
</span><span class="lines">@@ -130,11 +130,6 @@
</span><span class="cx"> return adoptRef(new EwkContext(context));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<EwkContext> EwkContext::create()
-{
- return adoptRef(new EwkContext(adoptWK(WKContextCreate()).get()));
-}
-
</del><span class="cx"> static String bundlePathForExtension()
</span><span class="cx"> {
</span><span class="cx"> String bundlePathForExtension = WebCore::pathByAppendingComponent(String::fromUTF8(TEST_LIB_DIR), EXTENSIONMANAGERNAME);
</span><span class="lines">@@ -148,20 +143,20 @@
</span><span class="cx"> return emptyString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<EwkContext> EwkContext::create(const String& extensionsPath)
</del><ins>+Ref<EwkContext> EwkContext::create(const String& extensionsPath)
</ins><span class="cx"> {
</span><span class="cx"> String bundlePath = bundlePathForExtension();
</span><span class="cx"> if (bundlePath.isEmpty())
</span><del>- return 0;
</del><ins>+ return adoptRef(*new EwkContext(adoptWK(WKContextCreate()).get()));
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKStringRef> path = adoptWK(toCopiedAPI(bundlePath));
</span><span class="cx">
</span><del>- return adoptRef(new EwkContext(adoptWK(WKContextCreateWithInjectedBundlePath(path.get())).get(), extensionsPath));
</del><ins>+ return adoptRef(*new EwkContext(adoptWK(WKContextCreateWithInjectedBundlePath(path.get())).get(), extensionsPath));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EwkContext* EwkContext::defaultContext()
</span><span class="cx"> {
</span><del>- static EwkContext* defaultInstance = create().leakRef();
</del><ins>+ static EwkContext* defaultInstance = &create().leakRef();
</ins><span class="cx">
</span><span class="cx"> return defaultInstance;
</span><span class="cx"> }
</span><span class="lines">@@ -453,6 +448,11 @@
</span><span class="cx"> toImpl(m_context.get())->allowSpecificHTTPSCertificateForHost(webCertificateInfo.get(), host);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool EwkContext::isDefaultBundle() const
+{
+ return bundlePathForExtension() == toImpl(m_context.get())->injectedBundlePath();
+}
+
</ins><span class="cx"> Ewk_Context* ewk_context_default_get()
</span><span class="cx"> {
</span><span class="cx"> return EwkContext::defaultContext();
</span><span class="lines">@@ -460,14 +460,14 @@
</span><span class="cx">
</span><span class="cx"> Ewk_Context* ewk_context_new()
</span><span class="cx"> {
</span><del>- return EwkContext::create().leakRef();
</del><ins>+ return &EwkContext::create().leakRef();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ewk_Context* ewk_context_new_with_extensions_path(const char* path)
</span><span class="cx"> {
</span><span class="cx"> EINA_SAFETY_ON_NULL_RETURN_VAL(path, nullptr);
</span><span class="cx">
</span><del>- return EwkContext::create(String::fromUTF8(path)).leakRef();
</del><ins>+ return &EwkContext::create(String::fromUTF8(path)).leakRef();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Eina_Bool ewk_context_url_scheme_register(Ewk_Context* ewkContext, const char* scheme, Ewk_Url_Scheme_Request_Cb callback, void* userData)
</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 (185976 => 185977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h 2015-06-26 01:15:29 UTC (rev 185976)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h 2015-06-26 01:34:42 UTC (rev 185977)
</span><span class="lines">@@ -48,8 +48,7 @@
</span><span class="cx"> EWK_OBJECT_DECLARE(EwkContext)
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<EwkContext> findOrCreateWrapper(WKContextRef context);
</span><del>- static PassRefPtr<EwkContext> create();
- static PassRefPtr<EwkContext> create(const String& injectedBundlePath);
</del><ins>+ static Ref<EwkContext> create(const String& extensionsPath = String());
</ins><span class="cx">
</span><span class="cx"> static EwkContext* defaultContext();
</span><span class="cx">
</span><span class="lines">@@ -107,6 +106,7 @@
</span><span class="cx"> explicit EwkContext(WKContextRef, const String& extensionsPath = String());
</span><span class="cx">
</span><span class="cx"> void ensureFaviconDatabase();
</span><ins>+ bool isDefaultBundle() const;
</ins><span class="cx">
</span><span class="cx"> WKRetainPtr<WKContextRef> m_context;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesseflExtensionManagerEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/efl/ExtensionManagerEfl.cpp (185976 => 185977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/efl/ExtensionManagerEfl.cpp 2015-06-26 01:15:29 UTC (rev 185976)
+++ trunk/Source/WebKit2/WebProcess/efl/ExtensionManagerEfl.cpp 2015-06-26 01:34:42 UTC (rev 185977)
</span><span class="lines">@@ -50,12 +50,14 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_extension);
</span><span class="cx">
</span><ins>+ m_extension = std::make_unique<EwkExtension>(toImpl(bundle));
+ if (!userData)
+ return;
+
</ins><span class="cx"> String extensionsDirectory = toImpl(static_cast<WKStringRef>(userData))->string();
</span><span class="cx"> if (extensionsDirectory.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_extension = std::make_unique<EwkExtension>(toImpl(bundle));
-
</del><span class="cx"> Vector<String> modulePaths = WebCore::listDirectory(extensionsDirectory, ASCIILiteral("*.so"));
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < modulePaths.size(); ++i) {
</span></span></pre>
</div>
</div>
</body>
</html>