Title: [133880] trunk/Source/WebKit2
- Revision
- 133880
- Author
- commit-qu...@webkit.org
- Date
- 2012-11-08 04:14:39 -0800 (Thu, 08 Nov 2012)
Log Message
[EFL][WK2] Add ewk_context_additional_plugin_path_set API
https://bugs.webkit.org/show_bug.cgi?id=101530
Patch by KwangYong Choi <ky0.c...@samsung.com> on 2012-11-08
Reviewed by Gyuyoung Kim.
Add ewk_context_additional_plugin_path_set() to set additional plugin directory.
* UIProcess/API/efl/ewk_context.cpp:
(EwkContext::setAdditionalPluginPath):
(ewk_context_additional_plugin_path_set):
* UIProcess/API/efl/ewk_context.h:
* UIProcess/API/efl/ewk_context_private.h:
(EwkContext):
* UIProcess/API/efl/tests/test_ewk2_context.cpp:
(TEST_F):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (133879 => 133880)
--- trunk/Source/WebKit2/ChangeLog 2012-11-08 11:55:40 UTC (rev 133879)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-08 12:14:39 UTC (rev 133880)
@@ -1,3 +1,21 @@
+2012-11-08 KwangYong Choi <ky0.c...@samsung.com>
+
+ [EFL][WK2] Add ewk_context_additional_plugin_path_set API
+ https://bugs.webkit.org/show_bug.cgi?id=101530
+
+ Reviewed by Gyuyoung Kim.
+
+ Add ewk_context_additional_plugin_path_set() to set additional plugin directory.
+
+ * UIProcess/API/efl/ewk_context.cpp:
+ (EwkContext::setAdditionalPluginPath):
+ (ewk_context_additional_plugin_path_set):
+ * UIProcess/API/efl/ewk_context.h:
+ * UIProcess/API/efl/ewk_context_private.h:
+ (EwkContext):
+ * UIProcess/API/efl/tests/test_ewk2_context.cpp:
+ (TEST_F):
+
2012-11-08 Jinwoo Song <jinwoo7.s...@samsung.com>
[EFL][WK2] Use explicit constructor in BatteryProvider, DownloadManagerEfl, NetworkInfoProvider
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (133879 => 133880)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2012-11-08 11:55:40 UTC (rev 133879)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2012-11-08 12:14:39 UTC (rev 133880)
@@ -201,6 +201,13 @@
return static_cast<Ewk_Cache_Model>(m_context->cacheModel());
}
+#if ENABLE(NETSCAPE_PLUGIN_API)
+void EwkContext::setAdditionalPluginPath(const String& path)
+{
+ m_webContext->setAdditionalPluginsDirectory(path);
+}
+#endif
+
Ewk_Cookie_Manager* ewk_context_cookie_manager_get(const Ewk_Context* ewkContext)
{
EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, 0);
@@ -310,3 +317,15 @@
return impl->cacheModel();
}
+Eina_Bool ewk_context_additional_plugin_path_set(Ewk_Context* ewkContext, const char* path)
+{
+ EWK_OBJ_GET_IMPL_OR_RETURN(EwkContext, ewkContext, impl, false);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(path, false);
+
+#if ENABLE(NETSCAPE_PLUGIN_API)
+ impl->setAdditionalPluginPath(String::fromUTF8(path));
+ return true;
+#else
+ return false;
+#endif
+}
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.h (133879 => 133880)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.h 2012-11-08 11:55:40 UTC (rev 133879)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.h 2012-11-08 12:14:39 UTC (rev 133880)
@@ -301,6 +301,16 @@
*/
EAPI Ewk_Cache_Model ewk_context_cache_model_get(const Ewk_Context *context);
+/**
+ * Sets additional plugin path for @a context.
+ *
+ * @param context context object to set additional plugin path
+ * @param path the path to be used for plugins
+ *
+ * @return @c EINA_TRUE on success or @c EINA_FALSE on failure
+ */
+EAPI Eina_Bool ewk_context_additional_plugin_path_set(Ewk_Context *context, const char *path);
+
#ifdef __cplusplus
}
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h (133879 => 133880)
--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h 2012-11-08 11:55:40 UTC (rev 133879)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context_private.h 2012-11-08 12:14:39 UTC (rev 133880)
@@ -78,6 +78,10 @@
WebKit::ContextHistoryClientEfl* historyClient();
+#if ENABLE(NETSCAPE_PLUGIN_API)
+ void setAdditionalPluginPath(const String&);
+#endif
+
private:
explicit EwkContext(PassRefPtr<WebContext>);
Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp (133879 => 133880)
--- trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp 2012-11-08 11:55:40 UTC (rev 133879)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_context.cpp 2012-11-08 12:14:39 UTC (rev 133880)
@@ -124,3 +124,16 @@
ASSERT_TRUE(context);
ewk_object_unref(context);
}
+
+TEST_F(EWK2UnitTestBase, ewk_context_additional_plugin_path_set)
+{
+ Ewk_Context* context = ewk_view_context_get(webView());
+
+ char* path = 0;
+ ASSERT_FALSE(ewk_context_additional_plugin_path_set(context, path));
+
+ path = "/plugins";
+ ASSERT_TRUE(ewk_context_additional_plugin_path_set(context, path));
+
+ /* FIXME: Get additional plugin path and compare with the path. */
+}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
