Changeset 108961 in webkit

Timestamp:

Feb 26, 2012 11:47:48 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] Add InjectedBundleEfl.cpp
​https://bugs.webkit.org/show_bug.cgi?id=75463

Patch by YoungTaeck Song <​youngtaeck.song@samsung.com> on 2012-02-26
Reviewed by Andreas Kling.

Add first version of InjectedBundleEfl.cpp including load() and placeholder for activateMacFontAscentHack().

• WebProcess/InjectedBundle/InjectedBundle.h:
• WebProcess/InjectedBundle/efl/InjectedBundleEfl.cpp:

(WebKit::InjectedBundle::load):
(WebKit::InjectedBundle::activateMacFontAscentHack):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/InjectedBundle.h (modified) (2 diffs)
• WebProcess/InjectedBundle/efl/InjectedBundleEfl.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-02-26  YoungTaeck Song  <youngtaeck.song@samsung.com>
+
+        [EFL][WK2] Add InjectedBundleEfl.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=75463
+
+        Reviewed by Andreas Kling.
+
+        Add first version of InjectedBundleEfl.cpp including load() and placeholder for activateMacFontAscentHack().
+
+        * WebProcess/InjectedBundle/InjectedBundle.h:
+        * WebProcess/InjectedBundle/efl/InjectedBundleEfl.cpp:
+        (WebKit::InjectedBundle::load):
+        (WebKit::InjectedBundle::activateMacFontAscentHack):
+
 2012-02-26  Shinya Kawanaka  <shinyak@chromium.org>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h

@@ -44 +44 @@
 #endif
 
+#if PLATFORM(EFL)
+#include <Eina.h>
+#endif
+
 namespace CoreIPC {
     class ArgumentDecoder;
@@ -60 +64 @@
 #elif PLATFORM(GTK)
 typedef ::GModule* PlatformBundle;
+#elif PLATFORM(EFL)
+typedef Eina_Module* PlatformBundle;
 #endif
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/efl/InjectedBundleEfl.cpp

@@ -29 +29 @@
 #include "WKBundleAPICast.h"
 #include "WKBundleInitialize.h"
-#include <WebCore/NotImplemented.h>
+#include <wtf/text/CString.h>
 
 using namespace WebCore;
@@ -35 +35 @@
 namespace WebKit {
 
-bool InjectedBundle::load(APIObject*)
+bool InjectedBundle::load(APIObject* initializationUserData)
 {
-    return false;
+    m_platformBundle = eina_module_new(m_path.utf8().data());
+    if (!m_platformBundle) {
+        EINA_LOG_CRIT("Error loading the injected bundle: eina_module_new() failed");
+        return false;
+    }
+    if (!eina_module_load(m_platformBundle)) {
+        EINA_LOG_CRIT("Error loading the injected bundle: %s", m_path.utf8().data());
+        eina_module_free(m_platformBundle);
+        m_platformBundle = 0;
+        return false;
+    }
+
+    WKBundleInitializeFunctionPtr initializeFunction = reinterpret_cast<WKBundleInitializeFunctionPtr>(eina_module_symbol_get(m_platformBundle, "WKBundleInitialize"));
+    if (!initializeFunction) {
+        EINA_LOG_CRIT("Error loading WKBundleInitialize symbol from injected bundle.");
+        return false;
+    }
+
+    initializeFunction(toAPI(this), toAPI(initializationUserData));
+    return true;
 }
 
 void InjectedBundle::activateMacFontAscentHack()
 {
-    notImplemented();
 }