Title: [185589] trunk/Source/WebKit2
- Revision
- 185589
- Author
- commit-qu...@webkit.org
- Date
- 2015-06-16 06:06:07 -0700 (Tue, 16 Jun 2015)
Log Message
Unreviewed, rolling out r185552.
https://bugs.webkit.org/show_bug.cgi?id=146015
It broke some WK2 API tests on EFL bots (Requested by
gyuyoung on #webkit).
Reverted changeset:
"[EFL] Make send/receive messages to communicate the Web and
UI Processes using Injected Bundle."
https://bugs.webkit.org/show_bug.cgi?id=145685
http://trac.webkit.org/changeset/185552
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185588 => 185589)
--- trunk/Source/WebKit2/ChangeLog 2015-06-16 11:11:32 UTC (rev 185588)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-16 13:06:07 UTC (rev 185589)
@@ -1,3 +1,18 @@
+2015-06-16 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r185552.
+ https://bugs.webkit.org/show_bug.cgi?id=146015
+
+ It broke some WK2 API tests on EFL bots (Requested by
+ gyuyoung on #webkit).
+
+ Reverted changeset:
+
+ "[EFL] Make send/receive messages to communicate the Web and
+ UI Processes using Injected Bundle."
+ https://bugs.webkit.org/show_bug.cgi?id=145685
+ http://trac.webkit.org/changeset/185552
+
2015-06-16 Ryuan Choi <ryuan.c...@navercorp.com>
[EFL] Add API tests for ewk_page
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (185588 => 185589)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2015-06-16 11:11:32 UTC (rev 185588)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2015-06-16 13:06:07 UTC (rev 185589)
@@ -99,15 +99,17 @@
m_callbackForMessageFromExtension.callback = nullptr;
m_callbackForMessageFromExtension.userData = nullptr;
- WKContextInjectedBundleClientV1 client;
- memset(&client, 0, sizeof(client));
+ if (!extensionsPath.isEmpty()) {
+ WKContextInjectedBundleClientV1 client;
+ memset(&client, 0, sizeof(client));
- client.base.version = 1;
- client.base.clientInfo = this;
- client.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
- client.getInjectedBundleInitializationUserData = getInjectedBundleInitializationUserData;
+ client.base.version = 1;
+ client.base.clientInfo = this;
+ client.didReceiveMessageFromInjectedBundle = didReceiveMessageFromInjectedBundle;
+ client.getInjectedBundleInitializationUserData = getInjectedBundleInitializationUserData;
- WKContextSetInjectedBundleClient(m_context.get(), &client.base);
+ WKContextSetInjectedBundleClient(m_context.get(), &client.base);
+ }
}
EwkContext::~EwkContext()
@@ -128,6 +130,11 @@
return adoptRef(new EwkContext(context));
}
+PassRefPtr<EwkContext> EwkContext::create()
+{
+ return adoptRef(new EwkContext(adoptWK(WKContextCreate()).get()));
+}
+
static String bundlePathForExtension()
{
String bundlePathForExtension = WebCore::pathByAppendingComponent(String::fromUTF8(TEST_LIB_DIR), EXTENSIONMANAGERNAME);
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h (185588 => 185589)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h 2015-06-16 11:11:32 UTC (rev 185588)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h 2015-06-16 13:06:07 UTC (rev 185589)
@@ -48,7 +48,8 @@
EWK_OBJECT_DECLARE(EwkContext)
static PassRefPtr<EwkContext> findOrCreateWrapper(WKContextRef context);
- static PassRefPtr<EwkContext> create(const String& extensionsPath = String());
+ static PassRefPtr<EwkContext> create();
+ static PassRefPtr<EwkContext> create(const String& injectedBundlePath);
static EwkContext* defaultContext();
Modified: trunk/Source/WebKit2/WebProcess/efl/ExtensionManagerEfl.cpp (185588 => 185589)
--- trunk/Source/WebKit2/WebProcess/efl/ExtensionManagerEfl.cpp 2015-06-16 11:11:32 UTC (rev 185588)
+++ trunk/Source/WebKit2/WebProcess/efl/ExtensionManagerEfl.cpp 2015-06-16 13:06:07 UTC (rev 185589)
@@ -50,14 +50,12 @@
{
ASSERT(!m_extension);
- m_extension = std::make_unique<EwkExtension>(toImpl(bundle));
- if (!userData)
- return;
-
String extensionsDirectory = toImpl(static_cast<WKStringRef>(userData))->string();
if (extensionsDirectory.isEmpty())
return;
+ m_extension = std::make_unique<EwkExtension>(toImpl(bundle));
+
Vector<String> modulePaths = WebCore::listDirectory(extensionsDirectory, ASCIILiteral("*.so"));
for (size_t i = 0; i < modulePaths.size(); ++i) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
